[SM-Commit] GIT changes to test grimoire by Eric Sandall

Eric Sandall scm at mail.sourcemage.org
Thu May 25 16:36:46 EDT 2006


GIT changes to test grimoire by Eric Sandall <sandalle at sourcemage.org>:

 kde-core/kdebase/DEPENDS |   12 ++++++++++++
 kde-core/kdebase/HISTORY |    5 +++++
 kde-core/kdelibs/DEPENDS |    6 ++++++
 kde-core/kdelibs/HISTORY |    4 ++++
 4 files changed, 27 insertions(+)

New commits:
commit dfb1d8ea5ccdbc1500622654d6fb0b0df5c4a823
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    More dependency fixes for xorg-server usage for kdelibs

commit 7542f4b95fa604aea18032626bf9073e8bb73d8d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    More dependency fixes for xorg-server usage for kdebase

diff --git a/kde-core/kdebase/DEPENDS b/kde-core/kdebase/DEPENDS
index 8dd3e3f..a9fd712 100755
--- a/kde-core/kdebase/DEPENDS
+++ b/kde-core/kdebase/DEPENDS
@@ -8,6 +8,18 @@ #
 #  depends  krb5
 #fi  &&
 
+if  [  "$(get_spell_provider  qt-x11  X11-LIBS)"  ==  "xorg-server"  ];  then
+  depends  libxau         &&
+  depends  libxcomposite  &&
+  depends  libxcursor     &&
+  depends  libxdmcp       &&
+  depends  libxfixes      &&
+  depends  libxft         &&
+  depends  libxrandr      &&
+  depends  libxtst        &&
+  depends  libxxf86misc
+fi  &&
+
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 
 optional_depends  OPENGL                 \
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index d7d892e..7961593 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,8 @@
+2006-05-25 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depend on libxau, libxcomposite, libxcursor, libxdmcp, libxfixes,
+	  libxft, libxrandr, libxtst, and libxxf86misc if xorg-server provides
+	  X11-LIBS for qt-x11
+
 2006-05-21 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* DEPENDS: added subdepends on kdelibs SVG, SSL for #10917,
 
diff --git a/kde-core/kdelibs/DEPENDS b/kde-core/kdelibs/DEPENDS
index 24c9ea3..d5c0a17 100755
--- a/kde-core/kdelibs/DEPENDS
+++ b/kde-core/kdelibs/DEPENDS
@@ -2,6 +2,12 @@ depends  qt-x11              &&
 depends  docbook-dtd         &&
 depends  hicolor-icon-theme  &&
 
+if  [  "$(get_spell_provider  qt-x11  X11-LIBS)"  ==  "xorg-server"  ];  then
+  depends  libice   &&
+  depends  libsm    &&
+  depends  libxext
+fi  &&
+
 source  $SECTION_DIRECTORY/KDE_DEPENDS  &&
 
 optional_depends  libart_lgpl                \
diff --git a/kde-core/kdelibs/HISTORY b/kde-core/kdelibs/HISTORY
index cd7da74..5755f68 100644
--- a/kde-core/kdelibs/HISTORY
+++ b/kde-core/kdelibs/HISTORY
@@ -1,3 +1,7 @@
+2006-05-25 Eric Sandall <eric at sandall.us>
+	* DEPENDS: Depend on libice, libsm, and libxext if xorg-server is
+	  providing X11-LIBS for qt-x11
+
 2006-05-22 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* {PRE_,}SUB_DEPENDS: added ARTS subdep for #8811
 



More information about the SM-Commit mailing list