Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Pol Vinogradov (ca9578f54604be2c78f936bc70c65c0e68e37ff0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Pol Vinogradov (ca9578f54604be2c78f936bc70c65c0e68e37ff0)
  • Date: Wed, 7 Jun 2006 13:07:58 -0500

GIT changes to test grimoire by Pol Vinogradov <vin.public AT gmail.com>:

kde-core/kdebase/DEPENDS | 6 +++---
kde-core/kdebase/HISTORY | 3 ++-
kde-core/kdelibs/DEPENDS | 6 +++---
kde-core/kdelibs/HISTORY | 3 ++-
kde-core/kdemultimedia/DEPENDS | 6 +++---
kde-core/kdemultimedia/HISTORY | 3 ++-
6 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit ca9578f54604be2c78f936bc70c65c0e68e37ff0
Merge: 063666c... c1ced5e...
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit 063666c3d2ab8aa0fa51b1bfee264b8a6a29c9dc
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

quick fix #2: added source /FUNCTIONS; bad me :(

commit a1a64f92435303f28181abc26cbb7cd2a1d1fdc5
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

quick fix: removed [[ and ]] in if statement

commit f32df958c90eb26f1c9c20f53d2a57ce15f2d11a
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

checking converted to check_if_xorg_modular_libs

diff --git a/kde-core/kdebase/DEPENDS b/kde-core/kdebase/DEPENDS
index a79c981..1ffdc29 100755
--- a/kde-core/kdebase/DEPENDS
+++ b/kde-core/kdebase/DEPENDS
@@ -8,9 +8,9 @@ #
# depends krb5
#fi &&

-if [[ "$(get_spell_provider qt-x11 X11-LIBS)" == "xorg-server" ]] ||
- [[ "$(get_spell_provider qt-x11 X11-LIBS)" == "xorg-libs" ]]
-then
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs qt-x11 ; then
depends imake &&
depends libxau &&
depends libxcomposite &&
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index cca3ba4..423697a 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,5 +1,6 @@
2006-06-07 Pol Vinogradov <vin.public AT gmail.com>
- * DEPENDS: added xorg-libs checking
+ * DEPENDS: added xorg-libs checking, converted to
+ check_if_xorg_modular_libs

2006-06-03 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added imake when xorg-server is provider of X11-LIBS for
qt-x11
diff --git a/kde-core/kdelibs/DEPENDS b/kde-core/kdelibs/DEPENDS
index ba0711e..a5043c2 100755
--- a/kde-core/kdelibs/DEPENDS
+++ b/kde-core/kdelibs/DEPENDS
@@ -2,9 +2,9 @@ depends qt-x11 &&
depends docbook-dtd &&
depends hicolor-icon-theme &&

-if [[ "$(get_spell_provider qt-x11 X11-LIBS)" == "xorg-server" ]] ||
- [[ "$(get_spell_provider qt-x11 X11-LIBS)" == "xorg-libs" ]]
-then
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs qt-x11 ; then
depends iceauth &&
depends libice &&
depends libsm &&
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index ae93c37..740eb9e 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,5 +1,6 @@
2006-06-07 Pol Vinogradov <vin.public AT gmail.com>
- * DEPENDS: added xorg-libs checking
+ * DEPENDS: added xorg-libs checking, converted to
+ check_if_xorg_modular_libs

2006-06-04 Eric Sandall <eric AT sandall.us>
* DEPENDS: DCOP requires on iceauth if using xorg-server
diff --git a/kde-core/kdemultimedia/DEPENDS b/kde-core/kdemultimedia/DEPENDS
index e5937de..4fc52a2 100755
--- a/kde-core/kdemultimedia/DEPENDS
+++ b/kde-core/kdemultimedia/DEPENDS
@@ -1,9 +1,9 @@
depends kdebase &&
depends libpng &&

-if [[ "$(get_spell_provider qt-x11 X11-LIBS)" == "xorg-server" ]] ||
- [[ "$(get_spell_provider qt-x11 X11-LIBS)" == "xorg-libs" ]]
-then
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs qt-x11 ; then
depends libxxf86dga
fi &&

diff --git a/kde-core/kdemultimedia/HISTORY b/kde-core/kdemultimedia/HISTORY
index 4aacc79..59151e6 100644
--- a/kde-core/kdemultimedia/HISTORY
+++ b/kde-core/kdemultimedia/HISTORY
@@ -1,5 +1,6 @@
2006-06-07 Pol Vinogradov <vin.public AT gmail.com>
- * DEPENDS: added xorg-libs checking
+ * DEPENDS: added xorg-libs checking, converted to
+ check_if_xorg_modular_libs

2006-06-04 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added libxxf86dga when xorg-server is provider of X11-LIBS
for qt-x11



  • [SM-Commit] GIT changes to test grimoire by Pol Vinogradov (ca9578f54604be2c78f936bc70c65c0e68e37ff0), Pol Vinogradov, 06/07/2006

Archive powered by MHonArc 2.6.24.

Top of Page