[arch-commits] Commit in qt3/trunk (PKGBUILD qt-odbc.patch)

[Pierre Schmitz]

    Date: Saturday, March 28, 2009 @ 03:04:14
  Author: pierre
Revision: 31738

upgpkg: qt3 3.3.8-10

Added:
  qt3/trunk/qt-odbc.patch
Modified:
  qt3/trunk/PKGBUILD

---------------+
 PKGBUILD      |    9 ++++++---
 qt-odbc.patch |   19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-28 04:16:53 UTC (rev 31737)
+++ PKGBUILD	2009-03-28 07:04:14 UTC (rev 31738)
@@ -4,7 +4,7 @@
 
 pkgname=qt3
 pkgver=3.3.8
-pkgrel=9
+pkgrel=10
 pkgdesc="The QT gui toolkit."
 arch=(i686 x86_64)
 license=('GPL')
@@ -17,7 +17,7 @@
 optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt.profile \
         qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \
-	qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff)
+	qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff qt-odbc.patch)
 options=(!libtool)
 md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85'
          'f72d1eb4eb49b9a9467c1f6035194266'
@@ -26,7 +26,8 @@
          'f6b3b39040f2b8f19ba1cf1445468c28'
          '9370d82e85f2c799335ed0dcc1d53189'
          '7d40ed1bd40d33d8b9b27a2076a5d22a'
-         '616f1f3029cf8375256ad6a406de3549')
+         '616f1f3029cf8375256ad6a406de3549'
+         '2178ca88dfd75a230918593b30eb0dbe')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
@@ -54,6 +55,8 @@
   patch -Np0 -i ../mysql.patch || return 1
   # fix CJK font/chars select error (FS#11245)
   patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
+  # fix build problem against new unixODBC
+  patch -p1 -i $srcdir/qt-odbc.patch || return 1
   # start compiling qt
   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
   rm -rf doc/html examples tutorial

Added: qt-odbc.patch
===================================================================
--- qt-odbc.patch	                        (rev 0)
+++ qt-odbc.patch	2009-03-28 07:04:14 UTC (rev 31738)
@@ -0,0 +1,19 @@
+diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
+--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
+@@ -57,13 +57,13 @@
+ #endif
+ 
+ // newer platform SDKs use SQLLEN instead of SQLINTEGER
+-#ifdef SQLLEN
++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLLEN SQLLEN
+ #else
+ # define QSQLLEN SQLINTEGER
+ #endif
+ 
+-#ifdef SQLULEN
++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLULEN SQLULEN
+ #else
+ # define QSQLULEN SQLUINTEGER