Skip to Content.
Sympa Menu

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

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 (5bafb723bf03a7cf31874fb77b16c4d5ef497c28)
  • Date: Tue, 24 Nov 2020 15:24:50 +0000

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

utils/dmenu/DETAILS | 5 +++++
utils/dmenu/HISTORY | 3 +++
utils/dmenu/PREPARE | 3 ++-
utils/dmenu/PRE_BUILD | 14 ++++++++++++++
4 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 5bafb723bf03a7cf31874fb77b16c4d5ef497c28
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

dmenu: add xyw patch option

diff --git a/utils/dmenu/DETAILS b/utils/dmenu/DETAILS
index 1018ffd..a9140c9 100755
--- a/utils/dmenu/DETAILS
+++ b/utils/dmenu/DETAILS
@@ -24,6 +24,11 @@ if [[ $DMENU_NUMBERS == y ]]; then

SOURCE5_URL=https://tools.suckless.org/${SPELL}/patches/numbers/${SOURCE5}

SOURCE5_HASH=sha512:15d88ea4f10c2fa6fb3eb7478f23b24210a0da3542ae7a5be609013500c15564eedd8153d850f079c2c1f4bab1f5e61ff51153e4c85445ee04a0de5c851e305a
fi
+if [[ $DMENU_XYW == y ]]; then
+ SOURCE6=${SPELL}-xyw-${VERSION}.diff
+ SOURCE6_URL=https://tools.suckless.org/${SPELL}/patches/xyw/${SOURCE6}
+
SOURCE6_HASH=sha512:af093f2e2be3c5c379add2340fcb9c4e63376a055849fe91685d033a486dae0b7d806b987b89498162ff00c3f47eaa0bda9601b08e5fdf4226af8bb18aa5057f
+fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://tools.suckless.org/dmenu
ENTERED=20061230
diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY
index 64ff65c..1ba1f5f 100644
--- a/utils/dmenu/HISTORY
+++ b/utils/dmenu/HISTORY
@@ -1,3 +1,6 @@
+2020-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, PRE_BUILD, PREPARE: add xyw patch option
+
2020-10-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PRE_BUILD, PREPARE: add numbers patch option

diff --git a/utils/dmenu/PREPARE b/utils/dmenu/PREPARE
index 0572263..5678e10 100755
--- a/utils/dmenu/PREPARE
+++ b/utils/dmenu/PREPARE
@@ -1,4 +1,5 @@
config_query DMENU_PASSWORD "Apply dmenu password patch?" n &&
config_query DMENU_LINEHEIGHT "Apply dmenu line height patch?" n &&
config_query DMENU_NUMBERS "Apply dmenu numbers patch?" n &&
-config_query DMENU_MOUSE_SUPPORT "Apply dmenu mouse support patch?" n
+config_query DMENU_MOUSE_SUPPORT "Apply dmenu mouse support patch?" n &&
+config_query DMENU_XYW "Apply xyw patch?" n
diff --git a/utils/dmenu/PRE_BUILD b/utils/dmenu/PRE_BUILD
index 21c716a..0d1d694 100755
--- a/utils/dmenu/PRE_BUILD
+++ b/utils/dmenu/PRE_BUILD
@@ -25,6 +25,20 @@ if [[ $DMENU_NUMBERS == y ]]; then
cat ${SOURCE_CACHE}/${SOURCE5} | patch -p1
fi &&

+if [[ $DMENU_XYW == y ]]; then
+ verify_file 6 &&
+
+ if [[ $DMENU_PASSWORD == y ]] || [[ $DMENU_LINEHEIGHT == y ]]; then
+ if [[ $DMENU_MOUSE_SUPPORT == y ]]; then
+ cat ${SOURCE_CACHE}/${SOURCE6} | sed "s:@@ -690,6 +693,7 @@:@@ -691,6
+694,7 @@:" | patch -p1 -F3 # ignore context in case password/lineheight
patch was applied
+ else
+ cat ${SOURCE_CACHE}/${SOURCE6} | patch -p1 -F3 # ignore context in
case password/lineheight patch was applied
+ fi
+ else
+ cat ${SOURCE_CACHE}/${SOURCE6} | patch -p1
+ fi
+fi &&
+
if is_version_less $(installed_version fontconfig) 2.11.91; then
echo '#define FC_COLOR "color"' >> drw.h
fi &&



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (5bafb723bf03a7cf31874fb77b16c4d5ef497c28), Vlad Glagolev, 11/24/2020

Archive powered by MHonArc 2.6.24.

Top of Page