[arch-commits] Commit in libwmf/repos (9 files)

Ionut Biru ibiru at archlinux.org
Sun Feb 5 06:52:43 EST 2012


    Date: Sunday, February 5, 2012 @ 06:52:43
  Author: ibiru
Revision: 148846

db-move: moved libwmf from [testing] to [extra] (x86_64)

Added:
  libwmf/repos/extra-x86_64/PKGBUILD
    (from rev 148654, libwmf/repos/testing-x86_64/PKGBUILD)
  libwmf/repos/extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch
    (from rev 148654, libwmf/repos/testing-x86_64/libwmf-0.2.8.4-libpng-1.5.patch)
  libwmf/repos/extra-x86_64/libwmf-0.2.8.4-useafterfree.patch
    (from rev 148654, libwmf/repos/testing-x86_64/libwmf-0.2.8.4-useafterfree.patch)
  libwmf/repos/extra-x86_64/libwmf.install
    (from rev 148654, libwmf/repos/testing-x86_64/libwmf.install)
Deleted:
  libwmf/repos/extra-x86_64/PKGBUILD
  libwmf/repos/extra-x86_64/libpng14.patch
  libwmf/repos/extra-x86_64/libwmf-0.2.8.4-useafterfree.patch
  libwmf/repos/extra-x86_64/libwmf.install
  libwmf/repos/testing-x86_64/

-----------------------------------+
 PKGBUILD                          |   81 +++++++++++++++++-------------------
 libpng14.patch                    |   12 -----
 libwmf-0.2.8.4-libpng-1.5.patch   |   12 +++++
 libwmf-0.2.8.4-useafterfree.patch |   20 ++++----
 libwmf.install                    |   26 +++++------
 5 files changed, 75 insertions(+), 76 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-05 11:52:40 UTC (rev 148845)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:52:43 UTC (rev 148846)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: FJ <joostef at gmail.com>
-
-pkgname=libwmf
-pkgver=0.2.8.4
-pkgrel=8
-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')
-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')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libpng14.patch"
-  patch -Np1 -i "${srcdir}/libwmf-0.2.8.4-useafterfree.patch"
-  ./configure --prefix=/usr \
-              --with-gsfontdir=/usr/share/fonts/Type1 \
-	      --with-fontdir=/usr/share/fonts/Type1 \
-	      --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  #Remove fonts, these are in gsfonts
-  rm -rf "${pkgdir}/usr/share/fonts"
-  #Remove static GTK loader, can't use it anyways
-  rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a
-}

Copied: libwmf/repos/extra-x86_64/PKGBUILD (from rev 148654, libwmf/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-05 11:52:43 UTC (rev 148846)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=libwmf
+pkgver=0.2.8.4
+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' '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
+	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 -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 \
+	      --with-gsfontmap=/usr/share/ghostscript/8.15/lib/Fontmap.GS
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  #Remove fonts, these are in gsfonts
+  rm -rf "${pkgdir}/usr/share/fonts"
+  #Remove static GTK loader, can't use it anyways
+  rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a
+}

Deleted: extra-x86_64/libpng14.patch
===================================================================
--- extra-x86_64/libpng14.patch	2012-02-05 11:52:40 UTC (rev 148845)
+++ extra-x86_64/libpng14.patch	2012-02-05 11:52:43 UTC (rev 148846)
@@ -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

Copied: libwmf/repos/extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch (from rev 148654, libwmf/repos/testing-x86_64/libwmf-0.2.8.4-libpng-1.5.patch)
===================================================================
--- extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch	                        (rev 0)
+++ extra-x86_64/libwmf-0.2.8.4-libpng-1.5.patch	2012-02-05 11:52:43 UTC (rev 148846)
@@ -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);

Deleted: extra-x86_64/libwmf-0.2.8.4-useafterfree.patch
===================================================================
--- extra-x86_64/libwmf-0.2.8.4-useafterfree.patch	2012-02-05 11:52:40 UTC (rev 148845)
+++ extra-x86_64/libwmf-0.2.8.4-useafterfree.patch	2012-02-05 11:52:43 UTC (rev 148846)
@@ -1,10 +0,0 @@
---- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list	2009-04-24 04:06:44.000000000 -0400
-+++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c	2009-04-24 04:08:30.000000000 -0400
-@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
- 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
- 		if (more == 0) return;
- 		im->clip->max += 8;
-+                im->clip->list = more;
- 	}
- 	im->clip->list[im->clip->count] = (*rect);
- 	im->clip->count++;

Copied: libwmf/repos/extra-x86_64/libwmf-0.2.8.4-useafterfree.patch (from rev 148654, libwmf/repos/testing-x86_64/libwmf-0.2.8.4-useafterfree.patch)
===================================================================
--- extra-x86_64/libwmf-0.2.8.4-useafterfree.patch	                        (rev 0)
+++ extra-x86_64/libwmf-0.2.8.4-useafterfree.patch	2012-02-05 11:52:43 UTC (rev 148846)
@@ -0,0 +1,10 @@
+--- libwmf-0.2.8.4/src/extra/gd/gd_clip.c.CVE-2009-1364-im-clip-list	2009-04-24 04:06:44.000000000 -0400
++++ libwmf-0.2.8.4/src/extra/gd/gd_clip.c	2009-04-24 04:08:30.000000000 -0400
+@@ -70,6 +70,7 @@ void gdClipSetAdd(gdImagePtr im,gdClipRe
+ 	{	more = gdRealloc (im->clip->list,(im->clip->max + 8) * sizeof (gdClipRectangle));
+ 		if (more == 0) return;
+ 		im->clip->max += 8;
++                im->clip->list = more;
+ 	}
+ 	im->clip->list[im->clip->count] = (*rect);
+ 	im->clip->count++;

Deleted: extra-x86_64/libwmf.install
===================================================================
--- extra-x86_64/libwmf.install	2012-02-05 11:52:40 UTC (rev 148845)
+++ extra-x86_64/libwmf.install	2012-02-05 11:52:43 UTC (rev 148846)
@@ -1,13 +0,0 @@
-post_install() {
-  if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then
-    gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}

Copied: libwmf/repos/extra-x86_64/libwmf.install (from rev 148654, libwmf/repos/testing-x86_64/libwmf.install)
===================================================================
--- extra-x86_64/libwmf.install	                        (rev 0)
+++ extra-x86_64/libwmf.install	2012-02-05 11:52:43 UTC (rev 148846)
@@ -0,0 +1,13 @@
+post_install() {
+  if [ -x usr/bin/gdk-pixbuf-query-loaders ]; then
+    gdk-pixbuf-query-loaders > etc/gtk-2.0/gdk-pixbuf.loaders
+  fi
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}



More information about the arch-commits mailing list