sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (23ac9e75803b913ff83148845dac2e7031326528)
- From: Arwed von Merkatz <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (23ac9e75803b913ff83148845dac2e7031326528)
- Date: Sun, 30 Sep 2007 05:47:02 -0500
GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:
e/e17/DEPENDS | 3 ++-
e/e17/HISTORY | 3 +++
editors/transfig/DEPENDS | 3 ++-
editors/transfig/HISTORY | 3 +++
gnome2-libs/gdm2/DEPENDS | 3 ++-
gnome2-libs/gdm2/HISTORY | 3 +++
gnome2-libs/pango/DEPENDS | 3 ++-
gnome2-libs/pango/HISTORY | 4 ++++
graphics/freewrl/DEPENDS | 7 ++++---
graphics/freewrl/HISTORY | 4 ++++
graphics/imagemagick/DEPENDS | 3 ++-
graphics/imagemagick/HISTORY | 3 +++
graphics/tgif/DEPENDS | 3 ++-
graphics/tgif/HISTORY | 3 +++
http/xulrunner/DEPENDS | 3 ++-
http/xulrunner/HISTORY | 3 +++
i18n/ami/DEPENDS | 4 +++-
i18n/ami/HISTORY | 3 +++
i18n/iiimf-canna/DEPENDS | 4 +++-
i18n/iiimf-canna/HISTORY | 3 +++
i18n/scim/DEPENDS | 4 +++-
i18n/scim/HISTORY | 3 +++
x11-toolkits/xaw3d/DEPENDS | 3 ++-
x11-toolkits/xaw3d/HISTORY | 3 +++
x11/tightvnc/DEPENDS | 3 ++-
x11/tightvnc/HISTORY | 3 +++
xfce/xfwm4/DEPENDS | 2 +-
xfce/xfwm4/HISTORY | 3 +++
28 files changed, 76 insertions(+), 16 deletions(-)
New commits:
commit 23ac9e75803b913ff83148845dac2e7031326528
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
xfwm4: fixed xorg-modular check
commit 702c2b0205e560060dc9272f74518fcfcfad9f94
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
tightvnc: fixed xorg-modular check
commit 274cb5203b450418f73297871ae286067cf55b10
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
xaw3d: fixed xorg-modular check
commit 3ff138bcffacfbeab895fad4bced94545cb0a19e
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
scim: fixed xorg-modular check
commit f18c64ead3ff050d05f95fbff20d1ffe5efc3bde
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
iiimf-canna: fixed xorg-modular check
commit 56eda52f188aca7b9c6d6e720c794177ae98ab68
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
ami: fixed xorg-modular check
commit 87e56c2c1d355751315654e0c76c21570c374fef
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
xulrunner: fixed xorg-modular check
commit 3fa216300e120a115fadc83fda17d0babc6ad587
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
tgif: fixed xorg-modular check
commit c8849ee52a695e13ef6306e5c3a4279366e6b389
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
imagemagick: fixed xorg-modular check
commit 123c408ee74a6b5782ffc7444f8bdcf1d29f1c66
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
freewrl: fixed xorg-modular check
commit 9089e7c0db18db300fc5793521234bd4ed536a7d
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
gdm2: fixed xorg-modular check
commit 40d1bbbf1b5609be2a847c60e421f41423d67f69
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
transfig: fixed xorg-modular check
commit f4b3f76234805745dc97e62ad21ddd8a197a3e69
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
e17: fixed xorg-modular check
commit 0954fcc7f756bf4e70024b4199402c4390f6d041
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
pango: fix check for xorg-modular
diff --git a/e/e17/DEPENDS b/e/e17/DEPENDS
index 65bb1bc..beb6211 100755
--- a/e/e17/DEPENDS
+++ b/e/e17/DEPENDS
@@ -6,7 +6,8 @@ depends imlib2 &&
depends X11-LIBS &&
depends efreet &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends libxcursor &&
depends libxdamage &&
depends libxinerama &&
diff --git a/e/e17/HISTORY b/e/e17/HISTORY
index 823eaaf..e46e0fa 100644
--- a/e/e17/HISTORY
+++ b/e/e17/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-06-19 Philippe Caseiro <puppetmaster AT sourcemage.org>
* DEPENDS: Adding optional depend for e_dbus
diff --git a/editors/transfig/DEPENDS b/editors/transfig/DEPENDS
index e39715a..1876837 100755
--- a/editors/transfig/DEPENDS
+++ b/editors/transfig/DEPENDS
@@ -4,6 +4,7 @@ depends rman &&
depends X11-LIBS &&
depends zlib &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends imake
fi
diff --git a/editors/transfig/HISTORY b/editors/transfig/HISTORY
index 641cb1f..e436853 100644
--- a/editors/transfig/HISTORY
+++ b/editors/transfig/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-08-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, BUILD: updated to 3.2.5
* transfig.patch: removed
diff --git a/gnome2-libs/gdm2/DEPENDS b/gnome2-libs/gdm2/DEPENDS
index 2504e92..e4e7631 100755
--- a/gnome2-libs/gdm2/DEPENDS
+++ b/gnome2-libs/gdm2/DEPENDS
@@ -4,7 +4,8 @@ depends librsvg2 &&
depends rarian &&
depends gnome-doc-utils &&
-if [ "$(get_spell_provider gtk+2 X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs gtk+2; then
optional_depends sessreg '' '' 'for wtmp/utmp updating'
fi &&
diff --git a/gnome2-libs/gdm2/HISTORY b/gnome2-libs/gdm2/HISTORY
index c291aa1..82aef7f 100644
--- a/gnome2-libs/gdm2/HISTORY
+++ b/gnome2-libs/gdm2/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-09-20 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 2.20.0
* DEPENDS: changed scrollkeeper to rarian
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 83eaa52..e0eb408 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -4,7 +4,8 @@ depends automake &&
depends glib2 &&
depends cairo &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends libxft &&
depends libxrender
fi &&
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index 2cfff31..838bd29 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,7 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: use check_if_xorg_modular_libs so it works with xorg-libs
+ as X11 provider
+
2007-09-19 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.18.2
diff --git a/graphics/freewrl/DEPENDS b/graphics/freewrl/DEPENDS
index 4b350e6..43e1171 100755
--- a/graphics/freewrl/DEPENDS
+++ b/graphics/freewrl/DEPENDS
@@ -6,10 +6,11 @@ depends perl &&
depends imagemagick &&
depends gzip &&
depends sox &&
-if spell_ok xorg-server; then
+depends X11-SERVER &&
+
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_server; then
depends xterm
-else
- depends X11-SERVER
fi &&
if [ "$FREEWRL_PLUGIN" == "y" ]; then
diff --git a/graphics/freewrl/HISTORY b/graphics/freewrl/HISTORY
index 64e1cb5..4a6a41c 100644
--- a/graphics/freewrl/HISTORY
+++ b/graphics/freewrl/HISTORY
@@ -1,3 +1,7 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: depend on X11-SERVER and additionally on xterm if using
+ -modular
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index bc1a57c..abffaf7 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -21,7 +21,8 @@ optional_depends X11-LIBS
\
"" \
"To support X display and auto some other dependecies" &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends libxrender
fi &&
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index 71a7152..b34c3ba 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-09-22 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 6.3.5-10
diff --git a/graphics/tgif/DEPENDS b/graphics/tgif/DEPENDS
index 664d8bf..20d0d79 100755
--- a/graphics/tgif/DEPENDS
+++ b/graphics/tgif/DEPENDS
@@ -1,5 +1,6 @@
depends X11-LIBS &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends imake
fi
diff --git a/graphics/tgif/HISTORY b/graphics/tgif/HISTORY
index d7043a0..b1c802a 100644
--- a/graphics/tgif/HISTORY
+++ b/graphics/tgif/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2006-06-24 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 4.1.45, corrected WEB_SITE, removed BUILD_API
diff --git a/http/xulrunner/DEPENDS b/http/xulrunner/DEPENDS
index 91a7105..c8e9190 100755
--- a/http/xulrunner/DEPENDS
+++ b/http/xulrunner/DEPENDS
@@ -8,7 +8,8 @@ depends gtk+2 '--enable-default-toolkit=gtk2' &&
depends libidl '--with-libIDL' &&
depends nspr '--with-system-nspr' &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends libxft
fi &&
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 661837a..1b0e995 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-02-09 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DEPENDS: removed JDK as it was broken anyway
diff --git a/i18n/ami/DEPENDS b/i18n/ami/DEPENDS
index 753931d..2c26f4a 100755
--- a/i18n/ami/DEPENDS
+++ b/i18n/ami/DEPENDS
@@ -1,7 +1,9 @@
depends gdk-pixbuf &&
depends gtk+ &&
depends glib &&
-if [[ $(get_spell_provider gtk+ X11-LIBS) == "xorg-server" ]]; then
+
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs gtk+; then
depends libx11 &&
depends libxext &&
depends libxau &&
diff --git a/i18n/ami/HISTORY b/i18n/ami/HISTORY
index 77c51b9..4deb1a6 100644
--- a/i18n/ami/HISTORY
+++ b/i18n/ami/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-04-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 1.2.3
diff --git a/i18n/iiimf-canna/DEPENDS b/i18n/iiimf-canna/DEPENDS
index 508f400..288547c 100755
--- a/i18n/iiimf-canna/DEPENDS
+++ b/i18n/iiimf-canna/DEPENDS
@@ -2,7 +2,9 @@ depends gtk+ &&
depends glib &&
depends im-sdk &&
depends canna &&
-if [[ $(get_spell_provider gtk+ X11-LIBS) == "xorg-server" ]]; then
+
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs gtk+; then
depends libx11 &&
depends libxext &&
depends libxau &&
diff --git a/i18n/iiimf-canna/HISTORY b/i18n/iiimf-canna/HISTORY
index bb1b356..50a4b8b 100644
--- a/i18n/iiimf-canna/HISTORY
+++ b/i18n/iiimf-canna/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.
diff --git a/i18n/scim/DEPENDS b/i18n/scim/DEPENDS
index 660348f..ee1f706 100755
--- a/i18n/scim/DEPENDS
+++ b/i18n/scim/DEPENDS
@@ -12,7 +12,9 @@ depends zlib &&
depends libpng &&
depends glitz &&
depends expat &&
-if [[ $(get_spell_provider gtk+ X11-LIBS) == "xorg-server" ]]; then
+
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs gtk+; then
depends libx11 &&
depends libxext &&
depends libxrender &&
diff --git a/i18n/scim/HISTORY b/i18n/scim/HISTORY
index 0a9b110..1b90c3a 100644
--- a/i18n/scim/HISTORY
+++ b/i18n/scim/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-09-09 Remko van der Vossen <wich AT stack.nl>
* DETAILS: fixed SOURCE_HASh
diff --git a/x11-toolkits/xaw3d/DEPENDS b/x11-toolkits/xaw3d/DEPENDS
index 13bb337..c3de6a2 100755
--- a/x11-toolkits/xaw3d/DEPENDS
+++ b/x11-toolkits/xaw3d/DEPENDS
@@ -1,7 +1,8 @@
depends X11-LIBS &&
depends perl &&
-if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends imake &&
depends libxp
fi
diff --git a/x11-toolkits/xaw3d/HISTORY b/x11-toolkits/xaw3d/HISTORY
index ad75356..e8f23ad 100644
--- a/x11-toolkits/xaw3d/HISTORY
+++ b/x11-toolkits/xaw3d/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-09-22 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: Fails with multiple make jobs
diff --git a/x11/tightvnc/DEPENDS b/x11/tightvnc/DEPENDS
index 6e9e865..b12fc62 100755
--- a/x11/tightvnc/DEPENDS
+++ b/x11/tightvnc/DEPENDS
@@ -1,7 +1,8 @@
depends jpeg &&
depends X11-SERVER &&
-if [ "$(get_spell_provider $SPELL X11-SERVER)" == "xorg-server" ];
then
+. $GRIMOIRE/FUNCTIONS &&
+if check_if_xorg_modular_libs; then
depends gccmakedep &&
depends imake
fi
diff --git a/x11/tightvnc/HISTORY b/x11/tightvnc/HISTORY
index 875489f..5caab98 100755
--- a/x11/tightvnc/HISTORY
+++ b/x11/tightvnc/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: fixed check for xorg-modular
+
2007-05-09 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated devel and stable to 1.3.9.
* BUILD: Removed uneeded patches. Fixed Upstream
diff --git a/xfce/xfwm4/DEPENDS b/xfce/xfwm4/DEPENDS
index c8e0753..aec5d45 100755
--- a/xfce/xfwm4/DEPENDS
+++ b/xfce/xfwm4/DEPENDS
@@ -4,7 +4,7 @@ if [ "$COMPOSITOR" = "y" ]; then
depends XDAMAGE "--enable-compositor"
fi &&
-if [ "$(get_spell_provider $SPELL XDAMAGE)" == "xorg-server" ]; then
+if [ "$(get_spell_provider $SPELL XDAMAGE)" == "libxdamage" ]; then
depends libxrender
fi &&
diff --git a/xfce/xfwm4/HISTORY b/xfce/xfwm4/HISTORY
index b03119b..4e013bd 100644
--- a/xfce/xfwm4/HISTORY
+++ b/xfce/xfwm4/HISTORY
@@ -1,3 +1,6 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: provider for XDAMAGE is libxdamage, not xorg-server
+
2007-05-06 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added libxrandr as optional if xorg is modular for gtk+2
- [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (23ac9e75803b913ff83148845dac2e7031326528), Arwed von Merkatz, 09/30/2007
Archive powered by MHonArc 2.6.24.