[arch-commits] CVS update of extra/kde/kdebase (PKGBUILD)

[Tobias Powalowski]

    Date: Monday, October 15, 2007 @ 08:17:06
  Author: tpowa
    Path: /home/cvs-extra/extra/kde/kdebase

Modified: PKGBUILD (1.87 -> 1.88)

'upgpkg: update to new version'


----------+
 PKGBUILD |   36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)


Index: extra/kde/kdebase/PKGBUILD
diff -u extra/kde/kdebase/PKGBUILD:1.87 extra/kde/kdebase/PKGBUILD:1.88
--- extra/kde/kdebase/PKGBUILD:1.87	Sat Sep 29 12:25:48 2007
+++ extra/kde/kdebase/PKGBUILD	Mon Oct 15 08:17:06 2007
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD,v 1.87 2007/09/29 16:25:48 tpowa Exp $
+# $Id: PKGBUILD,v 1.88 2007/10/15 12:17:06 tpowa Exp $
 # Contributor: Roman Kreisel <roman.kreisel at epost.de>
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kdebase
-pkgver=3.5.7
-kdever=3.5.7 # if minor 0, then without .0
-pkgrel=4
+pkgver=3.5.8
+kdever=3.5.8 # if minor 0, then without .0
+pkgrel=1
 pkgdesc="KDE Base Programs."
 arch=(i686 x86_64)
 url="http://www.kde.org"
 license=('GPL')
 groups=('kde')
-makedepends=('samba' 'j2re' 'imake' 'xorg-font-utils' 'pkgconfig')
-depends=('kdelibs>=3.5.7' 'libldap' 'eject>=2.1.5' 'lm_sensors' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl' \
+makedepends=('samba' 'jre' 'imake' 'xorg-font-utils' 'pkgconfig')
+depends=('kdelibs>=3.5.8' 'libldap' 'eject>=2.1.5' 'lm_sensors' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl' \
 	 'libxcomposite' 'libxdamage' 'hal>=0.5.8.1-2' 'pmount>=0.9.13-2' 'libxxf86misc' 'libxkbfile' 'libxss' \
 	 'libfontenc' 'dbus-qt3' 'xorg-xauth' 'db>=4.6')
 backup=('opt/kde/share/config/kdm/Xservers' 'opt/kde/share/config/kdm/kdmrc' \
@@ -22,36 +22,32 @@
   mirror="ftp.solnet.ch/mirror/KDE"         # updated every 2 hours, very fast for Europe
 # mirror="ftp.kde.org/pub/kde/"             # main server
 # mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
-
+# parallel builds break kcontrol and whatnot
+options=(!makeflags)
 source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
-	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror-2.diff
-	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-kdm.diff
 	tango.diff kdm-grub.patch)
 
 
 
 
 build() {
-  # parallel builds break kcontrol and whatnot
-	export MAKEFLAGS="-j1"
-
-	# Source the QT and KDE profile
+  # Source the QT and KDE profile
   [ "$QTDIR" = "" ] && source /etc/profile.d/qt.sh 
   [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
   # start building
   export PATH=$PATH:/usr/X11R6/bin
   cd $startdir/src/$pkgname-$pkgver
-  # fix security issue
-  patch -Np0 -i ../post-3.5.7-kdebase-konqueror-2.diff || return 1
-  patch -Np0 -i ../post-3.5.7-kdebase-kdm.diff || return 1
   patch -Np1 -i ../kdm-grub.patch || return 1
   patch -Np0 -i ../tango.diff || return 1
   sed -i -e 's/applications-merged/kde-applications-merged/g' applnk/Makefile.{am,in}
   #make -f admin/Makefile.common || return 1
   ./configure --prefix=/opt/kde --with-dpms --build="${CHOST}" --host="${CHOST}" \
-  --disable-dependency-tracking --disable-debug --enable-gcc-hidden-visibility --enable-final
+  --disable-dependency-tracking --disable-debug --enable-gcc-hidden-visibility --enable-final \
+  --enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/kde/lib"
   #        --enable-final # remove this if you build with < 512mb ram.
-
+  #fix floppy ioslave
+  #sed -i -e 's#^LIBS = #LIBS = -L/opt/kde/lib -lkio#g' kioslave/floppy/Makefile || return 1
+  #sed -i -e 's#^LIBS = #LIBS = -L/opt/kde/lib -lkio#g' kioslave/smb/Makefile || return 1
   make || return 1
   make DESTDIR=$startdir/pkg install || return 1
   
@@ -79,8 +75,6 @@
   #rm $startdir/pkg/opt/kde/share/icons/crystalsvg/16x16/apps/thunderbird.png
   #rm $startdir/pkg/opt/kde/share/icons/crystalsvg/32x32/apps/thunderbird.png
 }
-md5sums=('b421e01b3ee712549ee967f58ed24de0'
-         'e15d6b5580c5a20ab935f8e553d113e0'
-         'ee6c57046902c5b5a32a4699558baafc'
+md5sums=('9990c669229daaaa8fca4c5e354441fd'
          '43232dcb916b1d25e0ad7ef3575763a4'
          'f8645dc5d0044476a01c9c6a95c4853f')