rev 16465 - in trunk/packages/kdelibs/debian: . patches
Xavier Vello
wdgt-guest at alioth.debian.org
Mon Dec 21 16:22:58 UTC 2009
Author: wdgt-guest
Date: 2009-12-21 16:22:58 +0000 (Mon, 21 Dec 2009)
New Revision: 16465
Added:
trunk/packages/kdelibs/debian/patches/90_r1058555_fix_kxmlgui_crash_for_konq_plugins.diff
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/series
Log:
Backport svn r1058555
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2009-12-21 13:55:35 UTC (rev 16464)
+++ trunk/packages/kdelibs/debian/changelog 2009-12-21 16:22:58 UTC (rev 16465)
@@ -1,9 +1,13 @@
kde4libs (4:4.3.4-2) UNRELEASED; urgency=low
+ [ Modestas Vainius ]
* Change my email address to modax at debian.org in Uploaders field.
- -- Modestas Vainius <modax at debian.org> Sat, 12 Dec 2009 16:57:15 +0200
+ [ Xavier Vello ]
+ * Backport r1058555's kxmlgui fix (needed for konq-plugins)
+ -- Xavier Vello <xavier.vello at gmail.com> Mon, 21 Dec 2009 01:01:49 +0100
+
kde4libs (4:4.3.4-1) unstable; urgency=low
* New upstream release.
Added: trunk/packages/kdelibs/debian/patches/90_r1058555_fix_kxmlgui_crash_for_konq_plugins.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/90_r1058555_fix_kxmlgui_crash_for_konq_plugins.diff (rev 0)
+++ trunk/packages/kdelibs/debian/patches/90_r1058555_fix_kxmlgui_crash_for_konq_plugins.diff 2009-12-21 16:22:58 UTC (rev 16465)
@@ -0,0 +1,26 @@
+--- a/kdeui/xmlgui/kxmlguiversionhandler.cpp 2009/12/04 16:58:12 1058554
++++ b/kdeui/xmlgui/kxmlguiversionhandler.cpp 2009/12/04 16:58:14 1058555
+@@ -274,11 +274,11 @@
+
+ if ( (*local).file.startsWith(KGlobal::dirs()->localkdedir()) ) {
+ // load the local document and extract the action properties
+- QDomDocument document;
+- document.setContent( (*local).data );
++ QDomDocument localDocument;
++ localDocument.setContent( (*local).data );
+
+- const ActionPropertiesMap properties = extractActionProperties(document);
+- const QList<QDomElement> toolbars = extractToolBars(document);
++ const ActionPropertiesMap properties = extractActionProperties(localDocument);
++ const QList<QDomElement> toolbars = extractToolBars(localDocument);
+
+ // in case the document has a ActionProperties section
+ // we must not delete it but copy over the global doc
+@@ -290,6 +290,7 @@
+ if ( !properties.isEmpty() || !toolbars.isEmpty() ) {
+ // now load the global one with the higher version number
+ // into memory
++ QDomDocument document;
+ document.setContent( (*best).data );
+ // and store the properties in there
+ storeActionProperties( document, properties );
Modified: trunk/packages/kdelibs/debian/patches/series
===================================================================
--- trunk/packages/kdelibs/debian/patches/series 2009-12-21 13:55:35 UTC (rev 16464)
+++ trunk/packages/kdelibs/debian/patches/series 2009-12-21 16:22:58 UTC (rev 16465)
@@ -14,3 +14,4 @@
26_fixmanpage.diff
27_konsole_kfreebsd_fix.diff
28_find_kde3_html_documentation.diff
+90_r1058555_fix_kxmlgui_crash_for_konq_plugins.diff
More information about the pkg-kde-commits
mailing list