[Pkg-kde-commits] rev 2490 - in trunk/packages/qt-x11-free/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2005-12-01 21:13:11 +0000 (Thu, 01 Dec 2005)
New Revision: 2490

Added:
   trunk/packages/qt-x11-free/debian/patches/33_qgpluginmanager.dpatch
Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/00list
Log:
Throw in a one-line patch and upload.

The patch doesn't seem to affect anything (I wasn't suffereing
from the original problem), but do report any regressions in
case it has a problem.


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-12-01 19:16:50 UTC (rev 2489)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-12-01 21:13:11 UTC (rev 2490)
@@ -1,11 +1,14 @@
-qt-x11-free (3:3.3.5-3) UNRELEASED; urgency=low
+qt-x11-free (3:3.3.5-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
   * Really add InterBase support to amd64. (Closes: #341614)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Date
+  * Add a patch for plugin loading when mixing-and-matching apps from
+    different Qt/KDE versions.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu,  1 Dec 2005 14:45:43 -0500
+
 qt-x11-free (3:3.3.5-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Modified: trunk/packages/qt-x11-free/debian/patches/00list
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/00list	2005-12-01 19:16:50 UTC (rev 2489)
+++ trunk/packages/qt-x11-free/debian/patches/00list	2005-12-01 21:13:11 UTC (rev 2490)
@@ -23,6 +23,7 @@
 30_qtc_qtoolbar_77047
 31_gcc4_buildkey
 32_gtkstyle
+33_qgpluginmanager
 34_qtc_dnd_optimization
 35_qtc_dnd_active_window_fix
 37_qtc_dragobject-dont-prefer-unknown

Added: trunk/packages/qt-x11-free/debian/patches/33_qgpluginmanager.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/33_qgpluginmanager.dpatch	2005-12-01 19:16:50 UTC (rev 2489)
+++ trunk/packages/qt-x11-free/debian/patches/33_qgpluginmanager.dpatch	2005-12-01 21:13:11 UTC (rev 2490)
@@ -0,0 +1,31 @@
+#! /bin/sh -e
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- qt.orig/src/tools/qgpluginmanager.cpp
++++ qt.patched/src/tools/qgpluginmanager.cpp
+@@ -389,6 +389,7 @@
+ 	    } else {
+ 		QPtrList<QComLibrary> same;
+ 		same.setAutoDelete( TRUE );
++                same.append( new QComLibrary( lib ) );
+ 		for ( QStringList::ConstIterator bit = sameBasename.begin();
+ 		      bit != sameBasename.end(); ++bit )
+ 		    same.append( new QComLibrary( *bit ) );