Index: x11/polybar/Makefile =================================================================== --- x11/polybar/Makefile +++ x11/polybar/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= polybar -DISTVERSION= 3.2.1 -PORTREVISION= 1 +DISTVERSION= 3.3.0 CATEGORIES= x11 MAINTAINER= rigoletto@FreeBSD.org @@ -22,17 +21,18 @@ libxcb-util.so:x11/xcb-util \ libxcb-xrm.so:x11/xcb-util-xrm -USES= cmake:outsource compiler:c++11-lang localbase:ldflags \ - pkgconfig python:2.7,build +USES= cmake:outsource localbase:ldflags pkgconfig \ + python:2.7,build USE_GITHUB= yes GH_ACCOUNT= jaagr +GH_TAGNAME= bc9eddfcae2fbadea55b37137b278af75c1d3814 GH_TUPLE= jaagr:i3ipcpp:v0.7.1-4-gd4e4786:i3ipcpp/lib/i3ipcpp \ - jaagr:xpp:1.4.0-4-g00165e1:xpp/lib/xpp + jaagr:xpp:1.4.0-4-gbf6ff36:xpp/lib/xpp USE_GNOME= cairo USE_XORG= xcb -OPTIONS_DEFINE= ALSA DEBUG CURL EXAMPLES I3 IPC MPD TESTS -OPTIONS_DEFAULT= CURL I3 IPC MPD +OPTIONS_DEFINE= ALSA DEBUG CURL EXAMPLES I3 IPC MPD PULSEAUDIO TESTS +OPTIONS_DEFAULT= CURL I3 IPC MPD PULSEAUDIO OPTIONS_SUB= yes ALSA_DESC= Volume control @@ -40,6 +40,7 @@ I3_DESC= i3wm support IPC_DESC= Built-in IPC support MPD_DESC= Support for controlling MPD +PULSEAUDIO= Pulseaudio support TESTS_DESC= Build testsuite ALSA_CMAKE_BOOL= ENABLE_ALSA @@ -59,10 +60,17 @@ MPD_CMAKE_BOOL= ENABLE_MPD MPD_LIB_DEPENDS= libmpdclient.so:audio/libmpdclient +PULSEAUDIO_BUILD_DEPENDS= ${LOCALBASE}/include/i3/ipc.h:x11-wm/i3 +PULSEAUDIO_CMAKE_BOOL= ENABLE_PULSEAUDIO +PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio + # 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 + +# Needs libnl to work. Disabling completely. +CMAKE_OFF= ENABLE_NETWORK do-test-TESTS-on: cd ${TEST_WRKSRC} && ${SETENV} BUILD_TESTS=ON \ Index: x11/polybar/distinfo =================================================================== --- x11/polybar/distinfo +++ x11/polybar/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1533791330 -SHA256 (jaagr-polybar-3.2.1_GH0.tar.gz) = 604e3e8b4fd8c211df94cdd193f8c760c7c027e6822e5b2f598132decdf3edaf -SIZE (jaagr-polybar-3.2.1_GH0.tar.gz) = 242327 +TIMESTAMP = 1545603948 +SHA256 (jaagr-polybar-3.3.0-bc9eddfcae2fbadea55b37137b278af75c1d3814_GH0.tar.gz) = 6f6fbc8a6303d507843622dc712f5aef5737431154572912ce35e95dbf988de9 +SIZE (jaagr-polybar-3.3.0-bc9eddfcae2fbadea55b37137b278af75c1d3814_GH0.tar.gz) = 247062 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 +SHA256 (jaagr-xpp-1.4.0-4-gbf6ff36_GH0.tar.gz) = 9d1f52ee19c925d5900dd49f135f495fbf3a573d80a93876679f08ff41ff2c71 +SIZE (jaagr-xpp-1.4.0-4-gbf6ff36_GH0.tar.gz) = 85073 Index: x11/polybar/files/patch-git_3b32f58 =================================================================== --- x11/polybar/files/patch-git_3b32f58 +++ /dev/null @@ -1,23 +0,0 @@ -From 3b32f5899a4d9a0bcb49099ee4bfee750366a3e6 Mon Sep 17 00:00:00 2001 -From: patrick96 -Date: Mon, 15 Oct 2018 17:24:27 +0200 -Subject: [PATCH] fix: Move return value of parse_layout_symbol - -Fixes #1469 ---- - src/x11/extensions/xkb.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/x11/extensions/xkb.cpp b/src/x11/extensions/xkb.cpp -index 1875c585..a521b935 100644 ---- src/x11/extensions/xkb.cpp -+++ src/x11/extensions/xkb.cpp -@@ -208,7 +208,7 @@ namespace xkb_util { - if (string_util::contains(LAYOUT_SYMBOL_BLACKLIST, ";" + name + ";")) { - return ""; - } -- return name; -+ return move(name); - } - } -