Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f2c1ff3e10139f51e76244914cd58eabc2552cbc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f2c1ff3e10139f51e76244914cd58eabc2552cbc)
  • Date: Thu, 11 Nov 2021 20:16:01 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

utils/dmenu/BUILD | 2 +-
utils/dmenu/DEPENDS | 6 +++++-
utils/dmenu/DETAILS | 1 +
utils/dmenu/HISTORY | 5 +++++
utils/dmenu/PRE_BUILD | 15 ++++++---------
5 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit f2c1ff3e10139f51e76244914cd58eabc2552cbc
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dmenu: Make Xinerama optional, PATCHLEVEL++

commit 469379f6460c36db6697db482def6f312ffdc196
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dmenu: Simplify patching of config.mk

diff --git a/utils/dmenu/BUILD b/utils/dmenu/BUILD
index b9e1628..cb6fec6 100755
--- a/utils/dmenu/BUILD
+++ b/utils/dmenu/BUILD
@@ -1 +1 @@
-make
+make CC="$CC" $OPTS
diff --git a/utils/dmenu/DEPENDS b/utils/dmenu/DEPENDS
index 0af84d0..a7d8a36 100755
--- a/utils/dmenu/DEPENDS
+++ b/utils/dmenu/DEPENDS
@@ -1,8 +1,12 @@
depends libx11 &&
-depends libxinerama &&
depends freetype2 &&
depends fontconfig &&

+optional_depends libxinerama \
+ '' \
+ 'XINERAMALIBS= XINERAMAFLAGS=' \
+ 'for Multi-monitor support' &&
+
if [[ $DMENU_PASSWORD == y ]]; then
depends patchutils
fi
diff --git a/utils/dmenu/DETAILS b/utils/dmenu/DETAILS
index 9be207c..9db201d 100755
--- a/utils/dmenu/DETAILS
+++ b/utils/dmenu/DETAILS
@@ -1,5 +1,6 @@
SPELL=dmenu
VERSION=5.0
+ PATCHLEVEL=1
PATCH_VERSION=4.9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://dl.suckless.org/tools/${SOURCE}
diff --git a/utils/dmenu/HISTORY b/utils/dmenu/HISTORY
index 30e2eb4..0afbd2e 100644
--- a/utils/dmenu/HISTORY
+++ b/utils/dmenu/HISTORY
@@ -1,3 +1,8 @@
+2021-11-11 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: simplified patching of config.mk
+ * DEPENDS, BUILD: made xinerama optional
+ * DETAILS: PATCHLEVEL++
+
2020-11-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PRE_BUILD, PREPARE, fuzzy*.patch: add fuzzymatch and
fuzzyhighlight patches options
diff --git a/utils/dmenu/PRE_BUILD b/utils/dmenu/PRE_BUILD
index 0bfab55..90a4b9e 100755
--- a/utils/dmenu/PRE_BUILD
+++ b/utils/dmenu/PRE_BUILD
@@ -61,12 +61,9 @@ if is_version_less $(installed_version fontconfig)
2.11.91; then
echo '#define FC_COLOR "color"' >> drw.h
fi &&

-#right install paths
-sedit "s/\/usr\/local/${INSTALL_ROOT}\/usr/" config.mk &&
-sedit "s/\${PREFIX}\/etc/${INSTALL_ROOT}\/etc/" config.mk &&
-
-sedit "s:^CXXFLAGS \+=:CXXFLAGS = ${CXXFLAGS} :" config.mk &&
-sedit "s:^CFLAGS \+=:CFLAGS = ${CFLAGS} :" config.mk &&
-sedit "s:^LDFLAGS \+=:LDFLAGS = ${LDFLAGS} :" config.mk &&
-
-sedit "s:/X11R6::" config.mk
+# Fix flags and system paths
+sedit '
+ /^PREFIX *=/{s@=.*@= '"$INSTALL_ROOT"'/usr@}
+ /^\(C\|LD\)FLAGS *=/{s@=@+=@}
+ s@= *-[IL][$](X11...)@=@
+' config.mk



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (f2c1ff3e10139f51e76244914cd58eabc2552cbc), Ismael Luceno, 11/11/2021

Archive powered by MHonArc 2.6.24.

Top of Page