Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

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

 utils/strigi/SUB_DEPENDS         |    2 +-
 x11-toolkits/qt4/BUILD           |   16 +++++++++-------
 x11-toolkits/qt4/CONFIGURE       |   31 ++++++++++++++++++++++++++-----
 x11-toolkits/qt4/CONFLICTS       |    1 +
 x11-toolkits/qt4/DEPENDS         |   12 ++++++++++++
 x11-toolkits/qt4/DETAILS         |   27 ++++++++++++++++++++++-----
 x11-toolkits/qt4/FINAL           |    5 -----
 x11-toolkits/qt4/HISTORY         |   23 +++++++++++++++++++++++
 x11-toolkits/qt4/INSTALL         |    9 ---------
 x11-toolkits/qt4/PREPARE         |    1 +
 x11-toolkits/qt4/PRE_BUILD       |   20 +++++++++++++++-----
 x11-toolkits/qt4/PRE_SUB_DEPENDS |    1 +
 x11-toolkits/qt4/SUB_DEPENDS     |    3 +++
 x11-toolkits/qt4/qt.sh           |    9 ---------
 14 files changed, 114 insertions(+), 46 deletions(-)

New commits:
commit bbbb10a1edc254f1a69502d821ecb947a80bf429
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qt4 - actually delete diles

commit 7eea9e6325f33116e9400655ffb843a34f5d3dc7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    strigi - forgotten file

commit 39200e14d560355d0eecfbaba5311ec78801f252
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    qt4 - multiple version support and build fixes

diff --git a/utils/strigi/SUB_DEPENDS b/utils/strigi/SUB_DEPENDS
index de56b6f..2d6dc2c 100755
--- a/utils/strigi/SUB_DEPENDS
+++ b/utils/strigi/SUB_DEPENDS
@@ -4,7 +4,7 @@ DBUS) echo "DBUS support requested, forcing dbus dependency." 
&&
      ;;
 QT4) echo "QT$ support requested, forcing qt4 and dbus dependencies." &&
      depends qt4
-     sub_depends qt4 dbus
+     sub_depends qt4 DBUS
      ;;
 *) echo unknown sub-depends!!! ; return 1 ;;
 esac
diff --git a/x11-toolkits/qt4/BUILD b/x11-toolkits/qt4/BUILD
index 423072e..674a5cb 100755
--- a/x11-toolkits/qt4/BUILD
+++ b/x11-toolkits/qt4/BUILD
@@ -1,7 +1,3 @@
-# add better optimisation flags
-# following line causes segmentation fault in moc when using gcc-4.1.1
-sedit  "s#-O2#${CFLAGS/-O3/-O2}#" mkspecs/common/g++.conf &&
-
 export QTDIR=$SOURCE_DIRECTORY  &&
 export LD_LIBRARY_PATH=$SOURCE_DIRECTORY/lib:$LD_LIBRARY_PATH &&
 
@@ -11,14 +7,20 @@ OPTS="$QT_DEBUG   \
       $QT_GIF     \
       $QT_EXCEPT  \
       $QT_PCH     \
+      $QT_QT3     \
+      $QT_DEMO    \
+      $QT_EXAMPLE \
+      $QT_TOOLS   \
+      $QT_TRANS   \
       $OPTS"      &&
+if [[ x${QT_DEBUG} == "x" ]];then
+  OPTS="-no-separate-debug-info ${OPTS}"
+fi &&
 
 ./configure   -confirm-license                                               
              \
-                             -prefix $INSTALL_ROOT/usr/                      
              \
+                             -prefix $INSTALL_ROOT/usr                       
              \
                              -bindir $INSTALL_ROOT/usr/bin/qt4               
              \
-                             -libdir $INSTALL_ROOT/usr/lib/qt4               
              \
                              -docdir $INSTALL_ROOT/usr/share/doc/qt4         
              \
-                             -headerdir $INSTALL_ROOT/usr/include/qt4        
              \
                              -plugindir $INSTALL_ROOT/usr/lib/qt4/plugins    
              \
                              -sysconfdir $INSTALL_ROOT/etc/qt4               
              \
                              -translationdir 
$INSTALL_ROOT//usr/share/doc/qt4/translations \
diff --git a/x11-toolkits/qt4/CONFIGURE b/x11-toolkits/qt4/CONFIGURE
index 979e985..3b70348 100755
--- a/x11-toolkits/qt4/CONFIGURE
+++ b/x11-toolkits/qt4/CONFIGURE
@@ -1,4 +1,25 @@
-config_query         QT_DOC     'install doc, demo and examples(very big)?' 
n &&
+config_query         QT_DOC     'install documents(very big)?' n           &&
+
+config_query_option  QT_DEMO    'install demos?' n                         \
+                                '-make demos'                              \
+                                '-nomake demos'                            &&
+
+config_query_option  QT_EXAMPLE 'install examples?' n                      \
+                                '-make examples'                           \
+                                '-nomake examples'                         &&
+
+config_query_option  QT_TOOLS   'install tools?' y                         \
+                                '-make tools'                              \
+                                '-nomake tools'                            &&
+
+config_query_option  QT_TRANS   'install translations?' n                  \
+                                '-make translations'                       \
+                                '-nomake translations'                     &&
+
+config_query_option  QT_QT3     'build qt3 support?' y                     \
+                                '-qt3support'                              \
+                                '-no-qt3support'                           &&
+
 config_query_option  QT_DEBUG   'Compile with debugging symbols?'       n  \
                                 '-debug'                                   \
                                 ''                                         &&
@@ -16,10 +37,10 @@ config_query_option  QT_GIF     'Enable GIF support?'     
              y  \
                                 '-no-gif'                                  &&
 
 
-config_query_option QT_EXCEPT   'Disable exception checking'            y  \
-                                ''                                         \
-                                '-no-exceptions '                          &&
+config_query_option QT_EXCEPT   'Disable exception checking'            n  \
+                                '-no-exceptions'                           \
+                                '-exceptions'                              &&
 
 config_query_option  QT_PCH     'Enable precompiled header support?'    y  \
                                 '-pch'                                     \
-                                'no-pch'
+                                '-no-pch'
diff --git a/x11-toolkits/qt4/CONFLICTS b/x11-toolkits/qt4/CONFLICTS
new file mode 100755
index 0000000..ddbffc6
--- /dev/null
+++ b/x11-toolkits/qt4/CONFLICTS
@@ -0,0 +1 @@
+conflicts qt4
diff --git a/x11-toolkits/qt4/DEPENDS b/x11-toolkits/qt4/DEPENDS
index 283c38d..5778e8a 100755
--- a/x11-toolkits/qt4/DEPENDS
+++ b/x11-toolkits/qt4/DEPENDS
@@ -29,6 +29,13 @@ 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     &&
+
 optional_depends  libpng                           \
                   '-system-libpng'                 \
                   '-qt-libpng'                     \
@@ -84,6 +91,11 @@ optional_depends dbus                                \
                   '-no-qdbus'                        \
                   'for dbus support - builds QtDBus module'  &&
 
+optional_depends glib2                               \
+                  '-glib'                            \
+                  '-no-glib'                         \
+                  'glib support'                     &&
+
 
 optional_depends  nas                                \
                   '-system-nas-sound'                \
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 10af8de..8de1c1d 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -1,11 +1,28 @@
            SPELL=qt4
+         SPELLX=qt-x11-opensource-src
+case $QT_VER in
+  snapshot)
+         VERSION=4.3.0-snapshot-20070503
+     
SOURCE_HASH=sha512:bfbcd12f8afaa1ef12aecff45d07b6c0f284619418beb0b5c16f046d656c8fc132a8f00ecde8afaace34a68550767205fc8a5aa655ee434ba2a7d0aecf6c3be8
+          SOURCE=$SPELLX-$VERSION.tar.bz2
+             URI=qt/snapshots/$SOURCE
+     ;;
+  prerelease)
+         VERSION=4.3.0beta
+     
SOURCE_HASH=sha512:6bab62574c319589b44d7416248d4531d137ee610615289c65f7877284bb4bb6958bdd3304b42930ff04d617c5a6389da1524a9374cfee9bba1547d7cd9f0d3f
+          SOURCE=$SPELLX-$VERSION.tar.gz
+             URI=qt/source/$SOURCE
+     ;;
+  *) #stable
          VERSION=4.2.3
      
SOURCE_HASH=sha512:e04568ac6c42d0d6d131ccbad89768248c5095b05e68cc1362fd1a3580197e37c416802c8fbf5411e6870e5bdd9e92ff133bcb2b4e42fd5cdf848404d50c733c
-          SOURCE=qt-x11-opensource-src-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-opensource-src-$VERSION
-   SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source/$SOURCE
-   SOURCE_URL[1]=ftp://ftp.silug.org/pub/qt/source/$SOURCE
-   
SOURCE_URL[2]=ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/$SOURCE
+          SOURCE=$SPELLX-$VERSION.tar.gz
+             URI=qt/source/$SOURCE
+esac
+   SOURCE_URL[0]=ftp://ftp.trolltech.com/$URI
+   SOURCE_URL[1]=ftp://ftp.silug.org/pub/$URI
+   SOURCE_URL[2]=ftp://ftp.planetmirror.com.au/pub/trolltech/$URI
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://www.trolltech.com/qt/x11.html
          ENTERED=20020410
       LICENSE[0]=GPL
diff --git a/x11-toolkits/qt4/FINAL b/x11-toolkits/qt4/FINAL
deleted file mode 100755
index 41005c4..0000000
--- a/x11-toolkits/qt4/FINAL
+++ /dev/null
@@ -1,5 +0,0 @@
-if ! grep -q qt4 /etc/ld.so.conf
-then echo "/usr/lib/qt4" >> /etc/ld.so.conf
-     ldconfig
-fi
-
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 4d03409..47ed322 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,26 @@
+2007-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+       * PREPARE: allow stable, prerelease and snapshots
+       * DETAILS: version 4.3.0-snapshot-20070503
+         generalise URI
+       * CONFLICTS: added, to remove previous qt4 before building new one,
+         as otherwise link finds old version in /usr/lib
+       * INSTALL, qt.sh: deleted
+
+2007-04-29 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 4.3.0beta (devel)
+       * DEPENDS: add openssl, glib2
+       * PRE_SUB_DEPENDS, SUB_DEPENDS: add SSL
+         openssl is needed for kde4
+       * CONFIGURE, BUILD: qt3 support is optional
+         only build specified parts (demos, examples, translations, tools)
+       * BUILD: change location of lib and include
+         this means that pkgconfig works and there are no name conflicts.
+         only /usr/bin/qt4 needs to be separate
+       * INSTALL: remove sed stmts, they fail with staged install
+       * PRE_BUILD: remove debug symbols
+       * PREPARE: added, allow devel or stable versions
+       * FINAL: deleted
+
 2007-03-28 Treeve Jelbert <treeve AT sourcemage.org>
        * TRIGGERS: add check on postgresql
          fixes bug #13662 
diff --git a/x11-toolkits/qt4/INSTALL b/x11-toolkits/qt4/INSTALL
deleted file mode 100755
index 7584159..0000000
--- a/x11-toolkits/qt4/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-default_install  &&
-
-mkdir    -p        $INSTALL_ROOT/etc/profile.d/  &&
-install  -m  0644  $SCRIPT_DIRECTORY/qt.sh       \
-                   $INSTALL_ROOT/etc/profile.d/  &&
-sed -i -e "s:usr/lib:usr/lib/qt4:g" $INSTALL_ROOT/usr/lib/qt4/*.prl  &&
-sed -i -e "s:usr/lib:usr/lib/qt4:g" $INSTALL_ROOT/usr/lib/qt4/*.la  &&
-sed -i -e "s:usr/lib:usr/lib/qt4:g" $INSTALL_ROOT/usr/lib/qt4/*.pc  &&
-mv $INSTALL_ROOT/usr/lib/qt4/*.pc /usr/lib/pkgconfig/
diff --git a/x11-toolkits/qt4/PREPARE b/x11-toolkits/qt4/PREPARE
new file mode 100755
index 0000000..d0198b7
--- /dev/null
+++ b/x11-toolkits/qt4/PREPARE
@@ -0,0 +1 @@
+config_query_list QT_VER "which version to build?" stable prerelease snapshot
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index ff35dad..4b818f2 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,10 +1,20 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY      &&
+# add better optimisation flags
+# -O2 gives segmentation fault in moc when building tools
+sed -i   "s|-O2|${CFLAGS/-O3/-O2}|" mkspecs/common/g++.conf      \
+                                     mkspecs/linux-cxx/qmake.conf &&
+
 # remove big direcotries
-if [ $QT_DOC = n ];then
-rm -r doc demos examples   &&
-sed -i "/+= demos/D;/htmldocs/D" projects.pro
+if [[ $QT_DOC = n ]];then
+rm -r doc                  &&
+sed -i "/htmldocs/D" projects.pro
 fi                         &&
+if [[ x${QT_DEBUG} != "x-debug" ]];then
+  sed -i "/-g/d" mkspecs/common/g++.conf      \
+                 mkspecs/linux-cxx/qmake.conf
+fi                          &&
+# fix use of firebird
 sed -i "s/-lgds/-lfbclient/" config.tests/unix/ibase/ibase.pro \
-  src/sql/drivers/drivers.pri  src/plugins/sqldrivers/ibase/ibase.pro
-#patch  -p0 < $SPELL_DIRECTORY/xxx.diff
+                             src/sql/drivers/drivers.pri  \
+                             src/plugins/sqldrivers/ibase/ibase.pro
diff --git a/x11-toolkits/qt4/PRE_SUB_DEPENDS 
b/x11-toolkits/qt4/PRE_SUB_DEPENDS
index 91a8978..582b8e7 100755
--- a/x11-toolkits/qt4/PRE_SUB_DEPENDS
+++ b/x11-toolkits/qt4/PRE_SUB_DEPENDS
@@ -1,5 +1,6 @@
 case $THIS_SUB_DEPENDS in
   DBUS) is_depends_enabled $SPELL dbus   && return 0;;
 #  GIF)  is_depends_enabled $SPELL LIBGIF && 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 4a579fe..e7edfa5 100755
--- a/x11-toolkits/qt4/SUB_DEPENDS
+++ b/x11-toolkits/qt4/SUB_DEPENDS
@@ -5,5 +5,8 @@ DBUS) echo "DBUS support requested, forcing dbus dependency." 
&&
 #GIF) echo "GIF support requested, forcing LIBGIF dependency." &&
 #     depends LIBGIF
 #     ;;
+SSL) echo "SSL support requested, forcing openssl dependency." &&
+     depends openssl
+     ;;
 *) echo unknown sub-depends!!! ; return 1 ;;
 esac
diff --git a/x11-toolkits/qt4/qt.sh b/x11-toolkits/qt4/qt.sh
deleted file mode 100644
index ca68979..0000000
--- a/x11-toolkits/qt4/qt.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash 
-# First check if this variable is already set 
-# then if not set, check it (maybe), then set it 
-
-if  [ -z "$QTDIR" ] ; then 
-       QTDIR=/usr
-fi 
-export QTDIR
-