[59010] trunk/dports/kde/kdelibs4

[macsforever2000 at macports.org]

Revision: 59010
          http://trac.macports.org/changeset/59010
Author:   macsforever2000 at macports.org
Date:     2009-10-08 08:05:03 -0700 (Thu, 08 Oct 2009)
Log Message:
-----------
Fix conflict with gnome-menus. (#18914)

Modified Paths:
--------------
    trunk/dports/kde/kdelibs4/Portfile

Added Paths:
-----------
    trunk/dports/kde/kdelibs4/files/default-kde4-xdg-menu-prefix.patch

Modified: trunk/dports/kde/kdelibs4/Portfile
===================================================================
--- trunk/dports/kde/kdelibs4/Portfile	2009-10-08 15:04:08 UTC (rev 59009)
+++ trunk/dports/kde/kdelibs4/Portfile	2009-10-08 15:05:03 UTC (rev 59010)
@@ -6,6 +6,7 @@
 
 name                kdelibs4
 version             4.3.2
+revision            1
 categories          kde kde4
 maintainers         snc m4x.org:jeremy_laine
 description         KDE4 core libraries
@@ -36,7 +37,8 @@
                     port:aspell port:aspell-dict-en
                     #port:phonon \
 
-patchfiles          dont-use-fdatasync.patch \
+patchfiles          default-kde4-xdg-menu-prefix.patch \
+                    dont-use-fdatasync.patch \
                     dont-use-carbon-keyboard.patch \
                     nameser-compat.patch
 patch.dir           ${workpath}/${distname}

Added: trunk/dports/kde/kdelibs4/files/default-kde4-xdg-menu-prefix.patch
===================================================================
--- trunk/dports/kde/kdelibs4/files/default-kde4-xdg-menu-prefix.patch	                        (rev 0)
+++ trunk/dports/kde/kdelibs4/files/default-kde4-xdg-menu-prefix.patch	2009-10-08 15:05:03 UTC (rev 59010)
@@ -0,0 +1,35 @@
+Patch borrowed from Debian's kde4libs package.
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+--- a/kded/vfolder_menu.cpp
++++ b/kded/vfolder_menu.cpp
+@@ -770,8 +770,10 @@
+    QString result;
+ 
+    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
+-   if (!xdgMenuPrefix.isEmpty())
+-   {
++   // enforce kde4 prefix unless XDG_MENU_PREFIX is set (LP: #297195)
++   if (xdgMenuPrefix.isEmpty())
++      xdgMenuPrefix = QString("kde4-");
++
+       QFileInfo fileInfo(fileName);
+ 
+       QString fileNameOnly = fileInfo.fileName();
+@@ -781,7 +783,6 @@
+       QString baseName = QDir::cleanPath(m_docInfo.baseDir +
+                                          fileInfo.path() + '/' + fileNameOnly);
+       result = KStandardDirs::locate("xdgconf-menu", baseName);
+-   }
+ 
+    if (result.isEmpty())
+    {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091008/0858cc05/attachment-0001.html>