Date: Wednesday, January 18, 2012 @ 16:36:12
Author: eric
Revision: 146861
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libwmf/repos/staging-i686/
libwmf/repos/staging-i686/PKGBUILD
(from rev 146860, libwmf/trunk/PKGBUILD)
libwmf/repos/staging-i686/libwmf-0.2.8.4-libpng-1.5.patch
(from rev 146860, libwmf/trunk/libwmf-0.2.8.4-libpng-1.5.patch)
libwmf/repos/staging-i686/libwmf-0.2.8.4-useafterfree.patch
(from rev 146860, libwmf/trunk/libwmf-0.2.8.4-useafterfree.patch)
libwmf/repos/staging-i686/libwmf.install
(from rev 146860, libwmf/trunk/libwmf.install)
libwmf/repos/staging-x86_64/
libwmf/repos/staging-x86_64/PKGBUILD
(from rev 146860, libwmf/trunk/PKGBUILD)
libwmf/repos/staging-x86_64/libwmf-0.2.8.4-libpng-1.5.patch
(from rev 146860, libwmf/trunk/libwmf-0.2.8.4-libpng-1.5.patch)
libwmf/repos/staging-x86_64/libwmf-0.2.8.4-useafterfree.patch
(from rev 146860, libwmf/trunk/libwmf-0.2.8.4-useafterfree.patch)
libwmf/repos/staging-x86_64/libwmf.install
(from rev 146860, libwmf/trunk/libwmf.install)
--------------------------------------------------+
staging-i686/PKGBUILD | 40 +++++++++++++++++++++
staging-i686/libwmf-0.2.8.4-libpng-1.5.patch | 12 ++++++
staging-i686/libwmf-0.2.8.4-useafterfree.patch | 10 +++++
staging-i686/libwmf.install | 13 ++++++
staging-x86_64/PKGBUILD | 40 +++++++++++++++++++++
staging-x86_64/libwmf-0.2.8.4-libpng-1.5.patch | 12 ++++++
staging-x86_64/libwmf-0.2.8.4-useafterfree.patch | 10 +++++
staging-x86_64/libwmf.install | 13 ++++++
8 files changed, 150 insertions(+)
Copied: libwmf/repos/staging-i686/PKGBUILD (from rev 146860,
libwmf/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-01-18 21:36:12 UTC (rev 146861)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@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
+}
Copied: libwmf/repos/staging-i686/libwmf-0.2.8.4-libpng-1.5.patch (from rev
146860, libwmf/trunk/libwmf-0.2.8.4-libpng-1.5.patch)
===================================================================
--- staging-i686/libwmf-0.2.8.4-libpng-1.5.patch
(rev 0)
+++ staging-i686/libwmf-0.2.8.4-libpng-1.5.patch 2012-01-18 21:36:12 UTC
(rev 146861)
@@ -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);
Copied: libwmf/repos/staging-i686/libwmf-0.2.8.4-useafterfree.patch (from rev
146860, libwmf/trunk/libwmf-0.2.8.4-useafterfree.patch)
===================================================================
--- staging-i686/libwmf-0.2.8.4-useafterfree.patch
(rev 0)
+++ staging-i686/libwmf-0.2.8.4-useafterfree.patch 2012-01-18 21:36:12 UTC
(rev 146861)
@@ -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++;
Copied: libwmf/repos/staging-i686/libwmf.install (from rev 146860,
libwmf/trunk/libwmf.install)
===================================================================
--- staging-i686/libwmf.install (rev 0)
+++ staging-i686/libwmf.install 2012-01-18 21:36:12 UTC (rev 146861)
@@ -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
+}
Copied: libwmf/repos/staging-x86_64/PKGBUILD (from rev 146860,
libwmf/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-01-18 21:36:12 UTC (rev 146861)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Eric Bélanger <e...@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
+}
Copied: libwmf/repos/staging-x86_64/libwmf-0.2.8.4-libpng-1.5.patch (from rev
146860, libwmf/trunk/libwmf-0.2.8.4-libpng-1.5.patch)
===================================================================
--- staging-x86_64/libwmf-0.2.8.4-libpng-1.5.patch
(rev 0)
+++ staging-x86_64/libwmf-0.2.8.4-libpng-1.5.patch 2012-01-18 21:36:12 UTC
(rev 146861)
@@ -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);
Copied: libwmf/repos/staging-x86_64/libwmf-0.2.8.4-useafterfree.patch (from rev
146860, libwmf/trunk/libwmf-0.2.8.4-useafterfree.patch)
===================================================================
--- staging-x86_64/libwmf-0.2.8.4-useafterfree.patch
(rev 0)
+++ staging-x86_64/libwmf-0.2.8.4-useafterfree.patch 2012-01-18 21:36:12 UTC
(rev 146861)
@@ -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++;
Copied: libwmf/repos/staging-x86_64/libwmf.install (from rev 146860,
libwmf/trunk/libwmf.install)
===================================================================
--- staging-x86_64/libwmf.install (rev 0)
+++ staging-x86_64/libwmf.install 2012-01-18 21:36:12 UTC (rev 146861)
@@ -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
+}
