diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-01 21:03:48 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-01 21:03:48 +0000 |
| commit | 13fa99bc786b9931d7b406d46306324f972c481f (patch) | |
| tree | bdc198fc27c7154b140ec4b1cf5f88e87558cee1 /media-libs/libwmf/files | |
| parent | Simplify install - docs and examples are installed based on use_with() parame... (diff) | |
| download | gentoo-2-13fa99bc786b9931d7b406d46306324f972c481f.tar.gz gentoo-2-13fa99bc786b9931d7b406d46306324f972c481f.tar.bz2 gentoo-2-13fa99bc786b9931d7b406d46306324f972c481f.zip | |
Revision bump in order to fix gdk-pixbuf split and use system fonts. Fixes bugs #256087 and #368485.
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libwmf/files')
| -rw-r--r-- | media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch | 25 | ||||
| -rw-r--r-- | media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch | 39 |
2 files changed, 64 insertions, 0 deletions
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-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) |