[SM-Commit] GIT changes to master grimoire by George Sherwood (e19261b1d9c1b9529d1d2760f6180d5584e51b66)

George Sherwood scm at sourcemage.org
Sun May 3 12:55:23 EDT 2009


GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:

 x11-toolkits/qt4/HISTORY    |    6 ++++++
 x11-toolkits/qt4/PRE_BUILD  |    2 ++
 x11-toolkits/qt4/odbc.patch |   18 ++++++++++++++++++
 3 files changed, 26 insertions(+)

New commits:
commit e19261b1d9c1b9529d1d2760f6180d5584e51b66
Author: George Sherwood <gsherwood at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    qt4: Added Fedora patch to build with new UnixODBC.

diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index a59fabd..f515fe8 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,9 @@
+2009-05-03 George Sherwood <gsherwood at sourcemage.org>
+	* PRE_BUILD: apply patch to build with odbc
+	* odbc.patch: Added Fedora patch to fix build problem against
+	  new unixODBC. 
+	  http://osdir.com/ml/fedora-extras-commits/2009-02/msg06899.html
+
 2009-04-28 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: PATCHLEVEL=1
 	* PRE_BUILD: apply patch, fix regresion which crashes plasma
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index c0fea5b..753ffdd 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -3,6 +3,8 @@ cd $SOURCE_DIRECTORY 	   &&
 #apply upstream patch
 patch -p0 < $SPELL_DIRECTORY/0279-svg-rendering-regression.diff &&
 
+patch -p0 < $SPELL_DIRECTORY/odbc.patch &&
+
 # add better optimisation flags
 # -O2 gives segmentation fault in moc when building tools
 sed -i   "s|-O2|${CFLAGS/-O3/-O2}|" mkspecs/common/g++.conf      \
diff --git a/x11-toolkits/qt4/odbc.patch b/x11-toolkits/qt4/odbc.patch
new file mode 100644
index 0000000..a22ce7f
--- /dev/null
+++ b/x11-toolkits/qt4/odbc.patch
@@ -0,0 +1,18 @@
+--- src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-05-03 10:13:19.000000000 -0500
++++ src/sql/drivers/odbc/qsql_odbc.cpp	2009-05-03 10:13:58.000000000 -0500
+@@ -69,13 +69,13 @@
+ #endif
+ 
+ // newer platform SDKs use SQLLEN instead of SQLINTEGER
+-#if defined(SQLLEN) || defined(Q_OS_WIN64)
++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLLEN SQLLEN
+ #else
+ # define QSQLLEN SQLINTEGER
+ #endif
+ 
+-#if defined(SQLULEN) || defined(Q_OS_WIN64)
++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLULEN SQLULEN
+ #else
+ # define QSQLULEN SQLUINTEGER



More information about the SM-Commit mailing list