[packages/kdelibs/dev-trinity] patch vfolders to respect XDG_MENU_PREFIX

[glen]

commit 49e15fcc9b4b3d1ebc94b6e778f7f42f5b41608e
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jun 6 23:06:21 2014 +0300

    patch vfolders to respect XDG_MENU_PREFIX

 kdelibs.spec          | 10 ++++++----
 xdg-menu-prefix.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/kdelibs.spec b/kdelibs.spec
index df15c98..fb7869a 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,6 +1,3 @@
-# TODO
-# - unpakcaged:
-#        /etc/xdg/menus/applications.menu
 #
 # Conditional build:
 %bcond_without	alsa			# ALSA support
@@ -37,7 +34,7 @@ Summary(ru.UTF-8):	K Desktop Environment 3 - Библиотеки
 Summary(uk.UTF-8):	K Desktop Environment 3 - Бібліотеки
 Name:		kdelibs
 Version:	3.5.13.2
-Release:	0.16
+Release:	0.18
 Epoch:		9
 License:	LGPL v2
 Group:		X11/Libraries
@@ -63,6 +60,7 @@ Patch12:	%{name}-konqueror-agent.patch
 Patch15:	dcopobject-destruct-crash.patch
 Patch17:	%{name}-3.5.10-LDFLAG_fix-1.patch
 Patch19:	%{name}-gcc4.patch
+Patch20:	xdg-menu-prefix.patch
 URL:		http://www.kde.org/
 %{?with_openexr:BuildRequires:	OpenEXR-devel >= 1.4.0.a}
 BuildRequires:	acl-devel
@@ -307,6 +305,7 @@ strony innych użytkowników lokalnych.
 %patch15 -p1
 %patch17 -p1
 %patch19 -p1
+%patch20 -p1
 
 # add https://www.cacert.org/ root certificate
 cp -a %{SOURCE5} kio/kssl/kssl/cacert.pem
@@ -383,6 +382,8 @@ if [ ! -f installed.stamp ]; then
 	ln -nf $RPM_BUILD_ROOT%{_bindir}/{kdeinit_wrapper,kdeinit_shutdown}
 	ln -nf $RPM_BUILD_ROOT%{_bindir}/{ktelnetservice,filesharelist}
 
+	mv $RPM_BUILD_ROOT/etc/xdg/menus/{,kde-}applications.menu
+
 	# For fileshare
 	touch $RPM_BUILD_ROOT/etc/security/fileshare.conf
 	%{__sed} -i -e 's|/etc/init.d|/etc/rc.d/init.d|g' $RPM_BUILD_ROOT%{_bindir}/fileshare*
@@ -605,6 +606,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_applnkdir}
 %dir %{_applnkdir}/.hidden
 %{_applnkdir}/kio_iso.desktop
+/etc/xdg/menus/kde-applications.menu
 
 %attr(755,root,root) %{_libdir}/libkdeinit_cupsdconf.so
 %attr(755,root,root) %{_libdir}/libkdeinit_dcopserver.so
diff --git a/xdg-menu-prefix.patch b/xdg-menu-prefix.patch
new file mode 100644
index 0000000..3cbf2ef
--- /dev/null
+++ b/xdg-menu-prefix.patch
@@ -0,0 +1,13 @@
+--- kdelibs-trinity-3.5.13.2/kded/vfolder_menu.cpp~	2012-09-08 18:01:25.000000000 +0300
++++ kdelibs-trinity-3.5.13.2/kded/vfolder_menu.cpp	2014-06-06 21:03:23.723980824 +0300
+@@ -774,9 +774,7 @@
+ 
+    TQString result;
+ 
+-   //TQString xdgMenuPrefix = TQString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
+-   // hardcode xdgMenuPrefix to "kde-" string until proper upstream fix
+-   TQString xdgMenuPrefix = "kde-";
++   TQString xdgMenuPrefix = TQString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
+    if (!xdgMenuPrefix.isEmpty())
+    {
+       TQFileInfo fileInfo(fileName);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kdelibs.git/commitdiff/49e15fcc9b4b3d1ebc94b6e778f7f42f5b41608e