Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (1b69450d96796f9d856e3b265e103ed034926331)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (1b69450d96796f9d856e3b265e103ed034926331)
  • Date: Wed, 18 Jun 2008 11:26:41 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

kde4/HISTORY | 4 ++++
kde4/KDE_DEPENDS | 5 ++++-
kde4/kdebase4-runtime/DEPENDS | 13 +++++--------
kde4/kdebase4-runtime/HISTORY | 3 ---
4 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 1b69450d96796f9d856e3b265e103ed034926331
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

kde4/KDE_DEPENDS: kdebase4-runtime devel also depends on phonon

commit 1d654eb4fe13e2d059d4445bb78332bed95d8ce3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Revert "kdebase4-runtime: Depends on phonon (thanks Jaka)"

This reverts commit 549e2ab37da7e7267c16817a1e71a9194ff8a346.

Fix this in KDE_DEPENDS instead

diff --git a/kde4/HISTORY b/kde4/HISTORY
index 2d09a99..ea742ec 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,6 @@
+2008-06-18 Eric Sandall <sandalle AT sourcemage.org>
+ * KDE_DEPENDS: kdebase4-runtime devel also depends on phonon
+
2008-06-12 Juuso Alasuutari <iuso AT sourcemage.org>
* FUNCTIONS: Added creation of dbus services dir symlink to
default_install to make sure that all kde4 spells place
@@ -80,3 +83,4 @@
delete user specific code, not needed here
make KDE4DIR persistent
* KDE_DEPENDS: add pkgconfig
+
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index 5da0bfb..14a09b0 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -35,7 +35,10 @@ case $SPELL in
;;

kdebase4-runtime)
- depends kdelibs4
+ depends kdelibs4 &&
+ if [[ $KDE_VER != stable ]]; then
+ depends phonon
+ fi
;;

kdebase-workspace4)
diff --git a/kde4/kdebase4-runtime/DEPENDS b/kde4/kdebase4-runtime/DEPENDS
index 980a3ed..0b423e2 100755
--- a/kde4/kdebase4-runtime/DEPENDS
+++ b/kde4/kdebase4-runtime/DEPENDS
@@ -1,11 +1,8 @@
source $SECTION_DIRECTORY/KDE_DEPENDS &&
-source $GRIMOIRE/FUNCTIONS &&
-
-depends kdepimlibs4 &&
-depends phonon &&
-depends qimageblitz &&
-depends xine-lib &&
-
+source $GRIMOIRE/FUNCTIONS &&
+depends qimageblitz &&
+depends kdepimlibs4 &&
+depends xine-lib &&
if check_if_xorg_modular_libs qt4 ; then
# depends imake &&
# depends libxau &&
@@ -22,6 +19,6 @@ if check_if_xorg_modular_libs qt4 ; then
# optional_depends libxdamage '' '' 'Compositing support'
sub_depends xine-lib libxcb
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 fe111ac..0c1a300 100644
--- a/kde4/kdebase4-runtime/HISTORY
+++ b/kde4/kdebase4-runtime/HISTORY
@@ -1,6 +1,3 @@
-2008-06-16 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Depends on phonon (thanks Jaka)
-
2008-06-11 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.0.82




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (1b69450d96796f9d856e3b265e103ed034926331), Eric Sandall, 06/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page