[arch-commits] Commit in libwmf/trunk (3 files)

Eric Bélanger eric at archlinux.org
Wed Jan 18 21:35:40 UTC 2012


    Date: Wednesday, January 18, 2012 @ 16:35:40
  Author: eric
Revision: 146860

upgpkg: libwmf 0.2.8.4-9

Rebuild against libpng 1.5 and libtiff 4.0, Clean up depends and makedepends, Add gdk-pixbuf2 optdepends

Added:
  libwmf/trunk/libwmf-0.2.8.4-libpng-1.5.patch
Modified:
  libwmf/trunk/PKGBUILD
Deleted:
  libwmf/trunk/libpng14.patch

---------------------------------+
 PKGBUILD                        |   25 ++++++++++++-------------
 libpng14.patch                  |   12 ------------
 libwmf-0.2.8.4-libpng-1.5.patch |   12 ++++++++++++
 3 files changed, 24 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-18 21:23:30 UTC (rev 146859)
+++ PKGBUILD	2012-01-18 21:35:40 UTC (rev 146860)
@@ -1,29 +1,28 @@
 # $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: FJ <joostef at gmail.com>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=libwmf
 pkgver=0.2.8.4
-pkgrel=8
+pkgrel=9
 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
 arch=('i686' 'x86_64')
 url="http://wvware.sourceforge.net/libwmf.html"
-license=("LGPL")
-depends=('libpng' 'libx11' 'freetype2' 'libjpeg' 'gsfonts' 'expat')
-makedepends=('gtk2' 'libxt' 'pkg-config')
+license=('LGPL')
+depends=('libpng' 'libx11' 'libjpeg' 'gsfonts')
+makedepends=('gtk2' 'libxt')
+optdepends=('gdk-pixbuf2: for pixbuf loader')
 options=('!libtool' '!docs' '!emptydirs')
 install=libwmf.install
 source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz
-	libpng14.patch libwmf-0.2.8.4-useafterfree.patch)
-md5sums=('d1177739bf1ceb07f57421f0cee191e0' '33d3c07a1be9f99fd88de220930c5550'\
-         '0f02c1cb8a87bf7158634503bf0537e2')
-sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89' '15edb94eec7c9cea988e83660b334e56bf1fe897'\
-         'ea6d28880840e86c96f9079bfd591da54dcffa5c')
+	libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch)
+sha1sums=('822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89'
+          '42aa4c2a82e4e14044c875a7f439baea732a355a'
+          'ea6d28880840e86c96f9079bfd591da54dcffa5c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libpng14.patch"
-  patch -Np1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch"
+  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-libpng-1.5.patch"
+  patch -p1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch"
   ./configure --prefix=/usr \
               --with-gsfontdir=/usr/share/fonts/Type1 \
 	      --with-fontdir=/usr/share/fonts/Type1 \

Deleted: libpng14.patch
===================================================================
--- libpng14.patch	2012-01-18 21:23:30 UTC (rev 146859)
+++ libpng14.patch	2012-01-18 21:35:40 UTC (rev 146860)
@@ -1,12 +0,0 @@
-diff -Nur libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c libwmf-0.2.8.4/src/extra/gd/gd_png.c
---- libwmf-0.2.8.4.orig/src/extra/gd/gd_png.c	2005-07-27 23:35:06.000000000 +0300
-+++ libwmf-0.2.8.4/src/extra/gd/gd_png.c	2010-01-17 01:33:58.000000000 +0200
-@@ -136,7 +136,7 @@
-   /* first do a quick check that the file really is a PNG image; could
-    * have used slightly more general png_sig_cmp() function instead */
-   gdGetBuf (sig, 8, infile);
--  if (!png_check_sig (sig, 8))
-+  if (png_sig_cmp (sig, 0, 8))
-     return NULL;		/* bad signature */
- 
- #ifndef PNG_SETJMP_NOT_SUPPORTED

Added: libwmf-0.2.8.4-libpng-1.5.patch
===================================================================
--- libwmf-0.2.8.4-libpng-1.5.patch	                        (rev 0)
+++ libwmf-0.2.8.4-libpng-1.5.patch	2012-01-18 21:35:40 UTC (rev 146860)
@@ -0,0 +1,12 @@
+diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h	2011-05-23 19:14:23.000000000 +0200
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2011-05-23 19:15:11.000000000 +0200
+@@ -66,7 +66,7 @@
+ 		return;
+ 	}
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
+ 		png_destroy_write_struct (&png_ptr,&info_ptr);
+ 		wmf_free (API,buffer);




More information about the arch-commits mailing list