kdelibs rebuild for new kmenu patch

kdelibs/KRatingPainter.diff

@@ -1,37 +0,0 @@
-commit e170b512068f8c79a33291e16f3b5691b4aced34
-Author: Albert Astals Cid <aacid@kde.org>
-Date:   Fri Sep 28 23:04:18 2012 +0200
-
-    Removing installed headers between 4.9.1 and 4.9.2 is not a good idea
-    
-    Partly reverts 386532a02774eecb716db8a87dc72465a1cbee29 by Christoph Feck
-    Fixes gwenview build
-    CCMAIL: christoph@maxiom.de
-
-diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
-index f1c843b..342ff7e 100644
---- a/includes/CMakeLists.txt
-+++ b/includes/CMakeLists.txt
-@@ -960,6 +960,8 @@ DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/khtml COMPONENT Devel)
- 
- install(FILES
-   Nepomuk/File
-+  Nepomuk/KRatingPainter
-+  Nepomuk/KRatingWidget
-   Nepomuk/MassUpdateJob
-   Nepomuk/Resource
-   Nepomuk/ResourceManager
-diff --git a/includes/Nepomuk/KRatingPainter b/includes/Nepomuk/KRatingPainter
-new file mode 100644
-index 0000000..300dd7d
---- /dev/null
-+++ b/includes/Nepomuk/KRatingPainter
-@@ -0,0 +1 @@
-+#include "../../nepomuk/kratingpainter.h"
-diff --git a/includes/Nepomuk/KRatingWidget b/includes/Nepomuk/KRatingWidget
-new file mode 100644
-index 0000000..c76b4ea
---- /dev/null
-+++ b/includes/Nepomuk/KRatingWidget
-@@ -0,0 +1 @@
-+#include "../../nepomuk/kratingwidget.h"

kdelibs/MergeDir.patch

@@ -0,0 +1,10 @@
+diff -Naur kdelibs-4.9.1-orig/kded/applications.menu kdelibs-4.9.1/kded/applications.menu
+--- kdelibs-4.9.1-orig/kded/applications.menu	2012-08-13 10:39:49.000000000 +0200
++++ kdelibs-4.9.1/kded/applications.menu	2012-09-29 17:50:31.554171400 +0200
+@@ -437,5 +437,6 @@
+ 		</And>
+ 	</Include>
+ 	<DefaultMergeDirs/>
++	<MergeDir>applications-merged</MergeDir>
+ 	<MergeFile>applications-kmenuedit.menu</MergeFile>
+ </Menu>

kdelibs/PKGBUILD

@@ -13,7 +13,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 pkgname="kdelibs"
 arch=('i686' 'x86_64')
 pkgver=${_kdever}
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 url="http://www.kde.org"
 license=('GPL' 'LGPL' 'FDL')
@@ -42,12 +42,12 @@ source=($_mirror/${pkgname}-$_kdever.tar.xz
 	01_chakra_tag.patch
 	02_kde_applications_menu.patch
 	03_chakra_menu.patch
-	KRatingPainter.diff)
+	MergeDir.patch)
 md5sums=(`grep ${pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`
          'e9ac43de85dc73309ab6c89ebcf5dc50'  # 01_chakra_tag.patch
          'e94450ba5430ea9c1e33bad9ae38ca2d'  # 02_kde_applications_menu.patch
-         '53b85403e4dd8f9146933c52ca23243e'   # 03_chakra_menu.path
-         '0c98515d1b9b74f21ebde92fcf388515')
+         '53b85403e4dd8f9146933c52ca23243e'  # 03_chakra_menu.path
+         'f442698bae9d4ffb26f6df9457d7fc5a') # MergeDir.patch
         
 #
 # build function
@@ -59,8 +59,8 @@ build() {
 	patch -Np1 -i ${srcdir}/01_chakra_tag.patch
 	patch -Np1 -i ${srcdir}/02_kde_applications_menu.patch
 	patch -Np1 -i ${srcdir}/03_chakra_menu.patch
-	# gwenview build fix 4.9.2
-	patch -p1 -i ${srcdir}/KRatingPainter.diff
+	# right positioning of applications' entries in kmenu
+	patch -p1 -i ${srcdir}/MergeDir.patch
 
         cd ..