Page MenuHomeFreeBSD
Files F137974058

D15965.id44308.diff
No OneTemporary
Actions

D15965.id44308.diff
View Options

Index: x11/polybar/Makefile
===================================================================
--- x11/polybar/Makefile
+++ x11/polybar/Makefile
@@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= polybar
-DISTVERSION= 3.1.0
-PORTREVISION= 2
+DISTVERSION= 3.1.0-160
+DISTVERSIONSUFFIX= -ga06eb8c
CATEGORIES= x11
MAINTAINER= capt_redbeard@protonmail.com
@@ -11,10 +11,6 @@
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'
-
BUILD_DEPENDS= xcb-proto>=1.9:x11/xcb-proto
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
@@ -26,15 +22,16 @@
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_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 +48,8 @@
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,11 +59,11 @@
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 \
${SH} ${WRKSRC}/common/travis/tests.sh
Index: x11/polybar/distinfo
===================================================================
--- x11/polybar/distinfo
+++ x11/polybar/distinfo
@@ -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 = 1529679038
+SHA256 (jaagr-polybar-3.1.0-160-ga06eb8c_GH0.tar.gz) = 9c2299a096daa7f2cc9d08ce699a0edb0ec5c43ea42ed6cabc19bfa5b46470c9
+SIZE (jaagr-polybar-3.1.0-160-ga06eb8c_GH0.tar.gz) = 241340
+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
Index: x11/polybar/files/patch-cmake_01-core.cmake
===================================================================
--- x11/polybar/files/patch-cmake_01-core.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/01-core.cmake.orig 2017-12-03 17:03:49 UTC
-+++ cmake/01-core.cmake
-@@ -31,8 +31,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors")
-
-+if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ # Need dprintf() for FreeBSD 11.1 and older
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WITH_DPRINTF")
-+
-+ # libinotify uses c99 extension, so suppress this error
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c99-extensions")
-+endif()
-+
- if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=parentheses-equality")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-zero-length-array")
- endif()
-
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
Index: x11/polybar/files/patch-cmake_03-libs.cmake
===================================================================
--- x11/polybar/files/patch-cmake_03-libs.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/03-libs.cmake.orig 2017-12-03 17:03:49 UTC
-+++ cmake/03-libs.cmake
-@@ -21,3 +21,8 @@ querylib(WITH_XRENDER "pkg-config" xcb-render libs dir
- querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs)
- querylib(WITH_XSYNC "pkg-config" xcb-sync libs dirs)
- querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs)
-+
-+# FreeBSD Support
-+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ querylib(TRUE "pkg-config" libinotify libs dirs)
-+endif()
Index: x11/polybar/files/patch-include_adapters_alsa_generic.hpp
===================================================================
--- x11/polybar/files/patch-include_adapters_alsa_generic.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/adapters/alsa/generic.hpp.orig 2017-12-03 17:03:49 UTC
-+++ include/adapters/alsa/generic.hpp
-@@ -4,7 +4,11 @@
- #include <alsa/asoundlib.h>
- #else
- #include <assert.h>
-+
-+#ifndef __FreeBSD__
- #include <endian.h>
-+#endif
-+
- #include <errno.h>
- #include <fcntl.h>
- #include <stdarg.h>
Index: x11/polybar/files/patch-man_CMakeLists.txt
===================================================================
--- x11/polybar/files/patch-man_CMakeLists.txt
+++ x11/polybar/files/patch-man_CMakeLists.txt
@@ -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)
Index: x11/polybar/pkg-message
===================================================================
--- x11/polybar/pkg-message
+++ x11/polybar/pkg-message
@@ -1,5 +1,5 @@
-Polybar was originally built with Linux in mind, so certain modules do
-not function in FreeBSD.
+Polybar was originally built with Linux in mind, so certain modules do not
+function in FreeBSD.
Working modules:
- bspwm
Index: x11/polybar/pkg-plist
===================================================================
--- x11/polybar/pkg-plist
+++ x11/polybar/pkg-plist
@@ -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

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 7:48 PM (16 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26297937
Default Alt Text
D15965.id44308.diff (6 KB)

Event Timeline