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

[Pierre Schmitz]

    Date: Friday, September 26, 2008 @ 00:33:54
  Author: pierre
Revision: 13238

Merged revisions 11997,12367,13104 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdelibs/trunk

........
  r11997 | pierre | 2008-09-07 16:28:00 +0200 (So, 07 Sep 2008) | 1 line
  
  update mime and icon database on install; use better doc location
........
  r12367 | pierre | 2008-09-14 09:53:27 +0200 (So, 14 Sep 2008) | 1 line
  
  no release yet
........
  r13104 | pierre | 2008-09-26 02:39:42 +0200 (Fr, 26 Sep 2008) | 1 line
  
  prepare for KDE-4.1.2 update
........

Added:
  kdelibs/repos/extra-i686/archlinux-menu.patch
    (from rev 13104, kdelibs/trunk/archlinux-menu.patch)
  kdelibs/repos/extra-i686/kdelibs.install
    (from rev 13104, kdelibs/trunk/kdelibs.install)
Modified:
  kdelibs/repos/extra-i686/	(properties)
  kdelibs/repos/extra-i686/PKGBUILD

----------------------+
 PKGBUILD             |   19 ++++++++++++-------
 archlinux-menu.patch |   17 +++++++++++++++++
 kdelibs.install      |   12 ++++++++++++
 3 files changed, 41 insertions(+), 7 deletions(-)


Property changes on: kdelibs/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kdelibs/trunk:1-10705
   + /kdelibs/trunk:1-13237

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-26 03:23:14 UTC (rev 13237)
+++ extra-i686/PKGBUILD	2008-09-26 04:33:54 UTC (rev 13238)
@@ -2,8 +2,8 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.1.1
-pkgrel=2
+pkgver=4.1.2
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -11,19 +11,23 @@
 groups=('kde')
 depends=('libxcursor' 'phonon' 'shared-mime-info' 'qt>=4.4' 'libxpm'
 	 'enchant' 'jasper' 'openexr' 'strigi' 'bzip2' 'libxslt' 'libxtst'
-	 'giflib' 'soprano' 'ca-certificates' 'heimdal' 'pmount')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl')
+	 'giflib' 'soprano' 'ca-certificates' 'heimdal' 'pmount' 'xdg-utils')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'hspell')
 replaces=('arts')
 options=('docs')
+install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch')
-md5sums=('d75ec557cd864e3f9150059c3e58ed61'
-         '3daa0f01fe26325fb3dbd807a04898ad')
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+md5sums=('cb5f43d2b11669fb17b0a1ecf3736c17'
+         '3daa0f01fe26325fb3dbd807a04898ad'
+         '0ad42200df2d2b8aab01d2ef4b21e02f')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
 	# avoid file conflict with gnome-menu
 	patch -p1 -i $srcdir/kde-applications-menu.patch || return 1
+	# add Archlinux menu entry
+	patch -p0 -i $srcdir/archlinux-menu.patch || return 1
 	cd ..
 	mkdir build
 	cd build
@@ -32,6 +36,7 @@
 		-DKDE_DISTRIBUTION_TEXT='Arch Linux' \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DSYSCONF_INSTALL_DIR=/etc \
+		-DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
 		-DKDE_DEFAULT_HOME='.kde4' \
 		-DWITH_FAM=OFF
 	make

Copied: kdelibs/repos/extra-i686/archlinux-menu.patch (from rev 13104, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- extra-i686/archlinux-menu.patch	                        (rev 0)
+++ extra-i686/archlinux-menu.patch	2008-09-26 04:33:54 UTC (rev 13238)
@@ -0,0 +1,17 @@
+--- kded/applications.menu	2008-05-21 11:07:34.000000000 +0000
++++ kded/applications.menu.new	2008-09-07 11:11:22.000000000 +0000
+@@ -21,6 +21,14 @@
+ 	</Layout>
+ 
+ 	<Menu>
++		<Name>Archlinux</Name>
++		<Directory>Archlinux.directory</Directory>
++		<Include>
++			<Category>Archlinux</Category>
++		</Include>
++	</Menu>
++
++	<Menu>
+ 		<Name>Applications</Name>
+ 		<Directory>kde-unknown.directory</Directory>
+ 		<OnlyUnallocated/>

Copied: kdelibs/repos/extra-i686/kdelibs.install (from rev 13104, kdelibs/trunk/kdelibs.install)
===================================================================
--- extra-i686/kdelibs.install	                        (rev 0)
+++ extra-i686/kdelibs.install	2008-09-26 04:33:54 UTC (rev 13238)
@@ -0,0 +1,12 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
\ No newline at end of file