diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-libs/libwmf/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-libs/libwmf/files')
6 files changed, 177 insertions, 0 deletions
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-build.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-build.patch new file mode 100644 index 000000000000..8814046e889c --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-build.patch @@ -0,0 +1,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@\" \ diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch new file mode 100644 index 000000000000..83a9ce7f3635 --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch @@ -0,0 +1,25 @@ +diff -urN libwmf-0.2.8.4.old/configure.ac libwmf-0.2.8.4/configure.ac +--- libwmf-0.2.8.4.old/configure.ac 2011-07-01 22:37:57.000000000 +0200 ++++ libwmf-0.2.8.4/configure.ac 2011-07-01 22:41:38.000000000 +0200 +@@ -744,8 +744,7 @@ + + if test $LIBWMF_BUILDSTYLE != lite; then + PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ +- GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` +- GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" ++ GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0` + wmf_gdk_pixbuf=yes + ],[ wmf_gdk_pixbuf=no + ]) +diff -urN libwmf-0.2.8.4.old/src/Makefile.am libwmf-0.2.8.4/src/Makefile.am +--- libwmf-0.2.8.4.old/src/Makefile.am 2011-07-01 22:37:57.000000000 +0200 ++++ libwmf-0.2.8.4/src/Makefile.am 2011-07-01 22:40:41.000000000 +0200 +@@ -63,7 +63,7 @@ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -release $(LT_RELEASE) -export-dynamic + +-loaderdir = $(libdir)/$(GDK_PIXBUF_DIR) ++loaderdir = $(GDK_PIXBUF_DIR) + + loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN) + diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch new file mode 100644 index 000000000000..507fe66223ce --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch @@ -0,0 +1,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..."); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-libpng-1.5.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-libpng-1.5.patch new file mode 100644 index 000000000000..3528c74ebd8d --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-libpng-1.5.patch @@ -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); diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch new file mode 100644 index 000000000000..52717735a26e --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch @@ -0,0 +1,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 */ + diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch new file mode 100644 index 000000000000..2f7465c33cd0 --- /dev/null +++ b/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch @@ -0,0 +1,39 @@ +diff -urN libwmf-0.2.8.4.old/fonts/Makefile.am libwmf-0.2.8.4/fonts/Makefile.am +--- libwmf-0.2.8.4.old/fonts/Makefile.am 2011-07-01 22:37:57.000000000 +0200 ++++ libwmf-0.2.8.4/fonts/Makefile.am 2011-07-01 22:38:37.000000000 +0200 +@@ -1,35 +1,3 @@ + fontdir = @WMF_FONTDIR@ + + bin_SCRIPTS = libwmf-fontmap +- +-FONTS = \ +- n019003l.afm \ +- n019003l.pfb \ +- n019004l.afm \ +- n019004l.pfb \ +- n019023l.afm \ +- n019023l.pfb \ +- n019024l.afm \ +- n019024l.pfb \ +- n021003l.afm \ +- n021003l.pfb \ +- n021004l.afm \ +- n021004l.pfb \ +- n021023l.afm \ +- n021023l.pfb \ +- n021024l.afm \ +- n021024l.pfb \ +- n022003l.afm \ +- n022003l.pfb \ +- n022004l.afm \ +- n022004l.pfb \ +- n022023l.afm \ +- n022023l.pfb \ +- n022024l.afm \ +- n022024l.pfb \ +- s050000l.afm \ +- s050000l.pfb +- +-font_DATA = $(FONTS) fontmap +- +-EXTRA_DIST = libwmf-fontmap.in LICENSE $(FONTS) |