[arch-commits] Commit in koffice/trunk (PKGBUILD)

[Ronald van Haren]

    Date: Tuesday, May 4, 2010 @ 08:02:20
  Author: ronald
Revision: 79536

upgpkg: koffice 2.1.91-1
update to 2.2 RC; move filter deps to correct package as optdepends; add kdegraphics-libs as optdepend to support raw image formats

Modified:
  koffice/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-04 09:03:46 UTC (rev 79535)
+++ PKGBUILD	2010-05-04 12:02:20 UTC (rev 79536)
@@ -10,7 +10,7 @@
 	'koffice-karbon'
 	'koffice-karbon-doc'
 	'koffice-kplato'
-	'koffice-kplato-doc'
+#	'koffice-kplato-doc'
 	'koffice-kword'
 #	'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources)
 	'koffice-servicetypes'
@@ -27,26 +27,25 @@
 	'koffice-pics'
 	'koffice-tools'
 	'koffice-thesaurus-doc')
-pkgver=2.1.1
-pkgrel=2
+pkgver=2.1.91
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'eigen' \
   'kdelibs' 'gsl' 'qca' 'lcms' 'glew' 'qimageblitz' \
-  'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'openexr' 'opengtl')
+  'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'openexr' 'opengtl' 'kdegraphics-libs')
 groups=('koffice')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-	'libpng14.patch')
-md5sums=('9955f30f43ed3f6970870f55015a1a18'
-         '8f139e0be95f3566cb860bd384c5aa8a')
+source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('9f91571e320bf01e1aa1face0a5155b8')
 
 build() {
 	cd ${srcdir}/${pkgbase}-${pkgver}
 
 	# buildtime patch
-  	patch -Np0 -i ${srcdir}/libpng14.patch || return 1
-	
+#  	patch -Np0 -i ${srcdir}/libpng14.patch || return 1
+#        patch -Np0 -i ${srcdir}/koffice-gcc45.patch || return 1	
+
 	cd ${srcdir}
 	mkdir build
 	cd build
@@ -116,11 +115,11 @@
         make DESTDIR=${pkgdir} install
 }
 
-package_koffice-kplato-doc(){
-	pkgdesc="Documentation for kplato"
-        cd ${srcdir}/build/doc/kplato
-        make DESTDIR=${pkgdir} install
-}
+#package_koffice-kplato-doc(){
+#	pkgdesc="Documentation for kplato"
+#        cd ${srcdir}/build/doc/kplato
+#        make DESTDIR=${pkgdir} install
+#}
 
 package_koffice-kword(){
 	pkgdesc="Wordprocessor for KDE"
@@ -176,7 +175,7 @@
 
 package_koffice-libs(){
 	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'qca' 'lcms' 'pstoedit' 'wv2' 'libwpd' 'koffice-servicetypes')
+	depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes')
         cd ${srcdir}/build/libs
         make DESTDIR=${pkgdir} install
 }
@@ -189,6 +188,8 @@
 
 package_koffice-filters(){
 	pkgdesc="Filters for de KDE office suite"
+        optdepends=('wv2: ms word/powerpoint document importer' 'libwpd: wordperfect document importer' 
+	'pstoedit: Karbon EPS import filter' 'kdegraphics-libs: support for raw images')
         cd ${srcdir}/build/filters
         make DESTDIR=${pkgdir} install
 }