rev 6533 - in trunk/packages/qt-x11-free/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-06-18 16:24:22 +0000 (Mon, 18 Jun 2007)
New Revision: 6533

Added:
   trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/00list
Log:
replace -lgds with -lfbclient


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2007-06-18 15:41:30 UTC (rev 6532)
+++ trunk/packages/qt-x11-free/debian/changelog	2007-06-18 16:24:22 UTC (rev 6533)
@@ -7,7 +7,7 @@
     Michlmayr.
   * Fix designer and assistant desktop files. Thanks Pino.
   * Fix ftbfs with newer firebird. Thanks to Firebird maintainers for breaking
-    it. (Closes: #427191)
+    it. This requires to change -lgds to -lfbclient (Closes: #427191)
   * Add sparc to firebird archs. Thanks to Damyan Ivanov
   * Add armel support to qt3. Thanks to Riku Voipu and Lennert Beytenhek.
     (Closes: 408814)

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2007-06-18 15:41:30 UTC (rev 6532)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2007-06-18 16:24:22 UTC (rev 6533)
@@ -44,4 +44,5 @@
 64_utf8-parsing-vulnerability
 65_gcc-4.2_qbuttons.h-fix.dpatch
 66_gcc-4.3_compile-fix.dpatch
+68_use-lfbclient_not-lgds
 90_armeabi

Added: trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.dpatch	                        (rev 0)
+++ trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.dpatch	2007-06-18 16:24:22 UTC (rev 6533)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 68_use-lfbclient_not-lgds.dpatch by Sune Vuorela <debian at pusling.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use -lfbclient instead of -lgds, as it is not shipped anymore
+
+ at DPATCH@
+diff -urNad qt-x11-free-3.3.7~/configure qt-x11-free-3.3.7/configure
+--- qt-x11-free-3.3.7~/configure	2006-03-08 13:11:24.000000000 +0100
++++ qt-x11-free-3.3.7/configure	2007-06-18 14:03:16.000000000 +0200
+@@ -1626,7 +1626,7 @@
+     ODBC_REQ="-lodbc sql.h sqlext.h"
+     TDS_REQ="-lsybdb sybfront.h sybdb.h"
+     DB2_REQ="-ldb2 sqlcli.h sqlcli1.h"
+-    IBASE_REQ="-lgds ibase.h"
++    IBASE_REQ="-lfbclient ibase.h"
+     for _SQLDR in $CFG_SQL_AVAILABLE; do
+ 	case $_SQLDR in
+ 	mysql)
+diff -urNad qt-x11-free-3.3.7~/plugins/src/sqldrivers/ibase/ibase.pro qt-x11-free-3.3.7/plugins/src/sqldrivers/ibase/ibase.pro
+--- qt-x11-free-3.3.7~/plugins/src/sqldrivers/ibase/ibase.pro	2003-10-31 15:36:28.000000000 +0100
++++ qt-x11-free-3.3.7/plugins/src/sqldrivers/ibase/ibase.pro	2007-06-18 14:04:14.000000000 +0200
+@@ -12,7 +12,7 @@
+ 	OBJECTS_DIR = .obj
+ 
+ 	!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ) {
+-	    LIBS    *= -lgds
++	    LIBS    *= -lfbclient
+ 	}
+ }
+ win32 {
+diff -urNad qt-x11-free-3.3.7~/src/sql/qt_sql.pri qt-x11-free-3.3.7/src/sql/qt_sql.pri
+--- qt-x11-free-3.3.7~/src/sql/qt_sql.pri	2003-12-18 14:49:21.000000000 +0100
++++ qt-x11-free-3.3.7/src/sql/qt_sql.pri	2007-06-18 14:04:33.000000000 +0200
+@@ -188,7 +188,7 @@
+                 SOURCES += $$SQL_CPP/drivers/ibase/qsql_ibase.cpp
+                 DEFINES += QT_SQL_IBASE
+                 unix {
+-                        LIBS *= -lgds
++                        LIBS *= -lfbclient
+                 }
+                 win32 {
+ 			!win32-borland:LIBS *= gds32_ms.lib


Property changes on: trunk/packages/qt-x11-free/debian/patches/68_use-lfbclient_not-lgds.dpatch
___________________________________________________________________
Name: svn:executable
   + *