summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-10-22 20:07:17 +0200
committertnut <thierryn1 at hispeed dot ch>2010-10-22 20:07:17 +0200
commit0c6f11417a2f23a22fd46e3d6809fd4bcbd538b5 (patch)
tree664692cf9618c0065812f5e03317fff2d9e3f50c
parent5df14c5d9e93faed794afcdd08fff0d37df87d1b (diff)
downloadnutyx-extra-0c6f11417a2f23a22fd46e3d6809fd4bcbd538b5.tar.gz
nutyx-extra-0c6f11417a2f23a22fd46e3d6809fd4bcbd538b5.tar.bz2
nutyx-extra-0c6f11417a2f23a22fd46e3d6809fd4bcbd538b5.tar.xz
nutyx-extra-0c6f11417a2f23a22fd46e3d6809fd4bcbd538b5.zip
kdelibs, port nettoyé
-rwxr-xr-xkde/kdelibs/Pkgfile4
-rw-r--r--kde/kdelibs/kde-applications-menu.patch22
2 files changed, 2 insertions, 24 deletions
diff --git a/kde/kdelibs/Pkgfile b/kde/kdelibs/Pkgfile
index a914180df..d4e08d699 100755
--- a/kde/kdelibs/Pkgfile
+++ b/kde/kdelibs/Pkgfile
@@ -7,8 +7,8 @@
name=kdelibs
version=4.5.2
release=1
-source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2
- kde-applications-menu.patch)
+source=(ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 \
+ http://nutyx.meticul.eu/files/patchs/$name/kde-applications-menu.patch)
build() {
cd $name-$version
diff --git a/kde/kdelibs/kde-applications-menu.patch b/kde/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/kde/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
-@@ -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 kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
- if (!m_trackId.isEmpty())
- g_vfolder->setTrackId(m_trackId);
-
-- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
- entry->setLayoutInfo(kdeMenu->layoutList);