Attachment #177046 for bug #214528

Lines 31-41 Link Here

(-)x11/kdelibs4/Makefile (-2 / +1 lines)
31	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl	31	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
32		32
33	USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \	33	USES= cmake:outsource fam gettext grantlee:4 jpeg kde:4 perl5 \
34	shared-mime-info shebangfix tar:xz	34	shared-mime-info shebangfix ssl tar:xz
35	USE_GNOME= libxml2 libxslt	35	USE_GNOME= libxml2 libxslt
36	USE_KDE= oxygen-icons4 \	36	USE_KDE= oxygen-icons4 \
37	attica automoc4 ontologies soprano strigi	37	attica automoc4 ontologies soprano strigi
38	USE_OPENSSL= yes
39	USE_QT4= corelib dbus declarative designer_build gui \	38	USE_QT4= corelib dbus declarative designer_build gui \
40	network opengl phonon qt3support \	39	network opengl phonon qt3support \
41	qtestlib script sql svg webkit xml \	40	qtestlib script sql svg webkit xml \




--- kded/CMakeLists.txt.orig	2015-05-07 17:19:13 UTC
+++ kded/CMakeLists.txt
@@ -74,7 +74,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_
 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 )





--- kded/kbuildsycoca.cpp.orig	2015-05-07 17:19:13 UTC
+++ kded/kbuildsycoca.cpp
@@ -311,7 +311,7 @@ bool KBuildSycoca::build()
      if (!m_trackId.isEmpty())
         g_vfolder->setTrackId(m_trackId);
 
-     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde4-applications.menu", true);
 
      KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
      entry->setLayoutInfo(kdeMenu->layoutList);


Lines 22-28 Link Here

(-)x11/kdelibs4/pkg-plist (-1 / +1 lines)
22	bin/nepomuk-rcgen	22	bin/nepomuk-rcgen
23	bin/preparetips	23	bin/preparetips
24	etc/dbus-1/system.d/org.kde.auth.conf	24	etc/dbus-1/system.d/org.kde.auth.conf
25	etc/xdg/menus/applications.menu	25	etc/xdg/menus/kde4-applications.menu
26	include/kde4/KDE/ConversionCheck/QVconvertible	26	include/kde4/KDE/ConversionCheck/QVconvertible
27	include/kde4/KDE/ConversionCheck/type_toQString	27	include/kde4/KDE/ConversionCheck/type_toQString
28	include/kde4/KDE/ConversionCheck/type_toQVariant	28	include/kde4/KDE/ConversionCheck/type_toQVariant

Line 0 Link Here

(-)devel/kf5-kservice/files/patch-CMakeLists.txt (+11 lines)
	1	--- CMakeLists.txt.orig 2016-11-15 11:30:57 UTC
	2	+++ CMakeLists.txt
	3	@@ -28,7 +28,7 @@ ecm_setup_version(${KF5_VERSION}
	4	PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ServiceConfigVersion.cmake"
	5	SOVERSION 5)
	6
	7	-set(APPLICATIONS_MENU_NAME applications.menu
	8	+set(APPLICATIONS_MENU_NAME kf5-applications.menu
	9	CACHE STRING "Name to install the applications.menu file as.")
	10
	11	# TODO: Remove these

Lines 1-5 Link Here

(-)devel/kf5-kservice/pkg-plist (-1 / +1 lines)
1	bin/kbuildsycoca5	1	bin/kbuildsycoca5
2	etc/xdg/menus/applications.menu	2	etc/xdg/menus/kf5-applications.menu
3	include/KF5/KService/KAutostart	3	include/KF5/KService/KAutostart
4	include/KF5/KService/KDBusServiceStarter	4	include/KF5/KService/KDBusServiceStarter
5	include/KF5/KService/KMimeTypeTrader	5	include/KF5/KService/KMimeTypeTrader

Return to bug 214528

Line 0 Link Here

(-)x11/kdelibs4/files/patch-kded_CMakeLists.txt (+12 lines)
	1	--- kded/CMakeLists.txt.orig 2015-05-07 17:19:13 UTC
	2	+++ kded/CMakeLists.txt
	3	@@ -74,7 +74,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_
	4	if (WIN32)
	5	install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
	6	else (WIN32)
	7	-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
	8	+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde4-applications.menu )
	9	endif (WIN32)
	10	install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
	11	install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
	12

Line 0 Link Here

(-)x11/kdelibs4/files/patch-kded_kbuildsycoca.cpp (+12 lines)
	1	--- kded/kbuildsycoca.cpp.orig 2015-05-07 17:19:13 UTC
	2	+++ kded/kbuildsycoca.cpp
	3	@@ -311,7 +311,7 @@ bool KBuildSycoca::build()
	4	if (!m_trackId.isEmpty())
	5	g_vfolder->setTrackId(m_trackId);
	6
	7	- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
	8	+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde4-applications.menu", true);
	9
	10	KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
	11	entry->setLayoutInfo(kdeMenu->layoutList);
	12