[Lunar-commits] <moonbase> qt4: bugfix update to 4.8.1 now builds with glib-2.31+

[Zbigniew Luszpinski]

commit 400590af1c6d8199211bcd357a0a39f3e541d342
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Apr 8 10:43:55 2012 +0200

    qt4: bugfix update to 4.8.1 now builds with glib-2.31+
---
 qt4-apps/qt4/BUILD   |    5 +++++
 qt4-apps/qt4/DETAILS |   13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index d78d9a4..f54429e 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -1,5 +1,10 @@
 (
 
+# Gentoo patch fix for Glibc > 2.31
+  if [ `lvu version glib-2 | cut -d. -f1` -ge 31 ]; then
+   patch_it $SOURCE2 1
+  fi &&
+
 # By ommitting the --prefix switch from the configure and performing this sedit we can remove
 # the group of sedit to repoint moc, uic and rcc locations to /usr/bin. 
   sedit "s:/usr/local/Trolltech/:$MODULE_PREFIX/share/$MODULE/Trolltech/:g" configure &&
diff --git a/qt4-apps/qt4/DETAILS b/qt4-apps/qt4/DETAILS
index 1943ccc..266c6c4 100644
--- a/qt4-apps/qt4/DETAILS
+++ b/qt4-apps/qt4/DETAILS
@@ -1,15 +1,18 @@
           MODULE=qt4
-         VERSION=4.8.0
-          SOURCE=qt-everywhere-opensource-src-${VERSION}.tar.gz
+         VERSION=4.8.1
+          SOURCE=qt-everywhere-opensource-src-$VERSION.tar.gz
+         SOURCE2=qt-webkit-4.8.1-glib-2.31.patch.bz2
    SOURCE_URL[0]=http://get.qt.nokia.com/qt/source
    SOURCE_URL[1]=ftp://ftp.trolltech.com/qt/source
    SOURCE_URL[2]=http://gd.tuwien.ac.at/hci/qt/source
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-${VERSION}
-      SOURCE_VFY=sha1:2ba35adca8fb9c66a58eca61a15b21df6213f22e
+     SOURCE2_URL=$PATCH_URL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-$VERSION
+      SOURCE_VFY=sha1:a074d0f605f009e23c63e0a4cb9b71c978146ffc
+     SOURCE2_VFY=sha1:f96f38fdac79f41ba78cb3b893890aaae9a7ddcf
    MODULE_PREFIX=${QT4_PREFIX:-/usr}
         WEB_SITE=http://www.trolltech.com/qt
          ENTERED=20020420
-         UPDATED=20120104
+         UPDATED=20120407
       MAINTAINER=florin at lunar-linux.org
            SHORT="A C++ toolkit for application development"