[packages/libqxt] - fix building with db 5 - fix linking issues (undefined symbols) - release 1

[baggins]

commit b2be2342dbe5535fad39b09dd7a684b74cdb9c30
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Sep 6 13:38:43 2012 +0200

    - fix building with db 5
    - fix linking issues (undefined symbols)
    - release 1

 libqxt-db.patch      | 17 +++++++++++++++++
 libqxt-linking.patch | 16 ++++++++++++++++
 libqxt.spec          |  4 ++++
 3 files changed, 37 insertions(+)
---
diff --git a/libqxt.spec b/libqxt.spec
index a4dc77d..53649cf 100644
--- a/libqxt.spec
+++ b/libqxt.spec
@@ -7,6 +7,8 @@ Group:		Libraries
 URL:		http://www.libqxt.org/
 Source0:	http://bitbucket.org/libqxt/libqxt/get/v%{version}.tar.bz2
 # Source0-md5:	129527c1b18676720f59d22bb4d5ef18
+Patch0:		%{name}-linking.patch
+Patch1:		%{name}-db.patch
 BuildRequires:	QtDesigner-devel
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtSql-devel
@@ -45,6 +47,8 @@ applications that use LibQxt.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
+%patch1 -p1
 
 # We don't want rpath
 sed -i '/-rpath/d' src/qxtlibs.pri
diff --git a/libqxt-db.patch b/libqxt-db.patch
new file mode 100644
index 0000000..0d820e6
--- /dev/null
+++ b/libqxt-db.patch
@@ -0,0 +1,17 @@
+--- libqxt/config.tests/db/main.cpp~	2010-04-18 16:35:25.000000000 +0200
++++ libqxt/config.tests/db/main.cpp	2012-09-06 13:33:59.989693016 +0200
+@@ -1,5 +1,6 @@
+ #include <db.h>
+ 
++#if DB_VERSION_MAJOR < 5
+ #if DB_VERSION_MAJOR < 4
+ #error db>=4.4 required
+ #endif
+@@ -11,6 +12,7 @@
+ #if DB_VERSION_MINOR < 6
+ #warning db < 4.6, some features will be disabled
+ #endif
++#endif
+ 
+ int main (int,char**)
+ {
diff --git a/libqxt-linking.patch b/libqxt-linking.patch
new file mode 100644
index 0000000..26ae10a
--- /dev/null
+++ b/libqxt-linking.patch
@@ -0,0 +1,16 @@
+diff -rupN libqxt.old/config.tests/xrandr/xrandr.pro libqxt/config.tests/xrandr/xrandr.pro
+--- libqxt.old/config.tests/xrandr/xrandr.pro	2010-11-07 09:18:41.000000000 -0500
++++ libqxt/config.tests/xrandr/xrandr.pro	2010-11-25 05:28:29.000000000 -0500
+@@ -5,3 +5,4 @@ DEPENDPATH += .
+ INCLUDEPATH += .
+ SOURCES += main.cpp
+ !win32:LIBS+=-lXrandr
++LIBS+=-lX11
+--- libqxt/src/gui/gui.pro~	2010-04-18 16:35:25.000000000 +0200
++++ libqxt/src/gui/gui.pro	2012-09-06 13:24:30.839713093 +0200
+@@ -17,4 +17,4 @@
+ # means that each library must explicitly link to all dependencies 
+ # than assuming that the application or another library will bring
+ # in the necessary symbols at run time.
+-contains(QMAKE_LFLAGS, "-Wl,--no-undefined"):LIBS += $${QMAKE_LIBS_X11}
++LIBS += $${QMAKE_LIBS_X11}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libqxt.git/commitdiff/b2be2342dbe5535fad39b09dd7a684b74cdb9c30