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: Mon, 22 May 2006 10:50:53 -0500

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

kde-core/KDE_DEPENDS | 11 ++++++++++-
kde-core/kdelibs/HISTORY | 3 +++
kde-core/kdelibs/PRE_SUB_DEPENDS | 1 +
kde-core/kdelibs/SUB_DEPENDS | 3 +++
4 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 6f28249207a0c3a68d07aaf4d61207347f613d5e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

fixed #8811

diff --git a/kde-core/KDE_DEPENDS b/kde-core/KDE_DEPENDS
index 68f4136..c976189 100755
--- a/kde-core/KDE_DEPENDS
+++ b/kde-core/KDE_DEPENDS
@@ -1,4 +1,13 @@
optional_depends arts \
'--with-arts' \
'--without-arts' \
- 'for aRts sound daemon'
+ 'for aRts sound daemon' &&
+
+# is_enabled_depends is a 1.14 sorcery function, but not in libcompat,
+# so we only run it if it is actually available.
+# this is here for #8811
+if declare -f is_depends_enabled &> /dev/null; then
+ if is_depends_enabled $SPELL arts; then
+ sub_depends kdelibs ARTS
+ fi
+fi
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index c14af9a..cd7da74 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,6 @@
+2006-05-22 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * {PRE_,}SUB_DEPENDS: added ARTS subdep for #8811
+
2006-05-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* {PRE_,}SUB_DEPENDS: added. SVG subdep for #10917, SSL to make it
build

diff --git a/kde-core/kdelibs/PRE_SUB_DEPENDS
b/kde-core/kdelibs/PRE_SUB_DEPENDS
index 45d87a2..8bc11f4 100755
--- a/kde-core/kdelibs/PRE_SUB_DEPENDS
+++ b/kde-core/kdelibs/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
case $THIS_SUB_DEPENDS in
SVG) is_depends_enabled $SPELL libart_lgpl;;
SSL) is_depends_enabled $SPELL openssl;;
+ ARTS) is_depends_enabled $SPELL arts;;
esac
return 1
diff --git a/kde-core/kdelibs/SUB_DEPENDS b/kde-core/kdelibs/SUB_DEPENDS
index bfed993..f432249 100755
--- a/kde-core/kdelibs/SUB_DEPENDS
+++ b/kde-core/kdelibs/SUB_DEPENDS
@@ -5,5 +5,8 @@ SVG) echo "SVG support requested, forcin
SSL) echo "SSL support requested, forcing openssl dependency." &&
depends openssl
;;
+ARTS) echo "aRts support requested, forcing arts dependency." &&
+ depends arts
+ ;;
*) echo unknown sub-depends!!! ; return 1 ;;
esac




Archive powered by MHonArc 2.6.24.

Top of Page