[arch-commits] Commit in kdelibs/trunk (PKGBUILD archlinux-menu.patch kdelibs.install)

[Pierre Schmitz]

    Date: Sunday, September 7, 2008 @ 10:28:00
  Author: pierre
Revision: 11997

update mime and icon database on install; use better doc location

Added:
  kdelibs/trunk/archlinux-menu.patch
  kdelibs/trunk/kdelibs.install
Modified:
  kdelibs/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   13 +++++++++----
 archlinux-menu.patch |   17 +++++++++++++++++
 kdelibs.install      |   12 ++++++++++++
 3 files changed, 38 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-07 14:18:45 UTC (rev 11996)
+++ PKGBUILD	2008-09-07 14:28:00 UTC (rev 11997)
@@ -3,7 +3,7 @@
 
 pkgname=kdelibs
 pkgver=4.1.1
-pkgrel=2
+pkgrel=3
 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')
+	 'giflib' 'soprano' 'ca-certificates' 'heimdal' 'pmount' 'xdg-utils')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl')
 replaces=('arts')
 options=('docs')
+install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
 md5sums=('d75ec557cd864e3f9150059c3e58ed61'
-         '3daa0f01fe26325fb3dbd807a04898ad')
+         '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

Added: archlinux-menu.patch
===================================================================
--- archlinux-menu.patch	                        (rev 0)
+++ archlinux-menu.patch	2008-09-07 14:28:00 UTC (rev 11997)
@@ -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/>

Added: kdelibs.install
===================================================================
--- kdelibs.install	                        (rev 0)
+++ kdelibs.install	2008-09-07 14:28:00 UTC (rev 11997)
@@ -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