packages: qt/qt.spec, qt/qt-odbc.patch (NEW) - add gcc46 patch and odbc patch

[cactus]

Author: cactus                       Date: Wed Apr 13 21:28:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add gcc46 patch and odbc patch

---- Files affected:
packages/qt:
   qt.spec (1.406 -> 1.407) , qt-odbc.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qt/qt.spec
diff -u packages/qt/qt.spec:1.406 packages/qt/qt.spec:1.407
--- packages/qt/qt.spec:1.406	Wed Apr 13 22:59:34 2011
+++ packages/qt/qt.spec	Wed Apr 13 23:28:32 2011
@@ -28,7 +28,7 @@
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt
 Version:	%{ver}
-Release:	10
+Release:	11
 Epoch:		6
 License:	QPL v1, GPL v2 or GPL v3
 Group:		X11/Libraries
@@ -99,6 +99,7 @@
 Patch18:	qt3-png14.patch
 Patch19:	qt-buildkey-fixed.patch
 Patch20:	%{name}-gcc46.patch
+Patch21:	%{name}-odbc.patch
 URL:		http://www.trolltech.com/products/qt/
 %{?with_ibase:BuildRequires:	Firebird-devel >= 1.5.0}
 BuildRequires:	OpenGL-GLU-devel
@@ -746,6 +747,7 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 # copy qt kde integration files
 cp %{SOURCE8} %{SOURCE9} src/kernel
@@ -1350,6 +1352,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.407  2011/04/13 21:28:32  cactus
+- add gcc46 patch and odbc patch
+
 Revision 1.406  2011/04/13 20:59:34  cactus
 - add gcc46 patch
 

================================================================
Index: packages/qt/qt-odbc.patch
diff -u /dev/null packages/qt/qt-odbc.patch:1.1
--- /dev/null	Wed Apr 13 23:28:37 2011
+++ packages/qt/qt-odbc.patch	Wed Apr 13 23:28:32 2011
@@ -0,0 +1,21 @@
+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
+  
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt/qt.spec?r1=1.406&r2=1.407&f=u