[Lunar-commits] <moonbase> qt4: version bump.

[Dennis 'stumbles' Veatch]

commit 84fa33d582cf72c09783de63b765a6759412b916
Author: Dennis 'stumbles' Veatch <stumbles at lunar-linux.org>
Date:   Thu Apr 23 11:22:13 2009 -0400

    qt4: version bump.
    
    Needed to alter the build since they added an extra question you need to
    answer to proceed with configure, that's the purpose of the COMMERCIAL_USER
    set.
    
    Additionally, for future versions of Amarok4, you'll need the qtscriptgenerator,
    which needs the -exceptions. Providing a choice for those who don't want the
    extra bloat. You won't need to say "y" to the docs, examples, etc.
---
 kde4/base/qt4/BUILD     |    4 +++-
 kde4/base/qt4/CONFIGURE |    1 +
 kde4/base/qt4/DEPENDS   |    5 +++++
 kde4/base/qt4/DETAILS   |    8 ++++----
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/kde4/base/qt4/BUILD b/kde4/base/qt4/BUILD
index 1781092..ffa147a 100644
--- a/kde4/base/qt4/BUILD
+++ b/kde4/base/qt4/BUILD
@@ -4,6 +4,8 @@
   export PATH=$QTDIR/bin:$PATH
   export LD_LIBRARY_PATH=$QTDIR/lib
 
+  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure
+
   if module_installed phonon ; then
     OPTS+=" -phonon -phonon-backend"
    else
@@ -19,7 +21,7 @@
   fi &&
 
   OPTS+=" -release -fast -no-separate-debug-info -shared -qt-gif -system-libpng -system-libjpeg   \
-          -system-libmng -system-zlib -no-exceptions -accessibility -pch -stl -webkit -fontconfig \
+          -system-libmng -system-zlib -accessibility -pch -stl -webkit -fontconfig \
           -largefile -glib -qt3support"
 
   echo "yes" | ./configure               \
diff --git a/kde4/base/qt4/CONFIGURE b/kde4/base/qt4/CONFIGURE
index 663bd4b..189bb36 100644
--- a/kde4/base/qt4/CONFIGURE
+++ b/kde4/base/qt4/CONFIGURE
@@ -1,2 +1,3 @@
 mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
 mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"
+mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
diff --git a/kde4/base/qt4/DEPENDS b/kde4/base/qt4/DEPENDS
index 97527fb..fc2432c 100644
--- a/kde4/base/qt4/DEPENDS
+++ b/kde4/base/qt4/DEPENDS
@@ -27,3 +27,8 @@ optional_depends  "unixODBC"                                                 \
                   "-plugin-sql-odbc"                                         \
                   "-no-sql-odbc"                                             \
                   "for unixODBC support"
+
+optional_depends  "freetds"                                                  \
+                  "-plugin-sql-tds"                                          \
+                  "-no-sql-tds"                                              \
+                  "for tabular data stream support"                          \
diff --git a/kde4/base/qt4/DETAILS b/kde4/base/qt4/DETAILS
index 64d2fce..3634b81 100644
--- a/kde4/base/qt4/DETAILS
+++ b/kde4/base/qt4/DETAILS
@@ -1,14 +1,14 @@
           MODULE=qt4
-         VERSION=4.5.0
+         VERSION=4.5.1
           SOURCE=qt-x11-opensource-src-${VERSION}.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-opensource-src-${VERSION}
    SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source
    SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source
-      SOURCE_VFY=sha1:db136bbed1715c155ceb610309d33f943c1df8fd
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-opensource-src-${VERSION}
+      SOURCE_VFY=50ba9b6d2eb7056e47dc53775be509c4ff6ec015
    MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.trolltech.com/qt
          ENTERED=20020420
-         UPDATED=20090303
+         UPDATED=20090423
          GARBAGE=off
      FTP_PASSIVE=on
       MAINTAINER=florin at lunar-linux.org