Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test grimoire by Jaka Kranjc

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test grimoire by Jaka Kranjc
  • Date: Sun, 21 May 2006 14:51:32 -0500

GIT changes to test grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

kde-core/kdebase/DEPENDS | 2 +-
kde-core/kdebase/HISTORY | 3 +++
kde-core/kdelibs/HISTORY | 3 +++
kde-core/kdelibs/PRE_SUB_DEPENDS | 5 +++++
kde-core/kdelibs/SUB_DEPENDS | 9 +++++++++
5 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit fcd4503517e293eeb265b43a12c5f1b89051399e
Merge: 9b571fe... a5c8204...
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

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

commit 9b571fed87814d29ad9ef3982f6d5b4a8a7ebd8c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fixed #10917 (for devel sorcery users only)

diff --git a/kde-core/kdebase/DEPENDS b/kde-core/kdebase/DEPENDS
index 35a6163..8dd3e3f 100755
--- a/kde-core/kdebase/DEPENDS
+++ b/kde-core/kdebase/DEPENDS
@@ -1,4 +1,4 @@
-depends kdelibs &&
+depends -sub "SVG SSL" kdelibs &&

#if [ "$KDEBASE_AFS" = "y" ] ||
# [ "$KDEBASE_KRB4" = "y" ] ||
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index e42b54c..d7d892e 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,6 @@
+2006-05-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: added subdepends on kdelibs SVG, SSL for #10917,
+
2006-05-20 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: added missing &&
* PREPARE, PRE_BUILD: added
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index 90f1abb..c14af9a 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,6 @@
+2006-05-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: added. SVG subdep for #10917, SSL to make it
build
+
2006-03-28 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: version 3.5.2

diff --git a/kde-core/kdelibs/PRE_SUB_DEPENDS
b/kde-core/kdelibs/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..45d87a2
--- /dev/null
+++ b/kde-core/kdelibs/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ SVG) is_depends_enabled $SPELL libart_lgpl;;
+ SSL) is_depends_enabled $SPELL openssl;;
+esac
+return 1
diff --git a/kde-core/kdelibs/SUB_DEPENDS b/kde-core/kdelibs/SUB_DEPENDS
new file mode 100755
index 0000000..bfed993
--- /dev/null
+++ b/kde-core/kdelibs/SUB_DEPENDS
@@ -0,0 +1,9 @@
+case $THIS_SUB_DEPENDS in
+SVG) echo "SVG support requested, forcing libart_lgpl dependency." &&
+ depends libart_lgpl
+ ;;
+SSL) echo "SSL support requested, forcing openssl dependency." &&
+ depends openssl
+ ;;
+*) echo unknown sub-depends!!! ; return 1 ;;
+esac




Archive powered by MHonArc 2.6.24.

Top of Page