svn commit: r473406 - in head/x11/polybar: . files
Tobias C. Berner
tcberner at FreeBSD.org
Tue Jun 26 19:07:55 UTC 2018
Author: tcberner
Date: Tue Jun 26 19:07:54 2018
New Revision: 473406
URL: https://svnweb.freebsd.org/changeset/ports/473406
Log:
x11/polybar: Fix build against x11/xcb-proto 1.13.
* Update to a more recent upstream commit to fix the build against xcb-proto 1.13
* Drop upstreamed patches, which already included now
* Give MAINTAINERSHIP to lbdm
PR: 228330
Submitted by: Alexandre C. Guimarães <lebarondemerde at privacychain.ch>
Approved by: <capt_redbeard at protonmail.com> (maintainer timeout)
Differential Revision: https://reviews.freebsd.org/D15965
Deleted:
head/x11/polybar/files/patch-cmake_01-core.cmake
head/x11/polybar/files/patch-cmake_03-libs.cmake
head/x11/polybar/files/patch-include_adapters_alsa_generic.hpp
Modified:
head/x11/polybar/Makefile
head/x11/polybar/distinfo
head/x11/polybar/files/patch-man_CMakeLists.txt
head/x11/polybar/pkg-plist
Modified: head/x11/polybar/Makefile
==============================================================================
--- head/x11/polybar/Makefile Tue Jun 26 19:06:47 2018 (r473405)
+++ head/x11/polybar/Makefile Tue Jun 26 19:07:54 2018 (r473406)
@@ -1,19 +1,18 @@
# $FreeBSD$
PORTNAME= polybar
-DISTVERSION= 3.1.0
-PORTREVISION= 2
+DISTVERSION= 3.1.0.20180621
CATEGORIES= x11
-MAINTAINER= capt_redbeard at protonmail.com
+MAINTAINER= lebarondemerde at privacychain.ch
COMMENT= Fast and easy-to-use status bar
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BROKEN_aarch64= fails to build: KeyError: 'eventstruct'
-BROKEN_armv6= fails to build: KeyError: 'eventstruct'
-BROKEN_armv7= fails to build: KeyError: 'eventstruct'
+BROKEN_aarch64= fails to build: KeyError: 'eventstruct'
+BROKEN_armv6= fails to build: KeyError: 'eventstruct'
+BROKEN_armv7= fails to build: KeyError: 'eventstruct'
BUILD_DEPENDS= xcb-proto>=1.9:x11/xcb-proto
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
@@ -26,15 +25,17 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libxcb-util.so:x11/xcb-util \
libxcb-xrm.so:x11/xcb-util-xrm
-USES= cmake:outsource localbase:ldflags pkgconfig python:2.7,build
+USES= cmake:outsource localbase:ldflags pkgconfig \
+ python:2.7,build
USE_GITHUB= yes
GH_ACCOUNT= jaagr
-GH_TUPLE= jaagr:i3ipcpp:v0.7.1:i3ipcpp/lib/i3ipcpp \
- jaagr:xpp:1.4.0-1-g64bd576:xpp/lib/xpp
+GH_TAGNAME= 028b141
+GH_TUPLE= jaagr:i3ipcpp:v0.7.1-4-gd4e4786:i3ipcpp/lib/i3ipcpp \
+ jaagr:xpp:1.4.0-4-g00165e1:xpp/lib/xpp
USE_GNOME= cairo
USE_XORG= xcb
-OPTIONS_DEFINE= ALSA CURL EXAMPLES I3 IPC MPD TESTS
+OPTIONS_DEFINE= ALSA DEBUG CURL EXAMPLES I3 IPC MPD TESTS
OPTIONS_DEFAULT= CURL I3 IPC MPD
OPTIONS_SUB= yes
@@ -51,6 +52,8 @@ ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
CURL_CMAKE_BOOL= ENABLE_CURL
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
+DEBUG_CMAKE_BOOL= DEBUG_LOGGER
+
I3_BUILD_DEPENDS= ${LOCALBASE}/include/i3/ipc.h:x11-wm/i3
I3_CMAKE_BOOL= ENABLE_I3
I3_LIB_DEPENDS= libjsoncpp.so:devel/jsoncpp
@@ -60,10 +63,10 @@ IPC_CMAKE_BOOL= BUILD_IPC_MSG
MPD_CMAKE_BOOL= ENABLE_MPD
MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient
+# fail while building on poudriere because it need network access
+# during the building process to download googletest on-the-fly.
+TESTS_BUILD_DEPENDS= git>=0:devel/git
TESTS_CMAKE_BOOL= BUILD_TESTS
-
-post-patch:
- @${REINPLACE_CMD} -e 's|python2|${PYTHON_CMD}|g' ${WRKSRC_xpp}/CMakeLists.txt
do-test-TESTS-on:
cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \
Modified: head/x11/polybar/distinfo
==============================================================================
--- head/x11/polybar/distinfo Tue Jun 26 19:06:47 2018 (r473405)
+++ head/x11/polybar/distinfo Tue Jun 26 19:07:54 2018 (r473406)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1515547603
-SHA256 (jaagr-polybar-3.1.0_GH0.tar.gz) = cb6f404e1c3e9f0239ecde095c04dcb50a164ce346046f077744b2c53fab7fc4
-SIZE (jaagr-polybar-3.1.0_GH0.tar.gz) = 418298
-SHA256 (jaagr-i3ipcpp-v0.7.1_GH0.tar.gz) = 644d82d0e73b7c653e344ac8852e4d7435d9fb7ea54a160ab81662ab4b3652cf
-SIZE (jaagr-i3ipcpp-v0.7.1_GH0.tar.gz) = 191417
-SHA256 (jaagr-xpp-1.4.0-1-g64bd576_GH0.tar.gz) = 451052c2d71b55cb3ea35dcf2f422162756caf05e3d4bfb9e36b47e802fbf109
-SIZE (jaagr-xpp-1.4.0-1-g64bd576_GH0.tar.gz) = 84145
+TIMESTAMP = 1530038626
+SHA256 (jaagr-polybar-3.1.0.20180621-028b141_GH0.tar.gz) = a4465db46192dec4c6644d8d1dd24fbe8f668c55c502f170827561b573029ac7
+SIZE (jaagr-polybar-3.1.0.20180621-028b141_GH0.tar.gz) = 241473
+SHA256 (jaagr-i3ipcpp-v0.7.1-4-gd4e4786_GH0.tar.gz) = 2154bf1a0b0a211bddcf5904ba97f99eb86ef6faded5dd864858e2a1a2389cec
+SIZE (jaagr-i3ipcpp-v0.7.1-4-gd4e4786_GH0.tar.gz) = 191511
+SHA256 (jaagr-xpp-1.4.0-4-g00165e1_GH0.tar.gz) = a0496281fbf52ce7e798426b56ba7c2130d08bbb8241ced7053b1941a4dcb90d
+SIZE (jaagr-xpp-1.4.0-4-g00165e1_GH0.tar.gz) = 84823
Modified: head/x11/polybar/files/patch-man_CMakeLists.txt
==============================================================================
--- head/x11/polybar/files/patch-man_CMakeLists.txt Tue Jun 26 19:06:47 2018 (r473405)
+++ head/x11/polybar/files/patch-man_CMakeLists.txt Tue Jun 26 19:07:54 2018 (r473406)
@@ -1,9 +1,8 @@
---- man/CMakeLists.txt.orig 2017-12-03 17:03:49 UTC
+--- man/CMakeLists.txt.orig 2018-05-18 04:58:51 UTC
+++ man/CMakeLists.txt
-@@ -1,4 +1,5 @@
-+include(GNUInstallDirs)
+@@ -1,4 +1,4 @@
set(MAN_PAGES_1 polybar.1)
INSTALL(FILES ${MAN_PAGES_1}
- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
-+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
COMPONENT doc)
Modified: head/x11/polybar/pkg-plist
==============================================================================
--- head/x11/polybar/pkg-plist Tue Jun 26 19:06:47 2018 (r473405)
+++ head/x11/polybar/pkg-plist Tue Jun 26 19:07:54 2018 (r473406)
@@ -1,7 +1,7 @@
bin/polybar
%%IPC%%bin/polybar-msg
man/man1/polybar.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
share/bash-completion/completions/polybar
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
share/zsh/site-functions/_polybar
share/zsh/site-functions/_polybar_msg
More information about the svn-ports-all
mailing list