[weasel-commit] Source: libwmf=0.2.8.4-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Tue, 08 Jun 2010 08:05:45 -0400
================================
libwmf:source=0.2.8.4-1
cvc rdiff libwmf -1 /weasel.rpath.org@wgl:3-devel/0.2.8.4-1
================================
0.2.8.4-1 Filip Brcic (brcha@xxxxxxxxxxxx) Tue Jun 8 08:04:01 2010
libwmf 0.2.8.4
libwmf-0.2.8.4-intoverflow.patch: new
--- /dev/null
+++ libwmf-0.2.8.4-intoverflow.patch
@@ -0,0 +27 @@
+--- libwmf-0.2.8.4.orig/src/player.c 2002-12-10 19:30:26.000000000 +0000
++++ libwmf-0.2.8.4/src/player.c 2006-07-12 15:12:52.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include "player/defaults.h" /* Provides: default settings */
+ #include "player/record.h" /* Provides: parameter mechanism */
+ #include "player/meta.h" /* Provides: record interpreters */
++#include <stdint.h>
+
+ /**
+ * @internal
+@@ -132,8 +134,14 @@
+ }
+ }
+
+-/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3)
* 2 * sizeof (unsigned char));
+- */ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) )
* 2 * sizeof (unsigned char));
++ if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
++ {
++ API->err = wmf_E_InsMem;
++ WMF_DEBUG (API,"bailing...");
++ return (API->err);
++ }
++
++ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) )
* 2 * sizeof (unsigned char));
+
+ if (ERR (API))
+ { WMF_DEBUG (API,"bailing...");
libwmf-0.2.8.4-build.patch: new
--- /dev/null
+++ libwmf-0.2.8.4-build.patch
@@ -0,0 +54 @@
+--- libwmf-0.2.8.4/src/convert/Makefile.am
++++ libwmf-0.2.8.4/src/convert/Makefile.am
+@@ -1,6 +1,6 @@
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+
+-LDFLAGS = -L$(top_builddir)/src/.libs @WMF_LIBFLAGS@ @LDFLAGS@
++LDADD = -L$(top_builddir)/src/.libs @WMF_LIBFLAGS@ @LDFLAGS@
+
+ DEFS = @DEFS@ @WMF_DEFS@ \
+ -DPACKAGE=\"@PACKAGE@\" \
+--- libwmf-0.2.8.4/src/extra/gd/Makefile.am
++++ libwmf-0.2.8.4/src/extra/gd/Makefile.am
+@@ -1,8 +1,6 @@
+ INCLUDES = -I$(srcdir)
+
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+-
+-LDFLAGS = @LDFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+
+ DEFS = @DEFS@ @GD_DEFS@
+
+--- libwmf-0.2.8.4/src/extra/trio/Makefile.am
++++ libwmf-0.2.8.4/src/extra/trio/Makefile.am
+@@ -1,6 +1,4 @@
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+-
+-LDFLAGS = @LDFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+
+ DEFS = @DEFS@ @WMF_DEFS@
+
+--- libwmf-0.2.8.4/src/ipa/Makefile.am
++++ libwmf-0.2.8.4/src/ipa/Makefile.am
+@@ -1,6 +1,4 @@
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+-
+-LDFLAGS = @LDFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+
+ DEFS = @DEFS@ @WMF_DEFS@ \
+ -DPACKAGE=\"@PACKAGE@\" \
+--- libwmf-0.2.8.4/src/Makefile.am
++++ libwmf-0.2.8.4/src/Makefile.am
+@@ -20,7 +20,7 @@
+
+ SUBDIRS = $(DIRHEAVY)
+
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@ @GDK_PIXBUF_CFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@ @GDK_PIXBUF_CFLAGS@
+
+ DEFS = @DEFS@ @WMF_DEFS@ $(DEFHEAVY) $(GDK_PIXBUF_DEFS) \
+ -DPACKAGE=\"@PACKAGE@\" \
libwmf-0.2.8.4.tar.gz: new
libwmf.recipe: new
--- /dev/null
+++ libwmf.recipe
@@ -0,0 +56 @@
+#
+# Copyright (c) 2010 Weasel GNU/Linux [Filip Brcic (brcha@xxxxxxxxxxxx)]
+# Distributed under the terms of the GNU General Public License v3
+#
+
+class Libwmf(AutoPackageRecipe):
+ name = 'libwmf'
+ version = '0.2.8.4'
+
+ buildRequires = [
+ 'libxml2:devel', 'freetype:devel', 'zlib:devel',
+ 'libpng:devel', 'libjpeg:devel', 'libICE:devel',
+ 'libSM:devel', 'libX11:devel', 'gtk:devel',
+ 'pkg-config:devel', 'libXt:devel', 'libXpm:devel',
+ 'autoconf-wrapper:runtime', 'autoconf25:runtime',
+ 'automake-wrapper:runtime', 'automake110:runtime',
+ 'libtool:runtime', 'libtool:devel', 'm4:runtime',
+ ]
+ runtimeRequires = [
+ 'ghostscript:runtime',
+ ]
+ buildRequires.extend(runtimeRequires)
+
+ shortDesc = 'Library for converting WMF files'
+ url = 'http://wvware.sourceforge.net/'
+ licenses = [ 'GPL-2' ]
+ categories = [ 'Media/Libraries' ]
+
+ def unpack(r):
+ r.addArchive('mirror://sourceforge/wvware/')
+
+ for p in [ 'libwmf-0.2.8.4-intoverflow.patch',
+ 'libwmf-0.2.8.4-build.patch',
+ 'libwmf-0.2.8.4-pngfix.patch',
+ ]:
+ r.addPatch(p)
+
+ r.Environment('WANT_AUTOCONF', '2.5')
+ r.Environment('WANT_AUTOMAKE', '1.10')
+ r.Autoreconf()
+
+ def configure(r):
+ r.Configure(
+ ' --disable-debug'
+ ' --with-x'
+ ' --disable-gd'
+ ' --with-sys-gd'
+ ' --without-expat --with-libxml2' # using libxml2
+ ' --with-gsfontdir=%(datadir)s/ghostscript/fonts'
+ ' --with-fontdir=%(datadir)s/libwmf/fonts/'
+ ' --with-docdir=%(thisdocdir)s'
+ )
+
+ def policy(r):
+ for req in r.runtimeRequires:
+ r.Requires(req, '%(bindir)s/')
libwmf-0.2.8.4-pngfix.patch: new
--- /dev/null
+++ libwmf-0.2.8.4-pngfix.patch
@@ -0,0 +20 @@
+diff -NrU5 libwmf-0.2.8.4.orig/src/ipa/ipa.c libwmf-0.2.8.4/src/ipa/ipa.c
+--- libwmf-0.2.8.4.orig/src/ipa/ipa.c 2009-05-10 23:41:17.000000000 +0200
++++ libwmf-0.2.8.4/src/ipa/ipa.c 2009-05-11 00:07:43.000000000 +0200
+@@ -33,10 +33,16 @@
+
+ /* Define WMF_API if this is module so that ipa headers are included via
"wmfdefs.h" first
+ */
+ #define WMF_IPA 1
+
++#ifndef HAVE_GD
++#ifdef HAVE_LIBPNG
++#include <png.h>
++#endif /* HAVE_LIBPNG */
++#endif /* HAVE_GD */
++
+ #include "wmfdefs.h"
+
+ #include "ipa/ipa.h"
+ #include "ipa/ipa/bmp.h" /* Provides default bitmap functionality */
+
Committed by: brcha
Other related posts:
