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

[Andrea Scarpino]

    Date: Monday, May 23, 2011 @ 15:42:11
  Author: andrea
Revision: 124654

KDE 4.7beta1

Added:
  kdelibs/kde-unstable/
Modified:
  kdelibs/kde-unstable/PKGBUILD
  kdelibs/kde-unstable/kdelibs.install
Deleted:
  kdelibs/kde-unstable/abs-syntax-highlight.patch

----------------------------+
 PKGBUILD                   |   20 ++++++++------------
 abs-syntax-highlight.patch |   12 ------------
 kdelibs.install            |    3 ++-
 3 files changed, 10 insertions(+), 25 deletions(-)

Modified: kde-unstable/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2011-05-17 19:20:43 UTC (rev 124236)
+++ kde-unstable/PKGBUILD	2011-05-23 19:42:11 UTC (rev 124654)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdelibs
-pkgver=4.6.3
-pkgrel=2
+pkgver=4.6.80
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -16,14 +16,13 @@
         'docbook-xsl')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
         'hspell')
-replaces=('arts' 'kdelibs-experimental')
+replaces=('kdelibs-experimental')
 install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
-sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4'
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'kde-applications-menu.patch' 'archlinux-menu.patch')
+sha1sums=('313e051b08762ec68d7d7aaceb5471ede2bf66ac'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
-          'd994f262356af5b9e4e9619646e471bd98c91efb')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
 
 build() {
        cd ${srcdir}/${pkgname}-${pkgver}
@@ -32,8 +31,6 @@
        patch -p1 -i $srcdir/kde-applications-menu.patch
        # add Archlinux menu entry
        patch -p1 -i $srcdir/archlinux-menu.patch
-       # add syntax highlightning for PKGBUILD and .install files
-       patch -p1 -i $srcdir/abs-syntax-highlight.patch
 
        cd ${srcdir}
        mkdir build
@@ -46,8 +43,7 @@
                -DSYSCONF_INSTALL_DIR=/etc \
                -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
                -DKDE_DEFAULT_HOME='.kde4' \
-               -DWITH_FAM=OFF \
-               -DKAUTH_BACKEND=PolkitQt-1
+               -DWITH_FAM=OFF
        make
 }
 

Deleted: kde-unstable/abs-syntax-highlight.patch
===================================================================
--- trunk/abs-syntax-highlight.patch	2011-05-17 19:20:43 UTC (rev 124236)
+++ kde-unstable/abs-syntax-highlight.patch	2011-05-23 19:42:11 UTC (rev 124654)
@@ -1,12 +0,0 @@
-diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml
---- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml	2009-04-15 12:26:37.000000000 +0200
-+++ kdelibs-4.3.0/kate/syntax/data/bash.xml	2009-07-30 13:24:01.000000000 +0200
-@@ -8,7 +8,7 @@
-         <!ENTITY noword   "(?![\w$+-])">                <!-- no word, $, + or - following -->
-         <!ENTITY pathpart "([\w_ at .%*?+-]|\\ )">     <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert at kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert at kde.nl)
-     Changes by Matthew Woehlke (mw_triad at users.sourceforge.net)

Modified: kde-unstable/kdelibs.install
===================================================================
--- trunk/kdelibs.install	2011-05-17 19:20:43 UTC (rev 124236)
+++ kde-unstable/kdelibs.install	2011-05-23 19:42:11 UTC (rev 124654)
@@ -1,6 +1,7 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
 }
 
 post_upgrade() {
@@ -9,4 +10,4 @@
 
 post_remove() {
 	post_install
-}
\ No newline at end of file
+}