rev 4868 - in trunk/packages/kdelibs/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2006-11-09 16:42:54 +0100 (Thu, 09 Nov 2006)
New Revision: 4868

Added:
   trunk/packages/kdelibs/debian/patches/42_xdgMenuPrefix_support.diff
   trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff
Removed:
   trunk/packages/kdelibs/debian/patches/18_applications_menu_rename.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
add patches from Kevin to fix #397057

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-11-09 14:40:26 UTC (rev 4867)
+++ trunk/packages/kdelibs/debian/changelog	2006-11-09 15:42:54 UTC (rev 4868)
@@ -1,3 +1,13 @@
+kdelibs (4:3.5.5a.dfsg.1-4) unstable; urgency=low
+
+  * Add 42_xdgMenuPrefix_support patch: add XDG_MENU_PREFIX support. Thanks to
+    Kevin Krammer. (Closes: #397057)
+  * Add 43_hardcode_xdgMenuPrefix patch: hardcode xdgMenuPrefix to "kde-"
+    string until proper upstream fix.
+  * Remove 18_applications_menu_rename patch.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed,  8 Nov 2006 17:39:22 +0100
+
 kdelibs (4:3.5.5a.dfsg.1-3) unstable; urgency=medium
 
   * Patch: 41_x_kde_getactionmenu_no_timeout.diff

Deleted: trunk/packages/kdelibs/debian/patches/18_applications_menu_rename.diff

Added: trunk/packages/kdelibs/debian/patches/42_xdgMenuPrefix_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/42_xdgMenuPrefix_support.diff	2006-11-09 14:40:26 UTC (rev 4867)
+++ trunk/packages/kdelibs/debian/patches/42_xdgMenuPrefix_support.diff	2006-11-09 15:42:54 UTC (rev 4868)
@@ -0,0 +1,34 @@
+--- kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp	(Revision 603088)
++++ kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp	(Arbeitskopie)
+@@ -772,9 +772,29 @@
+       return QString::null;
+    }
+ 
+-   QString baseName = QDir::cleanDirPath(m_docInfo.baseDir + fileName);
+-   QString result = locate("xdgconf-menu", baseName);
++   QString result;
+ 
++   QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
++   if (!xdgMenuPrefix.isEmpty())
++   {
++      QFileInfo fileInfo(fileName);
++
++      QString fileNameOnly = fileInfo.fileName();
++      if (!fileNameOnly.startsWith(xdgMenuPrefix))
++         fileNameOnly = xdgMenuPrefix + fileNameOnly;
++
++      QString baseName = QDir::cleanDirPath(m_docInfo.baseDir +
++                                            fileInfo.dirPath() + "/" +
++                                            fileNameOnly);
++      result = locate("xdgconf-menu", baseName);
++   }
++
++   if (result.isEmpty())
++   {
++       QString baseName = QDir::cleanDirPath(m_docInfo.baseDir + fileName);
++       result = locate("xdgconf-menu", baseName);
++   }
++
+    return result;
+ }
+ 

Added: trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff	2006-11-09 14:40:26 UTC (rev 4867)
+++ trunk/packages/kdelibs/debian/patches/43_hardcode_xdgMenuPrefix.diff	2006-11-09 15:42:54 UTC (rev 4868)
@@ -0,0 +1,14 @@
+diff -Nur kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp kdelibs-3.5.5a.dfsg.1.new/kded/vfolder_menu.cpp
+--- kdelibs-3.5.5a.dfsg.1/kded/vfolder_menu.cpp	2006-11-08 17:51:51.000000000 +0100
++++ kdelibs-3.5.5a.dfsg.1.new/kded/vfolder_menu.cpp	2006-11-08 17:57:37.000000000 +0100
+@@ -774,7 +774,9 @@
+ 
+    QString result;
+ 
+-   QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
++   //QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
++   // hardcode xdgMenuPrefix to "kde-" string until proper upstream fix
++   QString xdgMenuPrefix = "kde-";
+    if (!xdgMenuPrefix.isEmpty())
+    {
+       QFileInfo fileInfo(fileName);