Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (968d7d9c17dd01481c5ad62517729bd5057dd98a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (968d7d9c17dd01481c5ad62517729bd5057dd98a)
  • Date: Thu, 25 Jul 2019 03:28:37 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

x11/polybar/BUILD | 6 ------
x11/polybar/CONFIGURE | 19 ++++++-------------
x11/polybar/DEPENDS | 23 ++++++++++++-----------
x11/polybar/HISTORY | 4 +++-
4 files changed, 21 insertions(+), 31 deletions(-)

New commits:
commit 968d7d9c17dd01481c5ad62517729bd5057dd98a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

polybar: post-update fixes

diff --git a/x11/polybar/BUILD b/x11/polybar/BUILD
index 58be571..100cd5b 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 fc0cfad..627c8a8 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 abc1ca1..51ea11b 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 25c623a..63e2670 100644
--- a/x11/polybar/HISTORY
+++ b/x11/polybar/HISTORY
@@ -1,6 +1,8 @@
2019-07-24 Vlad Glagolev <stealth AT 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 AT sourcemage.org>



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (968d7d9c17dd01481c5ad62517729bd5057dd98a), Vlad Glagolev, 07/24/2019

Archive powered by MHonArc 2.6.24.

Top of Page