[arch-commits] Commit in kdelibs/repos (3 files)

[Pierre Schmitz]

    Date: Thursday, July 24, 2008 @ 15:06:39
  Author: pierre
Revision: 6513

Merged revisions 6316-6512 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdelibs/trunk

........
  r6511 | pierre | 2008-07-24 18:41:16 +0000 (Do, 24 Jul 2008) | 1 line
  
  upgpkg: kdelibs 4.1.0-2
........

Added:
  kdelibs/repos/testing-i686/kde-applications-menu.patch
    (from rev 6511, kdelibs/trunk/kde-applications-menu.patch)
Modified:
  kdelibs/repos/testing-i686/	(properties)
  kdelibs/repos/testing-i686/PKGBUILD

-----------------------------+
 PKGBUILD                    |   12 ++++++------
 kde-applications-menu.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 6 deletions(-)


Property changes on: kdelibs/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kdelibs/trunk:1-6315
   + /kdelibs/trunk:1-6512

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-07-24 18:41:44 UTC (rev 6512)
+++ testing-i686/PKGBUILD	2008-07-24 19:06:39 UTC (rev 6513)
@@ -3,7 +3,7 @@
 
 pkgname=kdelibs
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -14,13 +14,14 @@
 	 'giflib' 'soprano' 'ca-certificates' 'heimdal')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl')
 replaces=('arts')
-conflicts=('gnome-menus')
 options=('docs')
-source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a72fd8653b86f73860d0e7ebf0f2d606')
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2" 'kde-applications-menu.patch')
+md5sums=('a72fd8653b86f73860d0e7ebf0f2d606' '3daa0f01fe26325fb3dbd807a04898ad')
 
 build() {
-	cd $srcdir
+	cd $srcdir/${pkgname}-${pkgver}
+	patch -p1 -i $srcdir/kde-applications-menu.patch
+	cd ..
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
@@ -37,4 +38,4 @@
 	# link it to the one from ca-certificates
 	rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
 	ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-}
\ No newline at end of file
+}

Copied: kdelibs/repos/testing-i686/kde-applications-menu.patch (from rev 6511, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- testing-i686/kde-applications-menu.patch	                        (rev 0)
+++ testing-i686/kde-applications-menu.patch	2008-07-24 19:06:39 UTC (rev 6513)
@@ -0,0 +1,26 @@
+Index: b/kded/kbuildsycoca.cpp
+===================================================================
+--- a/kded/kbuildsycoca.cpp
++++ b/kded/kbuildsycoca.cpp
+@@ -307,7 +307,7 @@
+      connect(g_vfolder, SIGNAL(newService(const QString &, KService::Ptr *)),
+              this, SLOT(slotCreateEntry(const QString &, KService::Ptr *)));
+ 
+-     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);
+Index: b/kded/CMakeLists.txt
+===================================================================
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -67,7 +67,7 @@
+ 
+ ########### install files ###############
+ 
+-install( FILES applications.menu  DESTINATION  ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu  DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu)
+ install( FILES kdedmodule.desktop DESTINATION  ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd           DESTINATION  ${DATA_INSTALL_DIR}/kconf_update )
+