sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Andraž Levstik (ef13a53bb5b3610df97b54d15c17b8c85f585e61)

From: Andraž Levstik <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (ef13a53bb5b3610df97b54d15c17b8c85f585e61)
Date: Sat, 4 Apr 2009 09:37:42 -0500

GIT changes to master grimoire by Andraž Levstik <ruskie AT codemages.net>:

wm-addons/dzen2/DEPENDS | 3 +++
wm-addons/dzen2/HISTORY | 4 ++++
wm-addons/dzen2/PRE_BUILD | 40 ++++++++++++++++++++++++++++++++--------
3 files changed, 39 insertions(+), 8 deletions(-)

New commits:
commit ef13a53bb5b3610df97b54d15c17b8c85f585e61
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

dzen2: fresh depends

diff --git a/wm-addons/dzen2/DEPENDS b/wm-addons/dzen2/DEPENDS
index 37db132..330ecf6 100755
--- a/wm-addons/dzen2/DEPENDS
+++ b/wm-addons/dzen2/DEPENDS
@@ -1,3 +1,6 @@
depends xorg-libs &&

optional_depends libxinerama "" "" "Enable Xinerama support?"
+optional_depends libxpm "" "" "Enable XPM support?"
+optional_depends libxft "" "" "Enable XFT support?"
+
diff --git a/wm-addons/dzen2/HISTORY b/wm-addons/dzen2/HISTORY
index c05ea2f..8bad4c7 100644
--- a/wm-addons/dzen2/HISTORY
+++ b/wm-addons/dzen2/HISTORY
@@ -1,3 +1,7 @@
+2009-04-04 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: more depends and so on
+ * PRE_BUILD: apply various depends
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs
No need to check if using modular X as that's all that's available
now
diff --git a/wm-addons/dzen2/PRE_BUILD b/wm-addons/dzen2/PRE_BUILD
index 985dcea..3c2a90e 100755
--- a/wm-addons/dzen2/PRE_BUILD
+++ b/wm-addons/dzen2/PRE_BUILD
@@ -1,12 +1,36 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-sedit "s:^PREFIX.*:PREFIX= ${INSTALL_ROOT}/usr:" config.mk &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+cat config.mk
+sedit "s:^PREFIX.*:PREFIX= ${INSTALL_ROOT}/usr:" config.mk &&
+# comment out existing
+sedit "s:^LIBS $.*$:# LIBS \1:" config.mk &&
+sedit "s:^CFLAGS $.*$:# CFLAGS \1:" config.mk &&
+# replace with the default
+sedit "22s:^#LIBS $.*$:LIBS \1:" config.mk &&
+sedit "23s:^#CFLAGS $.*$:CFLAGS \1:" config.mk &&
+sedit "22s:^# LIBS $.*$:LIBS \1:" config.mk &&
+sedit "23s:^# CFLAGS $.*$:CFLAGS \1:" config.mk &&
+sedit "s:^CFLAGS = -Os $.*$:CFLAGS = \1 $CFLAGS:" config.mk &&
+sedit "s:^LDFLAGS = $.*$:LDFLAGS = \1 $LDFLAGS:" config.mk &&
+
+local DZENLIBS DZENFLAGS
+# pkg-config --libs xft xpm xinerama
if is_depends_enabled $SPELL libxinerama ; then
-sedit "s:^LIBS = $.*$:LIBS = \1 -lxinerama:" config.mk &&
-sedit "s:^CFLAGS = $.*$:CFLAGS = \1 -DDZEN_XINERAMA:" config.mk
-fi &&
-sedit "s:^CFLAGS = -Os $.*$:CFLAGS = \1 $CFLAGS:" config.mk &&
-sedit "s:^LDFLAGS = $.*$:LDFLAGS = \1 $LDFLAGS:" config.mk &&
+DZENFLAGS="$DZENFLAGS -DDZEN_XINERAMA"
+DZENLIBS="$DZENLIBS $(pkg-config --libs xinerama)"
+fi &&
+if is_depends_enabled $SPELL libxpm ; then
+DZENFLAGS="$DZENFLAGS -DDZEN_XPM"
+DZENLIBS="$DZENLIBS $(pkg-config --libs xpm)"
+fi &&
+if [[ "$DZEN_SCM" == "y" ]]; then
+if is_depends_enabled $SPELL libxft ; then
+DZENFLAGS="$DZENFLAGS -DDZEN_XFT $(pkg-config --cflags xft)"
+DZENLIBS="$DZENLIBS $(pkg-config --libs xft)"
+fi
+fi &&
+sedit "s:^CFLAGS = $.*$:CFLAGS = \1 $DZENFLAGS:" config.mk &&
+sedit "s:^LIBS = $.*$:LIBS = \1 $DZENLIBS:" config.mk &&
if [[ $DZEN2_GADGETS == y ]]; then
sedit "s:^PREFIX.*:PREFIX= ${INSTALL_ROOT}/usr:" gadgets/config.mk &&
sedit "s:^CFLAGS = -Os $.*$:CFLAGS = \1 $CFLAGS:" gadgets/config.mk &&

[SM-Commit] GIT changes to master grimoire by Andraž Levstik (ef13a53bb5b3610df97b54d15c17b8c85f585e61), Andraž Levstik, 04/04/2009