[qt3] Rediff system-sqlite2 patch.
Kevin Kofler
kkofler at fedoraproject.org
Fri Nov 4 02:18:06 UTC 2011
commit c8f6fbc1e849bb88fa98eaea5d94b1a3b664c7e7
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Fri Nov 4 03:16:42 2011 +0100
Rediff system-sqlite2 patch.
qt-x11-free-3.3.8b-system-sqlite2.patch | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
---
diff --git a/qt-x11-free-3.3.8b-system-sqlite2.patch b/qt-x11-free-3.3.8b-system-sqlite2.patch
index 0337bc7..7d8a373 100644
--- a/qt-x11-free-3.3.8b-system-sqlite2.patch
+++ b/qt-x11-free-3.3.8b-system-sqlite2.patch
@@ -1,21 +1,15 @@
-Use sqlite system library on unix.
-
----
- configure | 5 -
- plugins/src/sqldrivers/sqlite/sqlite.pro | 95 +++++++++++++++----------------
- 2 files changed, 51 insertions(+), 49 deletions(-)
-
---- a/configure
-+++ b/configure
-@@ -1683,6 +1683,7 @@
+diff -ur qt-x11-free-3.3.8b/configure qt-x11-free-3.3.8b-system-sqlite2/configure
+--- qt-x11-free-3.3.8b/configure 2008-01-15 20:09:15.000000000 +0100
++++ qt-x11-free-3.3.8b-system-sqlite2/configure 2011-11-04 03:14:22.000000000 +0100
+@@ -1626,6 +1626,7 @@
TDS_REQ="-lsybdb sybfront.h sybdb.h"
DB2_REQ="-ldb2 sqlcli.h sqlcli1.h"
- IBASE_REQ="-lfbclient ibase.h"
+ IBASE_REQ="-lgds ibase.h"
+ SQLITE_REQ="-lsqlite sqlite.h"
for _SQLDR in $CFG_SQL_AVAILABLE; do
case $_SQLDR in
mysql)
-@@ -1707,9 +1708,7 @@
+@@ -1650,9 +1651,7 @@
$unixtests/checkavail "IBASE" $OPT_VERBOSE $IBASE_REQ $L_FLAGS $I_FLAGS && CFG_SQL_AUTODETECTED="$CFG_SQL_AUTODETECTED ibase"
;;
sqlite)
@@ -26,8 +20,9 @@ Use sqlite system library on unix.
;;
*)
if [ "$OPT_VERBOSE" = "yes" ]; then
---- a/plugins/src/sqldrivers/sqlite/sqlite.pro
-+++ b/plugins/src/sqldrivers/sqlite/sqlite.pro
+diff -ur qt-x11-free-3.3.8b/plugins/src/sqldrivers/sqlite/sqlite.pro qt-x11-free-3.3.8b-system-sqlite2/plugins/src/sqldrivers/sqlite/sqlite.pro
+--- qt-x11-free-3.3.8b/plugins/src/sqldrivers/sqlite/sqlite.pro 2008-01-15 20:09:17.000000000 +0100
++++ qt-x11-free-3.3.8b-system-sqlite2/plugins/src/sqldrivers/sqlite/sqlite.pro 2011-11-04 03:13:17.000000000 +0100
@@ -10,6 +10,9 @@
unix {
@@ -43,9 +38,11 @@ Use sqlite system library on unix.
# QMAKE_LFLAGS += /dlibsqlite.dll
# }
-}
--
+
-!contains( LIBS, .*sqlite.* ) {
- INCLUDEPATH += ../../../../src/3rdparty/sqlite
++ !contains( LIBS, .*sqlite.* ) {
++ INCLUDEPATH += ../../../../src/3rdparty/sqlite
- HEADERS += ../../../../src/3rdparty/sqlite/btree.h \
- ../../../../src/3rdparty/sqlite/config.h \
@@ -58,9 +55,7 @@ Use sqlite system library on unix.
- ../../../../src/3rdparty/sqlite/sqliteInt.h \
- ../../../../src/3rdparty/sqlite/vdbe.h \
- ../../../../src/3rdparty/sqlite/vdbeInt.h
-+ !contains( LIBS, .*sqlite.* ) {
-+ INCLUDEPATH += ../../../../src/3rdparty/sqlite
-
+-
- SOURCES += ../../../../src/3rdparty/sqlite/attach.c \
- ../../../../src/3rdparty/sqlite/auth.c \
- ../../../../src/3rdparty/sqlite/btree.c \
More information about the scm-commits
mailing list