[arch-commits] Commit in kdelibs/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Tobias Powalowski]

    Date: Monday, April 28, 2008 @ 15:58:53
  Author: tpowa
Revision: 1037

Merged revisions 2-1036 via svnmerge from 
svn+ssh://tpowa@archlinux.org/home/svn-packages/kdelibs/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sa, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1036 | tpowa | 2008-04-28 21:58:13 +0200 (Mo, 28 Apr 2008) | 1 line
  
  upgpkg: kdelibs 3.5.9-3
........

Modified:
  kdelibs/repos/extra-x86_64/	(properties)
  kdelibs/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)


Property changes on: kdelibs/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /kdelibs/trunk:1
   + /kdelibs/trunk:1-1036

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-04-28 19:58:13 UTC (rev 1036)
+++ extra-x86_64/PKGBUILD	2008-04-28 19:58:53 UTC (rev 1037)
@@ -5,7 +5,7 @@
 pkgname=kdelibs
 pkgver=3.5.9
 kdever=3.5.9
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=(i686 x86_64)
 url="http://www.kde.org"
@@ -16,7 +16,7 @@
 depends=('arts>=1.5.9' 'db>=4.6' 'libxslt' 'pcre' 'libart-lgpl' 'openexr'
          'avahi>=0.6.9' 'jasper>=1.900.1' 'fam' 'bzip2' 'openssl' 'libidn' 'perl'
 	 'aspell' 'heimdal>=1.0.1' 'acl' 'libtiff' 'qt3>=3.3.7')
-makedepends=(pkgconfig cups)
+makedepends=(pkgconfig cups lua)
 
 # for easier build, just uncomment the mirror you want to use
   mirror="ftp.solnet.ch/mirror/KDE"         # updated every 2 hours, very fast for Europe
@@ -33,7 +33,9 @@
 	kicker-crash.patch
 	kde-menu.patch
 	inotify.patch
-	gmail.fix) 
+	gmail.fix
+	ftp://ftp.kde.org/pub/kde/security_patches/post-kde-3.5.5-kinit.diff
+	fix-kate.patch) 
 
 build() {
   # Source the QT and KDE profile
@@ -41,6 +43,10 @@
   [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
   # start building
   cd $startdir/src/$pkgname-$pkgver
+  # fix security issue
+  patch -Np0 -i $startdir/src/post-kde-3.5.5-kinit.diff || return 1
+  # fix http://bugs.archlinux.org/task/9891
+  patch -Np4 -i $startdir/src/fix-kate.patch || return 1
   #patch -Np0 -i $startdir/src/xdg-icon-lookup.patch || return 1
   patch -Np1 -i $startdir/src/kde-menu.patch || return 1
   patch -Np0 -i $startdir/src/applications.menu.patch || return 1
@@ -92,4 +98,6 @@
          '091d05a08330372ddbaf5ef9d426be53'
          'e94aef45b5a59fe58c7cc085ab1dd3ae'
          '42d288e71fa0a886bc8882c198a27f2e'
-         'd888793ff50dafb970f503e3ab6851b6')
+         'd888793ff50dafb970f503e3ab6851b6'
+         '9d99d5f02b696e7a493836f285a319da'
+         '1886d7ad148f8ca63908126d7a642e8b')