Archives
Archives
| From: | "Tomas Chvatal (scarabeus)" <scarabeus@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-libs/libwmf/files: libwmf-0.2.8.4-gdk-pixbuf.patch libwmf-0.2.8.4-use-system-fonts.patch |
| Date: | Fri, 01 Jul 2011 21:03:59 |
| Message-Id: | 20110701210348.E568920051@flycatcher.gentoo.org |
| 1 | scarabeus 11/07/01 21:03:48 |
| 2 | |
| 3 | Added: libwmf-0.2.8.4-gdk-pixbuf.patch |
| 4 | libwmf-0.2.8.4-use-system-fonts.patch |
| 5 | Log: |
| 6 | Revision bump in order to fix gdk-pixbuf split and use system fonts. Fixes bugs #256087 and #368485. |
| 7 | |
| 8 | (Portage version: 2.2.0_alpha43/cvs/Linux x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: libwmf-0.2.8.4-gdk-pixbuf.patch |
| 17 | =================================================================== |
| 18 | diff -urN libwmf-0.2.8.4.old/configure.ac libwmf-0.2.8.4/configure.ac |
| 19 | --- libwmf-0.2.8.4.old/configure.ac 2011-07-01 22:37:57.000000000 +0200 |
| 20 | +++ libwmf-0.2.8.4/configure.ac 2011-07-01 22:41:38.000000000 +0200 |
| 21 | @@ -744,8 +744,7 @@ |
| 22 | |
| 23 | if test $LIBWMF_BUILDSTYLE != lite; then |
| 24 | PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[ |
| 25 | - GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` |
| 26 | - GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders" |
| 27 | + GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0` |
| 28 | wmf_gdk_pixbuf=yes |
| 29 | ],[ wmf_gdk_pixbuf=no |
| 30 | ]) |
| 31 | diff -urN libwmf-0.2.8.4.old/src/Makefile.am libwmf-0.2.8.4/src/Makefile.am |
| 32 | --- libwmf-0.2.8.4.old/src/Makefile.am 2011-07-01 22:37:57.000000000 +0200 |
| 33 | +++ libwmf-0.2.8.4/src/Makefile.am 2011-07-01 22:40:41.000000000 +0200 |
| 34 | @@ -63,7 +63,7 @@ |
| 35 | -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ |
| 36 | -release $(LT_RELEASE) -export-dynamic |
| 37 | |
| 38 | -loaderdir = $(libdir)/$(GDK_PIXBUF_DIR) |
| 39 | +loaderdir = $(GDK_PIXBUF_DIR) |
| 40 | |
| 41 | loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN) |
| 42 | |
| 43 | |
| 44 | |
| 45 | |
| 46 | 1.1 media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch |
| 47 | |
| 48 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch?rev=1.1&view=markup |
| 49 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch?rev=1.1&content-type=text/plain |
| 50 | |
| 51 | Index: libwmf-0.2.8.4-use-system-fonts.patch |
| 52 | =================================================================== |
| 53 | diff -urN libwmf-0.2.8.4.old/fonts/Makefile.am libwmf-0.2.8.4/fonts/Makefile.am |
| 54 | --- libwmf-0.2.8.4.old/fonts/Makefile.am 2011-07-01 22:37:57.000000000 +0200 |
| 55 | +++ libwmf-0.2.8.4/fonts/Makefile.am 2011-07-01 22:38:37.000000000 +0200 |
| 56 | @@ -1,35 +1,3 @@ |
| 57 | fontdir = @WMF_FONTDIR@ |
| 58 | |
| 59 | bin_SCRIPTS = libwmf-fontmap |
| 60 | - |
| 61 | -FONTS = \ |
| 62 | - n019003l.afm \ |
| 63 | - n019003l.pfb \ |
| 64 | - n019004l.afm \ |
| 65 | - n019004l.pfb \ |
| 66 | - n019023l.afm \ |
| 67 | - n019023l.pfb \ |
| 68 | - n019024l.afm \ |
| 69 | - n019024l.pfb \ |
| 70 | - n021003l.afm \ |
| 71 | - n021003l.pfb \ |
| 72 | - n021004l.afm \ |
| 73 | - n021004l.pfb \ |
| 74 | - n021023l.afm \ |
| 75 | - n021023l.pfb \ |
| 76 | - n021024l.afm \ |
| 77 | - n021024l.pfb \ |
| 78 | - n022003l.afm \ |
| 79 | - n022003l.pfb \ |
| 80 | - n022004l.afm \ |
| 81 | - n022004l.pfb \ |
| 82 | - n022023l.afm \ |
| 83 | - n022023l.pfb \ |
| 84 | - n022024l.afm \ |
| 85 | - n022024l.pfb \ |
| 86 | - s050000l.afm \ |
| 87 | - s050000l.pfb |
| 88 | - |
| 89 | -font_DATA = $(FONTS) fontmap |
| 90 | - |
| 91 | -EXTRA_DIST = libwmf-fontmap.in LICENSE $(FONTS) |