rev 3847 - in trunk/packages/qt4-x11/debian: . patches
Pierre Habouzit
madcoder at costa.debian.org
Sat Jun 3 09:52:04 UTC 2006
Author: madcoder
Date: 2006-06-03 09:52:03 +0000 (Sat, 03 Jun 2006)
New Revision: 3847
Added:
trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch
Modified:
trunk/packages/qt4-x11/debian/changelog
trunk/packages/qt4-x11/debian/patches/00list
Log:
add 17_alpha_ice.dpatch, changelog entry.
also add 16_hppa_ldcw_fix.dpatch to the 00list, it was forgotten.
Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog 2006-06-01 21:34:10 UTC (rev 3846)
+++ trunk/packages/qt4-x11/debian/changelog 2006-06-03 09:52:03 UTC (rev 3847)
@@ -5,6 +5,9 @@
* patches/16_hppa_ldcw_fix.dpatch: new patch from Ubuntu to properly
support hppa
+ * patches/17_alpha_ice.dpatch: new patch from Steve Langasek to fix FTBFS on
+ alpha (Closes: #368883)
+
-- Brian Nelson <pyro at debian.org> Mon, 29 May 2006 21:02:03 -0700
qt4-x11 (4.1.2-2) unstable; urgency=low
Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list 2006-06-01 21:34:10 UTC (rev 3846)
+++ trunk/packages/qt4-x11/debian/patches/00list 2006-06-03 09:52:03 UTC (rev 3847)
@@ -3,3 +3,5 @@
12_mips_atomic_ops
13_arm_ftbfs_fixes
14_kfreebsd_build_fix
+16_hppa_ldcw_fix.dpatch
+17_alpha_ice.dpatch
Added: trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch 2006-06-01 21:34:10 UTC (rev 3846)
+++ trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch 2006-06-03 09:52:03 UTC (rev 3847)
@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -u qt4-x11-4.1.2/debian/changelog qt4-x11-4.1.2/debian/changelog
+--- qt4-x11-4.1.2/debian/changelog
++++ qt4-x11-4.1.2/debian/changelog
+@@ -1,3 +1,11 @@
++qt4-x11 (4.1.2-2.1) unstable; urgency=low
++
++ * Non-maintainer upload.
++ * Workaround for -fvisibility-inlines-hidden on alpha: break out the
++ static methods so they're not inlined. Closes: #368883.
++
++ -- Steve Langasek <vorlon at debian.org> Tue, 30 May 2006 19:56:44 -0700
++
+ qt4-x11 (4.1.2-2) unstable; urgency=low
+
+ * debian/libqt4-debug-dev.install, debian/libqt4-dev.install: added
+only in patch2:
+unchanged:
+--- qt4-x11-4.1.2.orig/src/corelib/global/qlibraryinfo.cpp
++++ qt4-x11-4.1.2/src/corelib/global/qlibraryinfo.cpp
+@@ -47,14 +47,7 @@
+ {
+ public:
+ static QSettings *findConfiguration();
+- static void cleanup()
+- {
+- QLibrarySettings *ls = qt_library_settings();
+- if (ls) {
+- delete static_cast<QSettings *>(ls->settings);
+- ls->settings = 0;
+- }
+- }
++ static void cleanup();
+ static QSettings *configuration()
+ {
+ QLibrarySettings *ls = qt_library_settings();
+@@ -64,6 +57,15 @@
+ Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)
+ };
+
++void QLibraryInfoPrivate::cleanup()
++{
++ QLibrarySettings *ls = qt_library_settings();
++ if (ls) {
++ delete static_cast<QSettings *>(ls->settings);
++ ls->settings = 0;
++ }
++}
++
+ QLibrarySettings::QLibrarySettings()
+ {
+ settings = QLibraryInfoPrivate::findConfiguration();
+only in patch2:
+unchanged:
+--- qt4-x11-4.1.2.orig/src/corelib/tools/qhash.h
++++ qt4-x11-4.1.2/src/corelib/tools/qhash.h
+@@ -396,7 +396,7 @@
+ }
+
+ template <class Key, class T>
+-Q_INLINE_TEMPLATE void QHash<Key, T>::duplicateNode(QHashData::Node *node, void *newNode)
++void QHash<Key, T>::duplicateNode(QHashData::Node *node, void *newNode)
+ {
+ Node *concreteNode = concrete(node);
+ if (QTypeInfo<T>::isDummy) {
More information about the pkg-kde-commits
mailing list