polybar: => 3.4.0

5 files changed, 24 insertions, 23 deletions

diff --git a/x11/polybar/DEPENDS b/x11/polybar/DEPENDS
index 943e736f76..abc1ca18ee 100755
--- a/x11/polybar/DEPENDS
+++ b/x11/polybar/DEPENDS
@@ -1,4 +1,3 @@
-depends xorgproto
 depends cmake &&
 depends pkgconfig &&
 # required for generating headers
@@ -18,13 +17,11 @@ fi &&
 depends freetype2 &&
 depends fontconfig &&
 depends cairo &&
+depends xorgproto &&
 depends libxcb &&
 
 # TODO: split XCB sub-dependencies
 # depends -sub RANDR libxcb
-# depends -sub RENDER libxcb
-# depends -sub DAMAGE libxcb
-# depends -sub SYNC libxcb
 # depends -sub COMPOSITE libxcb
 # depends -sub XKB libxcb
 
@@ -63,6 +60,13 @@ optional_depends wireless_tools \
                  "-DENABLE_NETWORK=OFF" \
                  "for network connection details" &&
 
+if is_depends_enabled ${SPELL} wireless_tools; then
+  optional_depends libnl \
+                   "-WITH_LIBNL=ON" \
+                   "-WITH_LIBNL=OFF" \
+                   "to use netlink interface for wireless"
+fi &&
+
 optional_depends xcb-util-cursor \
                  "-DWITH_XCURSOR=ON" \
                  "-DWITH_XCURSOR=OFF" \
@@ -76,5 +80,10 @@ optional_depends xcb-util-xrm \
 optional_depends xcb-util-wm "" "" "for workspace and wm properties support" &&
 optional_depends xcb-util-image "" "" "for systray icons support" &&
 
+optional_depends python-sphinx \
+                 "-DBUILD_DOC=ON" \
+                 "-DBUILD_DOC=OFF" \
+                 "to build documentation" &&
+
 suggest_depends unifont "" "" "to use Unifont" &&
 suggest_depends siji "" "" "to use iconic font Siji"
diff --git a/x11/polybar/DETAILS b/x11/polybar/DETAILS
index c117b21b82..a28eb0325e 100755
--- a/x11/polybar/DETAILS
+++ b/x11/polybar/DETAILS
@@ -1,24 +1,24 @@
            SPELL=polybar
-         VERSION=3.3.1
+         VERSION=3.4.0
           SOURCE=${SPELL}-${VERSION}.tar.gz
-   SOURCE_URL[0]=https://github.com/jaagr/${SPELL}/archive/${VERSION}.tar.gz
-     SOURCE_HASH=sha512:c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
+   SOURCE_URL[0]=https://github.com/polybar/${SPELL}/archive/${VERSION}.tar.gz
+     SOURCE_HASH=sha512:e6c1d2034d455500d6d874e08016a5d1077261ec22f2c16b68e2f753abb3c194fba756488b5797cc04abc542b56fee8f506c79c8ee0ac19b977d37d4e5e4ff56
       SPELL_LIB1=xpp
     SPELL_LIB1_V=1.4.0
          SOURCE2=${SPELL_LIB1}-${SPELL_LIB1_V}.tar.gz
-     SOURCE2_URL=https://github.com/jaagr/${SPELL_LIB1}/archive/${SPELL_LIB1_V}.tar.gz
+     SOURCE2_URL=https://github.com/polybar/${SPELL_LIB1}/archive/${SPELL_LIB1_V}.tar.gz
     SOURCE2_HASH=sha512:d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 if list_find "${POLYBAR_OPTS}" "-DENABLE_I3=ON"; then
       SPELL_LIB2=i3ipcpp
     SPELL_LIB2_V=0.7.1
          SOURCE3=${SPELL_LIB2}-${SPELL_LIB2_V}.tar.gz
-     SOURCE3_URL=https://github.com/jaagr/${SPELL_LIB2}/archive/v${SPELL_LIB2_V}.tar.gz
+     SOURCE3_URL=https://github.com/polybar/${SPELL_LIB2}/archive/v${SPELL_LIB2_V}.tar.gz
     SOURCE3_HASH=sha512:d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 fi
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
             DOCS="SUPPORT.md ${DOCS}"
         DOC_DIRS=""
-        WEB_SITE=https://github.com/jaagr/polybar
+        WEB_SITE=https://github.com/polybar/polybar
       LICENSE[0]=MIT
          ENTERED=20180201
            SHORT="fast and easy-to-use status bar"
diff --git a/x11/polybar/HISTORY b/x11/polybar/HISTORY
index cb0937e301..25c623a23b 100644
--- a/x11/polybar/HISTORY
+++ b/x11/polybar/HISTORY
@@ -1,3 +1,8 @@
+2019-07-24 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 3.4.0
+	* DEPENDS: added libnl, python-sphinx optional dependencies
+	* cmake-doc.patch: dropped
+
 2019-04-11 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: added pulseaudio optional dependency
 
diff --git a/x11/polybar/PRE_BUILD b/x11/polybar/PRE_BUILD
index 0ad800519e..55d830e7ec 100755
--- a/x11/polybar/PRE_BUILD
+++ b/x11/polybar/PRE_BUILD
@@ -1,8 +1,6 @@
 default_pre_build &&
 cd "${SOURCE_DIRECTORY}" &&
 
-patch -p0 < "${SPELL_DIRECTORY}/cmake-doc.patch" &&
-
 verify_file 2 &&
 
 cd lib/xpp &&
diff --git a/x11/polybar/cmake-doc.patch b/x11/polybar/cmake-doc.patch
deleted file mode 100644
index 6300f8c320..0000000000
--- a/x11/polybar/cmake-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/CMakeLists.txt.orig	2017-12-03 12:03:49.000000000 -0500
-+++ doc/CMakeLists.txt	2018-02-01 19:31:45.535717353 -0500
-@@ -85,7 +85,7 @@
-   ESCAPE_QUOTES @ONLY)
- 
- install(FILES config
--  DESTINATION share/doc/polybar
-+  DESTINATION share/polybar/examples
-   COMPONENT config)
- 
- # }}}