Attachment #193959 for bug #228330




# $FreeBSD$

PORTNAME=	polybar
DISTVERSION=	3.1.0.20180430
PORTREVISION=	2
CATEGORIES=	x11

MAINTAINER=	capt_redbeard@protonmail.com

		libxcb-util.so:x11/xcb-util \
		libxcb-xrm.so:x11/xcb-util-xrm

USES=		cmake:outsource pkgconfig python:2.7,build
USE_GITHUB=	yes
GH_ACCOUNT=	jaagr
GH_TAGNAME=	73e4b4a
GH_TUPLE=	jaagr:i3ipcpp:d4e4786:i3ipcpp/lib/i3ipcpp \
		jaagr:xpp:00165e1:xpp/lib/xpp
USE_GNOME=	cairo
USE_XORG=	xcb


MPD_CMAKE_BOOL=		ENABLE_MPD
MPD_LIB_DEPENDS=	libmpdclient.so:audio/libmpdclient

# fail while building on poudriere because it needs 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

Lines 1-7 Link Here

(-)x11/polybar/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1515547603	1	TIMESTAMP = 1527191354
2	SHA256 (jaagr-polybar-3.1.0_GH0.tar.gz) = cb6f404e1c3e9f0239ecde095c04dcb50a164ce346046f077744b2c53fab7fc4	2	SHA256 (jaagr-polybar-3.1.0.20180430-73e4b4a_GH0.tar.gz) = ddc44d9fe957a57c9aa2b735fee88c80ae7b78fd9c0069525df52850e174172e
3	SIZE (jaagr-polybar-3.1.0_GH0.tar.gz) = 418298	3	SIZE (jaagr-polybar-3.1.0.20180430-73e4b4a_GH0.tar.gz) = 225439
4	SHA256 (jaagr-i3ipcpp-v0.7.1_GH0.tar.gz) = 644d82d0e73b7c653e344ac8852e4d7435d9fb7ea54a160ab81662ab4b3652cf	4	SHA256 (jaagr-i3ipcpp-d4e4786_GH0.tar.gz) = 34a426b45487a8fcdc01cf51aaef6d66e52db38b6ad70b5ab2e6fcf115e9110c
5	SIZE (jaagr-i3ipcpp-v0.7.1_GH0.tar.gz) = 191417	5	SIZE (jaagr-i3ipcpp-d4e4786_GH0.tar.gz) = 191488
6	SHA256 (jaagr-xpp-1.4.0-1-g64bd576_GH0.tar.gz) = 451052c2d71b55cb3ea35dcf2f422162756caf05e3d4bfb9e36b47e802fbf109	6	SHA256 (jaagr-xpp-00165e1_GH0.tar.gz) = 7e85b4bb1d500e1900e71688f4c83e5cd24b56d9df90a4d9cb8a60fd45ae764d
7	SIZE (jaagr-xpp-1.4.0-1-g64bd576_GH0.tar.gz) = 84145	7	SIZE (jaagr-xpp-00165e1_GH0.tar.gz) = 84804




--- 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")

Lines 1-11 Link Here

(-)x11/polybar/files/patch-cmake_03-libs.cmake (-11 lines)
1	--- cmake/03-libs.cmake.orig 2017-12-03 17:03:49 UTC
2	+++ cmake/03-libs.cmake
3	@@ -21,3 +21,8 @@ querylib(WITH_XRENDER "pkg-config" xcb-render libs dir
4	querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs)
5	querylib(WITH_XSYNC "pkg-config" xcb-sync libs dirs)
6	querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs)
7	+
8	+# FreeBSD Support
9	+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
10	+ querylib(TRUE "pkg-config" libinotify libs dirs)
11	+endif()




--- 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>

Lines 1-9 Link Here

(-)x11/polybar/files/patch-man_CMakeLists.txt (-4 / +3 lines)
1	--- man/CMakeLists.txt.orig 2017-12-03 17:03:49 UTC	1	--- man/CMakeLists.txt.orig 2018-05-18 04:58:51 UTC
2	+++ man/CMakeLists.txt	2	+++ man/CMakeLists.txt
3	@@ -1,4 +1,5 @@	3	@@ -1,4 +1,4 @@
4	+include(GNUInstallDirs)
5	set(MAN_PAGES_1 polybar.1)	4	set(MAN_PAGES_1 polybar.1)
6	INSTALL(FILES ${MAN_PAGES_1}	5	INSTALL(FILES ${MAN_PAGES_1}
7	- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1	6	- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
8	+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1	7	+ DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
9	COMPONENT doc)	8	COMPONENT doc)

Lines 1-5 Link Here

(-)x11/polybar/pkg-message (-2 / +2 lines)
1	Polybar was originally built with Linux in mind, so certain modules do	1	Polybar was originally built with Linux in mind, so certain modules do not
2	not function in FreeBSD.	2	function in FreeBSD.
3		3
4	Working modules:	4	Working modules:
5	- bspwm	5	- bspwm

Lines 1-7 Link Here

(-)x11/polybar/pkg-plist (-1 / +1 lines)
1	bin/polybar	1	bin/polybar
2	%%IPC%%bin/polybar-msg	2	%%IPC%%bin/polybar-msg
3	man/man1/polybar.1.gz	3	man/man1/polybar.1.gz
		4	share/bash-completion/completions/polybar
4	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config	5	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/config
5	share/bash-completion/completions/polybar
6	share/zsh/site-functions/_polybar	6	share/zsh/site-functions/_polybar
7	share/zsh/site-functions/_polybar_msg	7	share/zsh/site-functions/_polybar_msg

Return to bug 228330

Lines 1-8 Link Here

(-)x11/polybar/Makefile (-8 / +8 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= polybar	3	PORTNAME= polybar
4	DISTVERSION= 3.1.0	4	DISTVERSION= 3.1.0.20180430
5	PORTREVISION= 2
6	CATEGORIES= x11	5	CATEGORIES= x11
7		6
8	MAINTAINER= capt_redbeard@protonmail.com	7	MAINTAINER= capt_redbeard@protonmail.com
Lines 22-32 Link Here
22	libxcb-util.so:x11/xcb-util \	21	libxcb-util.so:x11/xcb-util \
23	libxcb-xrm.so:x11/xcb-util-xrm	22	libxcb-xrm.so:x11/xcb-util-xrm
24		23
25	USES= cmake:outsource localbase:ldflags pkgconfig python:2.7,build	24	USES= cmake:outsource pkgconfig python:2.7,build
26	USE_GITHUB= yes	25	USE_GITHUB= yes
27	GH_ACCOUNT= jaagr	26	GH_ACCOUNT= jaagr
28	GH_TUPLE= jaagr:i3ipcpp:v0.7.1:i3ipcpp/lib/i3ipcpp \	27	GH_TAGNAME= 73e4b4a
29	jaagr:xpp:1.4.0-1-g64bd576:xpp/lib/xpp	28	GH_TUPLE= jaagr:i3ipcpp:d4e4786:i3ipcpp/lib/i3ipcpp \
		29	jaagr:xpp:00165e1:xpp/lib/xpp
30	USE_GNOME= cairo	30	USE_GNOME= cairo
31	USE_XORG= xcb	31	USE_XORG= xcb
32		32
Lines 56-66 Link Here
56	MPD_CMAKE_BOOL= ENABLE_MPD	56	MPD_CMAKE_BOOL= ENABLE_MPD
57	MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient	57	MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient
58		58
		59	# fail while building on poudriere because it needs network access
		60	# during the building process to download googletest on-the-fly.
		61	TESTS_BUILD_DEPENDS= git>=0:devel/git
59	TESTS_CMAKE_BOOL= BUILD_TESTS	62	TESTS_CMAKE_BOOL= BUILD_TESTS
60		63
61	post-patch:
62	@${REINPLACE_CMD} -e 's\|python2\|${PYTHON_CMD}\|g' ${WRKSRC_xpp}/CMakeLists.txt
63
64	do-test-TESTS-on:	64	do-test-TESTS-on:
65	cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \	65	cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \
66	${SH} ${WRKSRC}/common/travis/tests.sh	66	${SH} ${WRKSRC}/common/travis/tests.sh

Lines 1-20 Link Here

(-)x11/polybar/files/patch-cmake_01-core.cmake (-20 lines)
1	--- cmake/01-core.cmake.orig 2017-12-03 17:03:49 UTC
2	+++ cmake/01-core.cmake
3	@@ -31,8 +31,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
4	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
5	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors")
6
7	+if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
8	+ # Need dprintf() for FreeBSD 11.1 and older
9	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_WITH_DPRINTF")
10	+
11	+ # libinotify uses c99 extension, so suppress this error
12	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c99-extensions")
13	+endif()
14	+
15	if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
16	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=parentheses-equality")
17	+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-zero-length-array")
18	endif()
19
20	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")

Lines 1-14 Link Here

(-)x11/polybar/files/patch-include_adapters_alsa_generic.hpp (-14 lines)
1	--- include/adapters/alsa/generic.hpp.orig 2017-12-03 17:03:49 UTC
2	+++ include/adapters/alsa/generic.hpp
3	@@ -4,7 +4,11 @@
4	#include <alsa/asoundlib.h>
5	#else
6	#include <assert.h>
7	+
8	+#ifndef __FreeBSD__
9	#include <endian.h>
10	+#endif
11	+
12	#include <errno.h>
13	#include <fcntl.h>
14	#include <stdarg.h>