rev 12211 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-09-19 16:38:11 +0000 (Fri, 19 Sep 2008)
New Revision: 12211

Added:
   trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Add PostgreSQL 8.3 support.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-09-19 14:31:41 UTC (rev 12210)
+++ trunk/packages/qt4-x11/debian/changelog	2008-09-19 16:38:11 UTC (rev 12211)
@@ -6,6 +6,8 @@
 
   * Remove upstream patches:
     - 0002_https_lowercase.diff
+  * Add Debian patches:
+    - 17_add_postgresql_8.3_support.diff
   * Remove Debian patches:
     - 72_generic_arch_atomic_header_fix.diff
   * Sync qt-copy patches:

Added: trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff	2008-09-19 16:38:11 UTC (rev 12211)
@@ -0,0 +1,46 @@
+Enable PostgreSQL 8.3 support.
+
+--- a/src/sql/drivers/psql/qsql_psql.cpp
++++ b/src/sql/drivers/psql/qsql_psql.cpp
+@@ -639,9 +639,12 @@
+                     serverVersion = QPSQLDriver::Version81;
+                     break;
+                 case 2:
+-                default:
+                     serverVersion = QPSQLDriver::Version82;
+                     break;
++                case 3:
++                default:
++                    serverVersion = QPSQLDriver::Version83;
++                    break;
+                 }
+                 break;
+             default:
+@@ -922,6 +925,7 @@
+     case QPSQLDriver::Version8:
+     case QPSQLDriver::Version81:
+     case QPSQLDriver::Version82:
++    case QPSQLDriver::Version83:
+         stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
+                 "pg_class.relname "
+                 "FROM pg_attribute, pg_class "
+@@ -995,6 +999,7 @@
+     case QPSQLDriver::Version8:
+     case QPSQLDriver::Version81:
+     case QPSQLDriver::Version82:
++    case QPSQLDriver::Version83:
+         stmt = QLatin1String("select pg_attribute.attname, pg_attribute.atttypid::int, "
+                 "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
+                 "pg_attrdef.adsrc "
+--- a/src/sql/drivers/psql/qsql_psql.h
++++ b/src/sql/drivers/psql/qsql_psql.h
+@@ -106,7 +106,8 @@
+         Version74 = 10,
+         Version8 = 11,
+         Version81 = 12,
+-        Version82 = 13
++        Version82 = 13,
++        Version83 = 14
+     };
+ 
+     explicit QPSQLDriver(QObject *parent=0);

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-09-19 14:31:41 UTC (rev 12210)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-09-19 16:38:11 UTC (rev 12211)
@@ -26,6 +26,7 @@
 14_add_libraries_to_gui_build_where_actually_needed.diff
 15_fix_qmake_makefile_generation.diff
 16_hide_std_symbols_on_qtwebkit.diff
+17_add_postgresql_8.3_support.diff
 20_mips_atomic_ops.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff