[arch-commits] Commit in kdegraphics/repos (3 files)

[Pierre Schmitz]

    Date: Friday, August 29, 2008 @ 10:38:43
  Author: pierre
Revision: 10602

Merged revisions 9908-10601 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/kdegraphics/trunk

........
  r10429 | pierre | 2008-08-29 07:02:38 +0000 (Fr, 29 Aug 2008) | 2 lines
  
  upgpkg: kdegraphics 4.1.1-1
      Update to KDE 4.1.1
........

Modified:
  kdegraphics/repos/extra-i686/	(properties)
  kdegraphics/repos/extra-i686/PKGBUILD
Deleted:
  kdegraphics/repos/extra-i686/fix-printing-in-okular.patch

------------------------------+
 PKGBUILD                     |   14 +++++---------
 fix-printing-in-okular.patch |   12 ------------
 2 files changed, 5 insertions(+), 21 deletions(-)


Property changes on: kdegraphics/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /kdegraphics/trunk:1-9907
   + /kdegraphics/trunk:1-10601

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-08-29 14:37:29 UTC (rev 10601)
+++ extra-i686/PKGBUILD	2008-08-29 14:38:43 UTC (rev 10602)
@@ -2,25 +2,21 @@
 # Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdegraphics
-pkgver=4.1.0
-pkgrel=4
+pkgver=4.1.1
+pkgrel=1
 pkgdesc="KDE Graphics is a collection of graphic oriented applications:"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
-depends=('kdelibs' 'poppler-qt' 'libspectre' 'exiv2' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca' 'qimageblitz' 'ebook-tools')
+depends=('kdelibs' 'kdebase-runtime' 'poppler-qt' 'libspectre' 'exiv2' 'sane' 'chmlib' 'libdjvu' 'lcms' 'qca' 'qimageblitz' 'ebook-tools')
 makedepends=('pkgconfig' 'cmake' 'automoc4')
 replaces=('gwenview' 'gwenview-i18n')
 options=('docs')
-source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2"
-        fix-printing-in-okular.patch)
-md5sums=('3793b8b1ca0a326403b8f20ac40ef89d'
-         '9fb8e3b89effd33720d161e477bb0f59')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('e5475d37dc0a12b6ce7e6dbebceb9340')
 
 build() {
-	cd $srcdir/${pkgname}-${pkgver}
-	patch -Np4 -i ../fix-printing-in-okular.patch || return 1
 	cd $srcdir
 	mkdir build
 	cd build

Deleted: extra-i686/fix-printing-in-okular.patch
===================================================================
--- extra-i686/fix-printing-in-okular.patch	2008-08-29 14:37:29 UTC (rev 10601)
+++ extra-i686/fix-printing-in-okular.patch	2008-08-29 14:38:43 UTC (rev 10602)
@@ -1,12 +0,0 @@
---- branches/KDE/4.1/kdegraphics/okular/generators/poppler/generator_pdf.cpp	2008/08/20 14:09:12	849950
-+++ branches/KDE/4.1/kdegraphics/okular/generators/poppler/generator_pdf.cpp	2008/08/20 14:09:26	849951
-@@ -868,6 +868,9 @@
-     {
-         userMutex()->unlock();
-         delete psConverter;
-+#ifdef HAVE_POPPLER_0_7
-+        tf.close();
-+#endif
-         int ret = Okular::FilePrinter::printFile( printer, tempfilename,
-                                                   Okular::FilePrinter::SystemDeletesFiles,
-                                                   Okular::FilePrinter::ApplicationSelectsPages,