From 0c6f11417a2f23a22fd46e3d6809fd4bcbd538b5 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Fri, 22 Oct 2010 20:07:17 +0200
Subject: kdelibs, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kde/kdelibs/Pkgfile                     |  4 ++--
 kde/kdelibs/kde-applications-menu.patch | 22 ----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 kde/kdelibs/kde-applications-menu.patch

(limited to 'kde/kdelibs')

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);
-- 
cgit v1.2.3-54-g00ecf