diff options
| author | Vlad Glagolev | 2019-07-25 03:28:04 +0000 |
|---|---|---|
| committer | Vlad Glagolev | 2019-07-25 03:28:04 +0000 |
| commit | 968d7d9c17dd01481c5ad62517729bd5057dd98a (patch) | |
| tree | 1607895f90a592a8e981f5187bf11f8fb3084d66 /x11 | |
| parent | bd42881f44ca2368902829862bdaea6d589503e2 (diff) | |
polybar: post-update fixes
Diffstat (limited to 'x11')
| -rwxr-xr-x | x11/polybar/BUILD | 6 | ||||
| -rwxr-xr-x | x11/polybar/CONFIGURE | 19 | ||||
| -rwxr-xr-x | x11/polybar/DEPENDS | 23 | ||||
| -rw-r--r-- | x11/polybar/HISTORY | 4 |
4 files changed, 21 insertions, 31 deletions
diff --git a/x11/polybar/BUILD b/x11/polybar/BUILD index 58be5715f9..100cd5b9f6 100755 --- a/x11/polybar/BUILD +++ b/x11/polybar/BUILD @@ -1,11 +1,5 @@ OPTS="${POLYBAR_OPTS} ${OPTS}" && -# disable buggy options (see https://github.com/jaagr/polybar/issues/1730) -OPTS="-DWITH_XRENDER=OFF \ - -DWITH_XDAMAGE=OFF \ - -DWITH_XSYNC=OFF \ - ${OPTS}" && - if is_depends_enabled ${SPELL} llvm && is_depends_enabled ${SPELL} ccache; then CXXFLAGS="-Wno-error=unused-command-line-argument ${CXXFLAGS}" fi && diff --git a/x11/polybar/CONFIGURE b/x11/polybar/CONFIGURE index fc0cfad603..627c8a8b7f 100755 --- a/x11/polybar/CONFIGURE +++ b/x11/polybar/CONFIGURE @@ -23,22 +23,15 @@ list_remove POLYBAR_OPTS '-DWITH_XRENDER=ON' && list_remove POLYBAR_OPTS '-DWITH_XDAMAGE=ON' && list_remove POLYBAR_OPTS '-DWITH_XSYNC=ON' && -#config_query_option POLYBAR_OPTS "Enable xrender support?" n \ -# "-DWITH_XRENDER=ON" \ -# "-DWITH_XRENDER=OFF" && - -#config_query_option POLYBAR_OPTS "Enable xdamage support?" n \ -# "-DWITH_XDAMAGE=ON" \ -# "-DWITH_XDAMAGE=OFF" && - -#config_query_option POLYBAR_OPTS "Enable xsync support?" n \ -# "-DWITH_XSYNC=ON" \ -# "-DWITH_XSYNC=OFF" && - config_query_option POLYBAR_OPTS "Enable xcomposite support?" n \ "-DWITH_XCOMPOSITE=ON" \ "-DWITH_XCOMPOSITE=OFF" && config_query_option POLYBAR_OPTS "Enable xkeyboard support?" y \ "-DWITH_XKB=ON -DENABLE_XKEYBOARD=ON" \ - "-DWITH_XKB=OFF -DENABLE_XKEYBOARD=OFF" + "-DWITH_XKB=OFF -DENABLE_XKEYBOARD=OFF" && + +config_query_list POLYBAR_NETWORK "Enable network support?" \ + libnl \ + wireless_tools \ + none diff --git a/x11/polybar/DEPENDS b/x11/polybar/DEPENDS index abc1ca18ee..51ea11b114 100755 --- a/x11/polybar/DEPENDS +++ b/x11/polybar/DEPENDS @@ -55,17 +55,17 @@ optional_depends libmpdclient \ "-DENABLE_MPD=OFF" \ "for MPD playback controls and status display" && -optional_depends wireless_tools \ - "-DENABLE_NETWORK=ON" \ - "-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 && +case $POLYBAR_NETWORK in + none) + list_add POLYBAR_OPTS "-DENABLE_NETWORK=OFF" + ;; + libnl) + depends libnl "-DENABLE_NETWORK=ON -DWITH_LIBNL=ON" + ;; + wireless_tools) + depends wireless_tools "-DENABLE_NETWORK -DWITH_LIBNL=OFF" + ;; +esac && optional_depends xcb-util-cursor \ "-DWITH_XCURSOR=ON" \ @@ -85,5 +85,6 @@ optional_depends python-sphinx \ "-DBUILD_DOC=OFF" \ "to build documentation" && +suggest_depends font-misc-misc "" "" "to use Fixed font" && suggest_depends unifont "" "" "to use Unifont" && suggest_depends siji "" "" "to use iconic font Siji" diff --git a/x11/polybar/HISTORY b/x11/polybar/HISTORY index 25c623a23b..63e26700d0 100644 --- a/x11/polybar/HISTORY +++ b/x11/polybar/HISTORY @@ -1,6 +1,8 @@ 2019-07-24 Vlad Glagolev <stealth@sourcemage.org> * DETAILS: updated spell to 3.4.0 - * DEPENDS: added libnl, python-sphinx optional dependencies + * DEPENDS: added libnl, python-sphinx, font-misc-misc optional deps + * CONFIGURE: migrated network configuration here + * BUILD: removed obsolete stuff * cmake-doc.patch: dropped 2019-04-11 Vlad Glagolev <stealth@sourcemage.org> |