rev 10079 - in branches/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-04-09 07:44:36 +0000 (Wed, 09 Apr 2008)
New Revision: 10079

Added:
   branches/qt4-x11/debian/patches/90_gcc43.diff
Modified:
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/patches/series
Log:
* Add patch for Explicit template specialization cannot have a storage class
  with gcc-4.3. Specializations of templates cannot explicitly specify
  a storage class, and have the same storage as the primary template. 


Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2008-04-09 01:33:36 UTC (rev 10078)
+++ branches/qt4-x11/debian/changelog	2008-04-09 07:44:36 UTC (rev 10079)
@@ -1,3 +1,11 @@
+qt4-x11 (4.4.0~rc1-2) UNRELEASED; urgency=low
+
+  * Add patch for Explicit template specialization cannot have a storage class
+    with gcc-4.3. Specializations of templates cannot explicitly specify
+    a storage class, and have the same storage as the primary template. 
+
+ -- Fathi Boudra <fabo at debian.org>  Wed, 09 Apr 2008 09:40:00 +0200
+
 qt4-x11 (4.4.0~rc1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #469783)

Added: branches/qt4-x11/debian/patches/90_gcc43.diff
===================================================================
--- branches/qt4-x11/debian/patches/90_gcc43.diff	                        (rev 0)
+++ branches/qt4-x11/debian/patches/90_gcc43.diff	2008-04-09 07:44:36 UTC (rev 10079)
@@ -0,0 +1,20 @@
+--- a/src/sql/drivers/ibase/qsql_ibase.cpp
++++ b/src/sql/drivers/ibase/qsql_ibase.cpp
+@@ -467,7 +467,7 @@
+ }
+ /* char** ? seems like bad influence from oracle ... */
+ template<>
+-static QList<QVariant> toList<long>(char** buf, int count, long*)
++QList<QVariant> toList<long>(char** buf, int count, long*)
+ {
+     QList<QVariant> res;
+     for (int i = 0; i < count; ++i) {
+@@ -622,7 +622,7 @@
+ }
+
+ template<>
+-static char* fillList<float>(char *buffer, const QList<QVariant> &list, float*)
++char* fillList<float>(char *buffer, const QList<QVariant> &list, float*)
+ {
+     for (int i = 0; i < list.size(); ++i) {
+         double val;

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2008-04-09 01:33:36 UTC (rev 10078)
+++ branches/qt4-x11/debian/patches/series	2008-04-09 07:44:36 UTC (rev 10079)
@@ -29,3 +29,4 @@
 70_hppa_ldcw_fix.diff
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
+90_gcc43.diff