[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (c4b40706b2fa1700f905ea80897fb6b87dc653ce)

Arwed von Merkatz scm at sourcemage.org
Sat Aug 11 14:47:44 EDT 2007


GIT changes to master grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 gnome2-libs/libgnomekbd/HISTORY    |    3 +++
 gnome2-libs/libgnomekbd/PRE_BUILD  |    4 ++++
 shell-term-fm/rxvt-unicode/DEPENDS |    9 +++++++++
 shell-term-fm/rxvt-unicode/HISTORY |    3 +++
 4 files changed, 19 insertions(+)

New commits:
commit c4b40706b2fa1700f905ea80897fb6b87dc653ce
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    rxvt-unicode: optional_depend on libxft with xorg-modular

commit 4c25dbadb8673c6f08140b34502736636188db7b
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    libgnomekbd: remove -Werror from Makefiles

diff --git a/gnome2-libs/libgnomekbd/HISTORY b/gnome2-libs/libgnomekbd/HISTORY
index a3b6fa9..8263473 100644
--- a/gnome2-libs/libgnomekbd/HISTORY
+++ b/gnome2-libs/libgnomekbd/HISTORY
@@ -1,3 +1,6 @@
+2007-08-11 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* PRE_BUILD: added to remove -Werror from Makefiles
+
 2007-05-21 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 2.18.2
 
diff --git a/gnome2-libs/libgnomekbd/PRE_BUILD b/gnome2-libs/libgnomekbd/PRE_BUILD
new file mode 100755
index 0000000..189e93a
--- /dev/null
+++ b/gnome2-libs/libgnomekbd/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build  &&
+cd  $SOURCE_DIRECTORY  &&
+sed -i 's/-Werror//' test/Makefile.in  &&
+sed -i 's/-Werror//' capplet/Makefile.in
diff --git a/shell-term-fm/rxvt-unicode/DEPENDS b/shell-term-fm/rxvt-unicode/DEPENDS
index 5734d6d..c76fe81 100755
--- a/shell-term-fm/rxvt-unicode/DEPENDS
+++ b/shell-term-fm/rxvt-unicode/DEPENDS
@@ -1,6 +1,15 @@
 depends  g++       &&
 depends  X11-LIBS  &&
 
+source $GRIMOIRE/FUNCTIONS  &&
+
+if check_if_xorg_modular_libs; then
+  optional_depends  libxft           \
+                    "--enable-xft"   \
+                    "--disable-xft"  \
+                    "for XFT support"
+fi &&
+
 optional_depends  perl                             \
                   "--enable-perl"                  \
                   "--disable-perl"                 \
diff --git a/shell-term-fm/rxvt-unicode/HISTORY b/shell-term-fm/rxvt-unicode/HISTORY
index 873e4dc..7613fc8 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,6 @@
+2007-08-11 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* DEPENDS: optional_depends on libxft with xorg-modular
+
 2007-08-02 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 8.3
 	* DEPENDS: added optional_depends libafterimage



More information about the SM-Commit mailing list