libraries/libqsqlpsql: Updated for version 4.8.2.

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>

5 files changed, 9 insertions, 87 deletions

diff --git a/libraries/libqsqlpsql/libqsqlpsql.SlackBuild b/libraries/libqsqlpsql/libqsqlpsql.SlackBuild
index f4ac2bf0e47c..58e867dd0772 100644
--- a/libraries/libqsqlpsql/libqsqlpsql.SlackBuild
+++ b/libraries/libqsqlpsql/libqsqlpsql.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libqsqlpsql
 
-# Copyright 2008-2011 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libqsqlpsql
-VERSION=4.7.0_7abde40
+VERSION=4.8.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf qt-$VERSION
-tar xvf $CWD/qt-$VERSION.tar.xz
-cd qt-$VERSION
+rm -rf qt-everywhere-opensource-src-$VERSION
+tar xvf $CWD/qt-everywhere-opensource-src-$VERSION.tar.gz
+cd qt-everywhere-opensource-src-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -69,15 +69,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-if [ $ARCH = "i486" ]; then
-  patch -p1 -i $CWD/qt.x86.cflags.diff
-fi
-
-# Add support for postgresql 9
-# Patches taken from http://bugreports.qt.nokia.com/browse/QTBUG-14206
-patch -p1 -i $CWD/qsql_psql_cpp.patch
-patch -p1 -i $CWD/qsql_psql_h.patch
-
 cd src/plugins/sqldrivers/psql
   qmake \
     QMAKE_CFLAGS+="$SLKCFLAGS" \
diff --git a/libraries/libqsqlpsql/libqsqlpsql.info b/libraries/libqsqlpsql/libqsqlpsql.info
index 87731fdc3864..af43b1c0fb56 100644
--- a/libraries/libqsqlpsql/libqsqlpsql.info
+++ b/libraries/libqsqlpsql/libqsqlpsql.info
@@ -1,8 +1,8 @@
 PRGNAM="libqsqlpsql"
-VERSION="4.7.0_7abde40"
-HOMEPAGE="http://qt.nokia.com"
-DOWNLOAD="http://slackware.osuosl.org/slackware-13.37/source/l/qt/qt-4.7.0_7abde40.tar.xz"
-MD5SUM="c980b148ba79bcf5bb8641dd486de97b"
+VERSION="4.8.2"
+HOMEPAGE="http://qt-project.org/"
+DOWNLOAD="http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz"
+MD5SUM="3c1146ddf56247e16782f96910a8423b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="postgresql"
diff --git a/libraries/libqsqlpsql/qsql_psql_cpp.patch b/libraries/libqsqlpsql/qsql_psql_cpp.patch
deleted file mode 100644
index 6d4ee2dd7c71..000000000000
--- a/libraries/libqsqlpsql/qsql_psql_cpp.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- qt-everywhere-opensource-src-4.7.0/src/sql/drivers/psql/qsql_psql.cpp	2010-09-10 11:05:25.000000000 +0200
-+++ qsql_psql.cpp	2010-11-03 12:37:55.966977333 +0100
-@@ -661,6 +661,17 @@
-                     break;
-                 }
-                 break;
-+             case 9:
-+                switch (vMin) {
-+                case 0:
-+                    serverVersion = QPSQLDriver::Version9;
-+                    break;
-+                default:
-+                    serverVersion = QPSQLDriver::Version9;
-+                    break;
-+                }
-+                break;
-+
-             default:
-                 break;
-             }
-@@ -852,7 +863,8 @@
-     // This hack can dissapear once there is an API to query this sort of information.
-     if (d->pro == QPSQLDriver::Version8 ||
-         d->pro == QPSQLDriver::Version81 ||
--        d->pro == QPSQLDriver::Version82) {
-+        d->pro == QPSQLDriver::Version82 ||
-+        d->pro == QPSQLDriver::Version9)  {
-         transaction_failed = qstrcmp(PQcmdStatus(res), "ROLLBACK") == 0;
-     }
- 
-@@ -963,6 +975,7 @@
-     case QPSQLDriver::Version8:
-     case QPSQLDriver::Version81:
-     case QPSQLDriver::Version82:
-+    case QPSQLDriver::Version9:
-         stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
-                 "pg_class.relname "
-                 "FROM pg_attribute, pg_class "
-@@ -1046,6 +1059,7 @@
-     case QPSQLDriver::Version8:
-     case QPSQLDriver::Version81:
-     case QPSQLDriver::Version82:
-+    case QPSQLDriver::Version9:
-         stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
-                 "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
-                 "pg_attrdef.adsrc "
diff --git a/libraries/libqsqlpsql/qsql_psql_h.patch b/libraries/libqsqlpsql/qsql_psql_h.patch
deleted file mode 100644
index 9b9a2d6bfd04..000000000000
--- a/libraries/libqsqlpsql/qsql_psql_h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qt-everywhere-opensource-src-4.7.0/src/sql/drivers/psql/qsql_psql.h	2010-09-10 11:05:25.000000000 +0200
-+++ qsql_psql.h	2010-11-03 12:36:16.380310668 +0100
-@@ -104,7 +104,8 @@
-         Version74 = 10,
-         Version8 = 11,
-         Version81 = 12,
--        Version82 = 13
-+        Version82 = 13,
-+        Version9 = 14
-     };
- 
-     explicit QPSQLDriver(QObject *parent=0);
diff --git a/libraries/libqsqlpsql/qt.x86.cflags.diff b/libraries/libqsqlpsql/qt.x86.cflags.diff
deleted file mode 100644
index a9e65fbb84e0..000000000000
--- a/libraries/libqsqlpsql/qt.x86.cflags.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt.orig/mkspecs/common/g++.conf	2007-12-22 00:22:18.295453075 -0600
-+++ qt/mkspecs/common/g++.conf	2007-12-22 00:23:07.514257895 -0600
-@@ -7,7 +7,7 @@
- QMAKE_CFLAGS_DEPS	+= -M
- QMAKE_CFLAGS_WARN_ON	+= -Wall -W
- QMAKE_CFLAGS_WARN_OFF	+= -w
--QMAKE_CFLAGS_RELEASE	+= -O2
-+QMAKE_CFLAGS_RELEASE	+= -O2 -march=i486 -mtune=i686
- QMAKE_CFLAGS_DEBUG	+= -g
- QMAKE_CFLAGS_SHLIB	+= -fPIC
- QMAKE_CFLAGS_STATIC_LIB	+= -fPIC