Magellan Linux

Contents of /trunk/kdelibs4/patches/kdelibs4-4.5.1-kde-applications-menu.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1140 - (show annotations) (download)
Wed Sep 22 17:44:43 2010 UTC (13 years, 7 months ago) by niro
File size: 1236 byte(s)
- added kdelibs-4.5.1 patches
1 --- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
2 +++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
3 @@ -69,7 +69,7 @@
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 kde-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 --- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
13 +++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
14 @@ -302,7 +302,7 @@
15 if (!m_trackId.isEmpty())
16 g_vfolder->setTrackId(m_trackId);
17
18 - VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
19 + VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
20
21 KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
22 entry->setLayoutInfo(kdeMenu->layoutList);