[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (7e799545e2367f8dbf46db5c458036e5a1a2ce40)

Treeve Jelbert scm at sourcemage.org
Wed Nov 7 08:08:50 EST 2007


GIT changes to master grimoire by Treeve Jelbert <treeve at sourcemage.org>:

 kde4/HISTORY                     |    3 +++
 kde4/KDE_DEPENDS                 |    3 ++-
 kde4/kdebase-workspace4/DEPENDS  |    4 +---
 kde4/kdebase-workspace4/HISTORY  |    8 ++++++++
 kde4/kdebase-workspace4/kde4.sh  |    2 +-
 x11-toolkits/qt4/DEPENDS         |    9 ++++++---
 x11-toolkits/qt4/HISTORY         |    6 ++++++
 x11-toolkits/qt4/PRE_SUB_DEPENDS |    1 +
 x11-toolkits/qt4/SUB_DEPENDS     |    3 +++
 9 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit 7e799545e2367f8dbf46db5c458036e5a1a2ce40
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qt4 - add sub OPENGL

commit 018a2c75007337a4f9494150d76f0d28bf165bbe
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kde4 - update depends

commit a3c7a07c92f18ced2b950cad3bf8ab3dee6850f2
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    kdebase-workspace4 - update depends & kde4.sh

commit 865269d62b0f81ff1411d054310a9567fcd041ef
Author: Treeve Jelbert <treeve at sourcemage.org>
Commit: Treeve Jelbert <treeve at sourcemage.org>

    qt4 - update depends

diff --git a/kde4/HISTORY b/kde4/HISTORY
index 347def1..49a4edd 100644
--- a/kde4/HISTORY
+++ b/kde4/HISTORY
@@ -1,3 +1,6 @@
+2007-11-07 Treeve Jelbert <treeve at sourcemage.org>
+	* KDE_DEPENDS: qt4 -sub OPENGL
+
 2007-10-31 Treeve Jelbert <treeve at sourcemage.org>
 	* KDE_DEPENDS: include kdebase4-runtime
 	  include plasma
diff --git a/kde4/KDE_DEPENDS b/kde4/KDE_DEPENDS
index cff0aa3..1ff8b42 100755
--- a/kde4/KDE_DEPENDS
+++ b/kde4/KDE_DEPENDS
@@ -37,7 +37,8 @@ case $SPELL in
                ;;
   
   kdebase-workspace4)
-               depends kdelibs4        &&
+               sub_depends qt4 OPENGL    &&
+               depends  kdebase4-runtime &&
                depends X11-SERVER
                ;;
 
diff --git a/kde4/kdebase-workspace4/DEPENDS b/kde4/kdebase-workspace4/DEPENDS
index 0139568..17130f0 100755
--- a/kde4/kdebase-workspace4/DEPENDS
+++ b/kde4/kdebase-workspace4/DEPENDS
@@ -19,7 +19,5 @@ optional_depends  libxklavier '' ''   'keyboard configuration'     &&
 optional_depends  libusb      '' ''   'usb support'                &&
 optional_depends  bluez-libs  '' ''   'Bluetooth support '         &&
 optional_depends  openldap    '' ''   'LDAP authentication'        &&
-optional_depends  cyrus-sasl  '' ''   'Cyrus SASL authentication'  &&
-optional_depends  OPENGL      '' ''   'OpenGL support in plasma'   &&
-optional_depends  plasma      '' ''   'additional plasma features'
+optional_depends  cyrus-sasl  '' ''   'Cyrus SASL authentication' 
 #optional_depends networkmanager  '' ''   '' &&
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index 96aa33e..8d8917a 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,11 @@
+2007-11-07  Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove redundant OPENGL, forced in KDE_DEPENDS
+
+2007-11-06  Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: remove plasma, which depends on this spell
+	* kde4.sh: prevent this from running as root, 
+	  as it messes up the environment for non kde4 usage.
+
 2007-10-31  Treeve Jelbert <treeve at sourcemage.org>
 	* kde4.sh: remove QTDIR
 	  exclude root from using this script
diff --git a/kde4/kdebase-workspace4/kde4.sh b/kde4/kdebase-workspace4/kde4.sh
index 31eb67b..30d058b 100644
--- a/kde4/kdebase-workspace4/kde4.sh
+++ b/kde4/kdebase-workspace4/kde4.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ $USER != root ];then
+if [ "$USER" != "root" ];then
 # setup KDE4 environment for SMGL
 
 export PATH=/usr/bin/qt4:$PATH
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 5778e8a..c816538 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -29,12 +29,15 @@ optional_depends  zlib                              \
                   '-qt-zlib'                        \
                   'to use the system zlib library'  &&
 
-if [ $QT_VER != stable ];then
 optional_depends  openssl                           \
                   '-openssl'                        \
                   '-no-openssl'                     \
-                  'ssl support(needed for kde4)'    
-fi     &&
+                  'ssl support(needed for kde4)'    &&
+
+optional_depends  OPENGL                           \
+                  '-opengl'                        \
+                  '-no-opengl'                     \
+                  'OpenGL support'                 &&
 
 optional_depends  libpng                           \
                   '-system-libpng'                 \
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 357c376..34fcc8f 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2007-11-07 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS, PRE_SUB_DEPENDS, SUB_DEPENDS: add OPENGL
+
+2007-11-07 Treeve Jelbert <treeve at sourcemage.org>
+	* DEPENDS: always check  for openssl
+
 2007-10-16 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: update snapshot to 4.3.3
 
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 582b8e7..1141c3c 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
 case $THIS_SUB_DEPENDS in
   DBUS) is_depends_enabled $SPELL dbus   && return 0;;
 #  GIF)  is_depends_enabled $SPELL LIBGIF && return 0;;
+  OPENGL)  is_depends_enabled $SPELL OPENGL && return 0;;
   SSL)  is_depends_enabled $SPELL openssl && return 0;;
 esac
 return 1
diff --git a/x11-toolkits/qt4/SUB_DEPENDS b/x11-toolkits/qt4/SUB_DEPENDS
index e7edfa5..a7fc453 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -5,6 +5,9 @@ DBUS) echo "DBUS support requested, forcing dbus dependency." &&
 #GIF) echo "GIF support requested, forcing LIBGIF dependency." &&
 #     depends LIBGIF
 #     ;;
+OPENGL) echo "OPENGL support requested, forcing OPENGL dependency." &&
+     depends OPENGL
+     ;;
 SSL) echo "SSL support requested, forcing openssl dependency." &&
      depends openssl
      ;;



More information about the SM-Commit mailing list