[arch-commits] CVS update of extra/lib/qt (PKGBUILD mysql.patch)

[Tobias Powalowski]

    Date: Sunday, June 24, 2007 @ 09:28:38
  Author: tpowa
    Path: /home/cvs-extra/extra/lib/qt

   Added: mysql.patch (1.1)
Modified: PKGBUILD (1.28 -> 1.29)

'upgpgk: fixed bug 7496'


-------------+
 PKGBUILD    |   19 +++++++++++++------
 mysql.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 6 deletions(-)


Index: extra/lib/qt/PKGBUILD
diff -u extra/lib/qt/PKGBUILD:1.28 extra/lib/qt/PKGBUILD:1.29
--- extra/lib/qt/PKGBUILD:1.28	Fri Apr  6 09:31:46 2007
+++ extra/lib/qt/PKGBUILD	Sun Jun 24 09:28:38 2007
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD,v 1.28 2007/04/06 13:31:46 tpowa Exp $
+# $Id: PKGBUILD,v 1.29 2007/06/24 13:28:38 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Contributor: John Proctor <jproctor at prium.net>
 pkgname=qt
 pkgver=3.3.8
-pkgrel=3
+pkgrel=4
 pkgdesc="The QT gui toolkit."
 arch=(i686 x86_64)
+license=('GPL')
 url="http://www.trolltech.com/products/qt/index.html"
 pkgfqn=${pkgname}-x11-free-${pkgver}
 install=qt.install
@@ -14,7 +15,14 @@
 makedepends=('mysql' 'postgresql>=8.2.3' 'sqlite3' 'unixodbc' 'libmng')
 source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz qt.profile \
         qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \
-	qt-font-default-subst.diff)
+	qt-font-default-subst.diff mysql.patch)
+md5sums=('37aec12c8c7b0e164957ec1aa3fd0189'
+         '71fee534492524002eb06ddceecc98d9'
+         '56b03549dd4e469e45975200624cfafb'
+         'c8937968e9807b3cdcdf0505728d99ce'
+         'f6b3b39040f2b8f19ba1cf1445468c28'
+         '9370d82e85f2c799335ed0dcc1d53189'
+         '7d40ed1bd40d33d8b9b27a2076a5d22a')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
@@ -36,6 +44,8 @@
   patch -Np0 -i ../utf8-bug-qt3.diff || return 1
   # fix asia fonts
   patch -Np0 -i ../qt-font-default-subst.diff || return 1
+  # fix segfaults on exit when using mysql DB driver
+  patch -Np0 -i ../mysql.patch || return 1
 
   # start compiling qt
   sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
@@ -96,6 +106,3 @@
   fi
 }
 
-md5sums=('37aec12c8c7b0e164957ec1aa3fd0189' '71fee534492524002eb06ddceecc98d9'\
-         '56b03549dd4e469e45975200624cfafb' 'c8937968e9807b3cdcdf0505728d99ce'\
-         'f6b3b39040f2b8f19ba1cf1445468c28' '9370d82e85f2c799335ed0dcc1d53189')
Index: extra/lib/qt/mysql.patch
diff -u /dev/null extra/lib/qt/mysql.patch:1.1
--- /dev/null	Sun Jun 24 09:28:38 2007
+++ extra/lib/qt/mysql.patch	Sun Jun 24 09:28:38 2007
@@ -0,0 +1,47 @@
+--- src/sql/drivers/mysql/qsql_mysql.cpp
++++ src/sql/drivers/mysql/qsql_mysql.cpp
+@@ -37,7 +37,6 @@
+ #include "qsql_mysql.h"
+ #include <private/qsqlextension_p.h>
+ 
+-#include <qapplication.h>
+ #include <qdatetime.h>
+ #include <qvaluevector.h>
+ #include <qsqlrecord.h>
+@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
+ }
+ 
+ /////////////////////////////////////////////////////////
+-static void qServerEnd()
+-{
+-#ifndef Q_NO_MYSQL_EMBEDDED
+-# if MYSQL_VERSION_ID >= 40000
+-    mysql_server_end();
+-# endif // MYSQL_VERSION_ID
+-#endif // Q_NO_MYSQL_EMBEDDED
+-}
+ 
+ static void qServerInit()
+ {
+@@ -366,9 +357,7 @@ static void qServerInit()
+ 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
+ #  endif
+     }
+-    qAddPostRoutine(qServerEnd);
+     init = TRUE;    
+-    
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ }
+@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
+ 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
+ 	delete ext;
+     }
++#ifndef Q_NO_MYSQL_EMBEDDED
++# if MYSQL_VERSION_ID > 40000
++    mysql_server_end();
++# endif
++#endif
+ }
+ 
+ bool QMYSQLDriver::hasFeature( DriverFeature f ) const