rpms/qt3/devel qt-x11-free-3.3.8-odbc.patch, NONE, 1.1 qt3.spec, 1.12, 1.13

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/qt3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7050

Modified Files:
	qt3.spec 
Added Files:
	qt-x11-free-3.3.8-odbc.patch 
Log Message:
fix build problem against new unixODBC



qt-x11-free-3.3.8-odbc.patch:

--- NEW FILE qt-x11-free-3.3.8-odbc.patch ---
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


Index: qt3.spec
===================================================================
RCS file: /cvs/extras/rpms/qt3/devel/qt3.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt3.spec	4 Feb 2009 12:40:41 -0000	1.12
+++ qt3.spec	24 Feb 2009 10:44:24 -0000	1.13
@@ -2,7 +2,7 @@
 
 Summary: The shared library for the Qt 3 GUI toolkit
 Version: 3.3.8b
-Release: 21%{?dist}
+Release: 22%{?dist}
 %if 0%{?fedora} > 8
 Name: qt3
 Obsoletes: qt < 1:%{version}-%{release}
@@ -47,6 +47,7 @@
 Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
 Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
 Patch37: qt-3.3.6-fontrendering-gu-228452.patch
+Patch38: qt-x11-free-3.3.8-odbc.patch
 
 # immodule patches
 Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2
@@ -345,6 +346,7 @@
 %patch34 -p1 -b .fontrendering-#209974
 %patch35 -p1 -b .fontrendering-ml_IN-217657
 %patch37 -p1 -b .fontrendering-gu-228452
+%patch38 -p1 -b .odbc
 
 # immodule patches
 %if %{immodule}
@@ -642,6 +644,9 @@
 
 
 %changelog
+* Tue Feb 24 2009 Than Ngo <than at redhat.com> - 3.3.8b-22
+- fix build problem against new unixODBC
+
 * Wed Feb 04 2009 Rex Dieter <rdieter at fedoraproject.org> 3.3.8b-21
 - unowned %%qt_docdir (#483441)