diff options
| author | Robert Xu <robxu9@gmail.com> | 2012-07-28 17:22:06 -0400 |
|---|---|---|
| committer | Robert Xu <robxu9@gmail.com> | 2012-07-28 17:22:06 -0400 |
| commit | 44279fd56aa28d4943b49e516ac791900c561488 (patch) | |
| tree | 11289e75f32c5324c5f7469141881720af4f57fe /opensuse/core/tqt3/external-libs.diff | |
| parent | 48e7f603b222a82ae22d94ecbd6cbba914144f86 (diff) | |
| download | tde-packaging-44279fd56aa28d4943b49e516ac791900c561488.tar.gz tde-packaging-44279fd56aa28d4943b49e516ac791900c561488.zip | |
initial package (failing) of tqt3 for SuSE12.1
Diffstat (limited to 'opensuse/core/tqt3/external-libs.diff')
| -rw-r--r-- | opensuse/core/tqt3/external-libs.diff | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/opensuse/core/tqt3/external-libs.diff b/opensuse/core/tqt3/external-libs.diff new file mode 100644 index 000000000..cc090b98c --- /dev/null +++ b/opensuse/core/tqt3/external-libs.diff @@ -0,0 +1,82 @@ +Index: plugins/src/sqldrivers/sqlite/sqlite.pro +=================================================================== +--- plugins/src/sqldrivers/sqlite/sqlite.pro.orig ++++ plugins/src/sqldrivers/sqlite/sqlite.pro +@@ -10,6 +10,9 @@ SOURCES = smain.cpp \ + + unix { + OBJECTS_DIR = .obj ++ !contains( LIBS, .*sqlite.* ) { ++ LIBS *= -lsqlite ++ } + } + + win32 { +@@ -23,54 +26,6 @@ win32 { + # } + } + +-!contains( LIBS, .*sqlite.* ) { +- INCLUDEPATH += ../../../../src/3rdparty/sqlite +- +- HEADERS += ../../../../src/3rdparty/sqlite/btree.h \ +- ../../../../src/3rdparty/sqlite/config.h \ +- ../../../../src/3rdparty/sqlite/hash.h \ +- ../../../../src/3rdparty/sqlite/opcodes.h \ +- ../../../../src/3rdparty/sqlite/os.h \ +- ../../../../src/3rdparty/sqlite/pager.h \ +- ../../../../src/3rdparty/sqlite/parse.h \ +- ../../../../src/3rdparty/sqlite/sqlite.h \ +- ../../../../src/3rdparty/sqlite/sqliteInt.h \ +- ../../../../src/3rdparty/sqlite/vdbe.h \ +- ../../../../src/3rdparty/sqlite/vdbeInt.h +- +- SOURCES += ../../../../src/3rdparty/sqlite/attach.c \ +- ../../../../src/3rdparty/sqlite/auth.c \ +- ../../../../src/3rdparty/sqlite/btree.c \ +- ../../../../src/3rdparty/sqlite/btree_rb.c \ +- ../../../../src/3rdparty/sqlite/build.c \ +- ../../../../src/3rdparty/sqlite/copy.c \ +- ../../../../src/3rdparty/sqlite/date.c \ +- ../../../../src/3rdparty/sqlite/delete.c \ +- ../../../../src/3rdparty/sqlite/expr.c \ +- ../../../../src/3rdparty/sqlite/func.c \ +- ../../../../src/3rdparty/sqlite/hash.c \ +- ../../../../src/3rdparty/sqlite/insert.c \ +- ../../../../src/3rdparty/sqlite/main.c \ +- ../../../../src/3rdparty/sqlite/opcodes.c \ +- ../../../../src/3rdparty/sqlite/os.c \ +- ../../../../src/3rdparty/sqlite/pager.c \ +- ../../../../src/3rdparty/sqlite/parse.c \ +- ../../../../src/3rdparty/sqlite/pragma.c \ +- ../../../../src/3rdparty/sqlite/printf.c \ +- ../../../../src/3rdparty/sqlite/random.c \ +- ../../../../src/3rdparty/sqlite/select.c \ +- ../../../../src/3rdparty/sqlite/shell.c \ +- ../../../../src/3rdparty/sqlite/table.c \ +- ../../../../src/3rdparty/sqlite/tokenize.c \ +- ../../../../src/3rdparty/sqlite/trigger.c \ +- ../../../../src/3rdparty/sqlite/update.c \ +- ../../../../src/3rdparty/sqlite/util.c \ +- ../../../../src/3rdparty/sqlite/vacuum.c \ +- ../../../../src/3rdparty/sqlite/vdbe.c \ +- ../../../../src/3rdparty/sqlite/vdbeaux.c \ +- ../../../../src/3rdparty/sqlite/where.c +-} +- + REQUIRES = sql + + target.path += $$plugins.path/sqldrivers +Index: src/tools/qcstring.cpp +=================================================================== +--- src/tools/qcstring.cpp.orig ++++ src/tools/qcstring.cpp +@@ -53,7 +53,7 @@ + #include <ctype.h> + #include <limits.h> + #ifndef QT_NO_COMPRESS +-#include "../3rdparty/zlib/zlib.h" ++#include <zlib.h> + #endif + + /***************************************************************************** |