Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9636a020ec4b0adfa92958594e62e1a2350351ec)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9636a020ec4b0adfa92958594e62e1a2350351ec)
  • Date: Thu, 21 Aug 2008 04:25:52 -0500

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

kde4/kdebase4-runtime/DEPENDS | 5 ++---
kde4/kdebase4-runtime/HISTORY | 4 ++++
2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 9636a020ec4b0adfa92958594e62e1a2350351ec
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdebase4-runtime: don't request an invalid sub dependency #14644
xine-lib usually depends on libxcb; if it doesn't, it isn't needed
(xorg)

diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index a584609..097a995 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -2,7 +2,7 @@ source $SECTION_DIRECTORY/KDE_DEPENDS &&
source $GRIMOIRE/FUNCTIONS &&
depends qimageblitz &&
depends xine-lib &&
-if check_if_xorg_modular_libs qt4 ; then
+#if check_if_xorg_modular_libs qt4 ; then
# depends imake &&
# depends libxau &&
# depends libxcomposite &&
@@ -16,8 +16,7 @@ if check_if_xorg_modular_libs qt4 ; then
# depends xsetroot &&
# depends xset &&
# optional_depends libxdamage '' '' 'Compositing support'
- sub_depends xine-lib libxcb
-fi &&
+#fi &&
optional_depends openexr '' '' 'EXR support for thumbnails' &&
optional_depends samba '' '' 'build smb-ioslave'

diff --git a/kde4/kdebase4-runtime/HISTORY b/kde4/kdebase4-runtime/HISTORY
index 90465c5..3fc31d2 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,3 +1,7 @@
+2008-08-21 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * DEPENDS: don't request an invalid sub dependency #14644
+ xine-lib usually depends on libxcb; if it doesn't, it isn't needed
(xorg)
+
2008-08-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.1.61




  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (9636a020ec4b0adfa92958594e62e1a2350351ec), Jaka Kranjc, 08/21/2008

Archive powered by MHonArc 2.6.24.

Top of Page