openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File menu.patch of Package kservice (Revision 7663cd3d220bbc6163a33cc2130f24dd)

Currently displaying revision 7663cd3d220bbc6163a33cc2130f24dd , Show latest

diff --git a/src/kbuildsycoca/CMakeLists.txt b/src/kbuildsycoca/CMakeLists.txt
index ff2d3b6..2987ff5 100644
--- a/src/kbuildsycoca/CMakeLists.txt
+++ b/src/kbuildsycoca/CMakeLists.txt
@@ -26,5 +26,5 @@ install(TARGETS kbuildsycoca5 ${INSTALL_TARGETS_DEFAULT_ARGS} )
 if (WIN32)
 install( FILES applications.menu  DESTINATION  ${SHARE_INSTALL_PREFIX}/xdg/menus )
 else ()
-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
+install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kf5-applications.menu )
 endif ()
diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
index 38faa44..475d9f3 100644
--- a/src/kbuildsycoca/kbuildsycoca.cpp
+++ b/src/kbuildsycoca/kbuildsycoca.cpp
@@ -305,7 +305,7 @@ bool KBuildSycoca::build()
             g_vfolder->setTrackId(m_trackId);
         }
 
-        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu");
+        VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kf5-applications.menu");
 
         KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
         entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
index f342ad6..e929279 100644
--- a/src/kbuildsycoca/vfolder_menu.cpp
+++ b/src/kbuildsycoca/vfolder_menu.cpp
@@ -737,7 +737,7 @@ VFolderMenu::locateMenuFile(const QString &fileName)
 
     QString result;
 
-    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
+    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("kf5-"));
     if (!xdgMenuPrefix.isEmpty()) {
         QFileInfo fileInfo(fileName);

Places

File menu.patch of Package kservice (Revision 7663cd3d220bbc6163a33cc2130f24dd)

Places