diff options
| author | Fathi Boudra <fabo@debian.org> | 2008-04-09 07:44:36 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2008-04-09 07:44:36 +0000 |
| commit | e405898c15e99ab6b73fad0a44e15e7399521a38 (patch) | |
| tree | c06f1a9c7ae7625357de0e82d12ec061f88069bf | |
| parent | 63a0cbed46c40c24630eadb728f2e361acbe5c51 (diff) | |
| download | qt4-x11-e405898c15e99ab6b73fad0a44e15e7399521a38.tar.gz | |
* 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.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/90_gcc43.diff | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 58c46b3..a13e1ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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@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) diff --git a/debian/patches/90_gcc43.diff b/debian/patches/90_gcc43.diff new file mode 100644 index 0000000..21facf7 --- /dev/null +++ b/debian/patches/90_gcc43.diff @@ -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; diff --git a/debian/patches/series b/debian/patches/series index 121aad6..eafeb6c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -29,3 +29,4 @@ 70_hppa_ldcw_fix.diff 71_hppa_unaligned_access_fix_458133.diff 80_hurd_max_path.diff +90_gcc43.diff |