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

Ronald van Haren ronald at archlinux.org
Wed Jan 20 16:10:22 EST 2010


    Date: Wednesday, January 20, 2010 @ 16:10:21
  Author: ronald
Revision: 64488

upgpkg: koffice 2.1.1-1
    update to latest version; added patch for libpng14

Added:
  koffice/trunk/libpng14.patch
Modified:
  koffice/trunk/PKGBUILD

----------------+
 PKGBUILD       |   27 +++++++++++++++++----------
 libpng14.patch |   11 +++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-20 20:40:07 UTC (rev 64487)
+++ PKGBUILD	2010-01-20 21:10:21 UTC (rev 64488)
@@ -23,7 +23,7 @@
 	'koffice-filters'
 #	'koffice-kdgantt' # results in empty package / has no function
 	'koffice-krita'
-	'koffice-krita-doc'
+#	'koffice-krita-doc' # no krita-doc anymore upstream
 	'koffice-pics'
 	'koffice-tools'
 	'koffice-thesaurus-doc')
@@ -36,12 +36,19 @@
   'kdelibs' 'gsl' 'qca' 'lcms' 'glew' 'qimageblitz' \
   'kdepimlibs' 'pstoedit' 'wv2' 'poppler-qt' 'libwpd' 'openexr' 'opengtl')
 groups=('koffice')
-source=("http://download.kde.org/stable/koffice-${pkgver}/koffice-${pkgver}.tar.bz2")
+source=("http://download.kde.org/stable/koffice-${pkgver}/koffice-${pkgver}.tar.bz2"
+	'libpng14.patch')
+md5sums=('9955f30f43ed3f6970870f55015a1a18'
+         '8f139e0be95f3566cb860bd384c5aa8a')
 
 build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
+	cd ${srcdir}/koffice-${pkgver}
+
+	# buildtime patch
+  	patch -Np0 -i ${srcdir}/libpng14.patch || return 1
+	        
+	mkdir ../build
+	cd ../build
 	cmake ../koffice-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH=ON \
@@ -203,11 +210,11 @@
         make DESTDIR=${pkgdir} install
 }
 
-package_koffice-krita-doc(){
-	pkgdesc="Documentation for krita"
-        cd ${srcdir}/build/doc/krita
-        make DESTDIR=${pkgdir} install
-}
+#package_koffice-krita-doc(){
+#	pkgdesc="Documentation for krita"
+#        cd ${srcdir}/build/doc/krita
+#        make DESTDIR=${pkgdir} install
+#}
 
 package_koffice-pics(){
 	pkgdesc="Icons for the KDE office suite"

Added: libpng14.patch
===================================================================
--- libpng14.patch	                        (rev 0)
+++ libpng14.patch	2010-01-20 21:10:21 UTC (rev 64488)
@@ -0,0 +1,11 @@
+--- krita/ui/kis_png_converter.cpp.old	2010-01-20 17:48:11.890898029 +0100
++++ krita/ui/kis_png_converter.cpp	2010-01-20 17:50:13.477553307 +0100
+@@ -404,7 +404,7 @@
+ 
+     png_byte signature[8];
+     iod->peek((char*)signature, 8);
+-    if (!png_check_sig(signature, 8)) {
++    if (!png_sig_cmp(signature, 0, 8) == 0) {
+         iod->close();
+         return (KisImageBuilder_RESULT_BAD_FETCH);
+     }



More information about the arch-commits mailing list