Date: Sunday, January 31, 2010 @ 17:27:45
Author: pierre
Revision: 66586
adjust patches
Modified:
kdelibs/kde-unstable/PKGBUILD
kdelibs/kde-unstable/archlinux-menu.patch
kdelibs/kde-unstable/kde-applications-menu.patch
-----------------------------+
PKGBUILD | 4 ++--
archlinux-menu.patch | 20 +++++++++-----------
kde-applications-menu.patch | 16 +++++++---------
3 files changed, 18 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-01-31 22:08:20 UTC (rev 66585)
+++ PKGBUILD 2010-01-31 22:27:45 UTC (rev 66586)
@@ -18,8 +18,8 @@
source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2";
'kde-applications-menu.patch' 'archlinux-menu.patch'
'abs-syntax-highlight.patch')
md5sums=('56cd5ff7dfe996a283ae28609047f40e'
- '280f34ee159845f8902c31bd499254fc'
- '79e39afdfc7081f44971da21a8427879'
+ '2b30cc3e382e99333e7ff388943473e9'
+ 'a2c351e5c4d5bef39865e5fc1a39219a'
'18ea42696a7f41332a092d6ead7efc6a')
build() {
Modified: archlinux-menu.patch
===================================================================
--- archlinux-menu.patch 2010-01-31 22:08:20 UTC (rev 66585)
+++ archlinux-menu.patch 2010-01-31 22:27:45 UTC (rev 66586)
@@ -1,24 +1,22 @@
---- kdelibs-4.3.80/kded/applications.menu~ 2009-12-12 15:53:10.989993958
+0100
-+++ kdelibs-4.3.80/kded/applications.menu 2009-12-12 15:55:47.653312211
+0100
-@@ -15,6 +15,7 @@
- <Menuname>More</Menuname>
+--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000
+0000
++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077
+0000
+@@ -16,11 +16,19 @@
</DefaultLayout>
<Layout>
-+ <Menuname>Archlinux</Menuname>
- <Menuname>Internet</Menuname>
- <Menuname>Office</Menuname>
- <Menuname>Graphics</Menuname>
-@@ -30,6 +31,13 @@
+ <Merge type="menus"/>
++ <Menuname>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
</Layout>
<Menu>
-+ <Name>Archlinux</Name>
++ <Name>Arch Linux</Name>
+ <Directory>Archlinux.directory</Directory>
+ <Include>
+ <Category>Archlinux</Category>
+ </Include>
+ </Menu>
+ <Menu>
- <Name>LostFound</Name>
+ <Name>Applications</Name>
<Directory>kde-unknown.directory</Directory>
<OnlyUnallocated/>
Modified: kde-applications-menu.patch
===================================================================
--- kde-applications-menu.patch 2010-01-31 22:08:20 UTC (rev 66585)
+++ kde-applications-menu.patch 2010-01-31 22:27:45 UTC (rev 66586)
@@ -1,6 +1,5 @@
-diff -Nura kdelibs-4.3.0.orig/kded/CMakeLists.txt
kdelibs-4.3.0/kded/CMakeLists.txt
---- kdelibs-4.3.0.orig/kded/CMakeLists.txt 2008-12-10 17:12:28.000000000
+0100
-+++ kdelibs-4.3.0/kded/CMakeLists.txt 2009-07-30 13:22:06.000000000 +0200
+--- 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 )
@@ -10,12 +9,11 @@
endif (WIN32)
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kded.upd DESTINATION
${DATA_INSTALL_DIR}/kconf_update )
-diff -Nura kdelibs-4.3.0.orig/kded/kbuildsycoca.cpp
kdelibs-4.3.0/kded/kbuildsycoca.cpp
---- kdelibs-4.3.0.orig/kded/kbuildsycoca.cpp 2009-03-10 13:26:04.000000000
+0100
-+++ kdelibs-4.3.0/kded/kbuildsycoca.cpp 2009-07-30 13:22:06.000000000
+0200
-@@ -306,7 +306,7 @@
- connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
- this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
+--- 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);
