Revision bump in order to fix gdk-pixbuf split and use system fonts. Fixes bugs #256087 and #368485.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 164 insertions, 5 deletions

diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog
index 85492899473e..999cafd7123f 100644
--- a/media-libs/libwmf/ChangeLog
+++ b/media-libs/libwmf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libwmf
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.70 2011/05/23 17:18:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.71 2011/07/01 21:03:48 scarabeus Exp $
+
+*libwmf-0.2.8.4-r4 (01 Jul 2011)
+
+  01 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +libwmf-0.2.8.4-r4.ebuild, +files/libwmf-0.2.8.4-gdk-pixbuf.patch,
+  +files/libwmf-0.2.8.4-use-system-fonts.patch:
+  Revision bump in order to fix gdk-pixbuf split and use system fonts. Fixes
+  bugs #256087 and #368485.
 
   23 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libwmf-0.2.8.4-r3.ebuild, +files/libwmf-0.2.8.4-libpng-1.5.patch:
diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index 6722b19921cf..9cefd7455ad9 100644
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA1
 
 AUX libwmf-0.2.8.4-build.patch 1340 RMD160 d0ee933b7bd3d3b299859c8c36e542298049343b SHA1 81e1f460c426c3db37606ec3cc8da66b52c11fa3 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb
+AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 RMD160 a26cd1d8b59d17347e2c0b7cc49fac6b85206aa7 SHA1 5430f72c608c983ba3946ba7171bf3a6a5119a87 SHA256 fcfbc4ae5bc086c934fbe785ca21dacad90ef58e56aa52a58f3d29931b21c839
 AUX libwmf-0.2.8.4-intoverflow.patch 971 RMD160 4b5c414021a2b663032aa90e9f40f05e1389b503 SHA1 6f130ea9f639ccf88fef0fda74cf9fa3956f81b5 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690
 AUX libwmf-0.2.8.4-libpng-1.5.patch 478 RMD160 402a268f8b94218b19c131846a4d571dcd22b3fa SHA1 42aa4c2a82e4e14044c875a7f439baea732a355a SHA256 ffad4b3657725028bf3250f3555275373b800eacd6b6be5512ef3e5f76563181
 AUX libwmf-0.2.8.4-pngfix.patch 582 RMD160 1a723c2e0d1dd16b6788f0ead2277e8996ab8ea1 SHA1 f392fd1a1053b84336bfb72e27aebbb78826239a SHA256 39a47d2d12720cc98ee4669e44c012e855df5de0dcec0636f1fb12918c2d8006
+AUX libwmf-0.2.8.4-use-system-fonts.patch 840 RMD160 28ff35be124c3070836e5d4e93772892b395931e SHA1 3936dda44d1d09e272346d9ae8d2fd9b90fe775e SHA256 b99aea69f5c83ccecaca0f74c7d5bbdac2bb7c6c7991bf30d8c64616edddc469
 DIST libwmf-0.2.8.4.tar.gz 2169375 RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
 EBUILD libwmf-0.2.8.4-r3.ebuild 2726 RMD160 ad8ef0107be4257d80ea3ab439bd4a1d8d73f42a SHA1 086381cc2f53e3a221897b90d3d2fdacc6e47529 SHA256 e9701604e1774d87560ace7a9f30885f51c061ca878f368da49f35baad46b572
-MISC ChangeLog 10051 RMD160 ce06cbf6439728deef60b9f917899e2b2e71afe1 SHA1 36202f178eb89061eba007ff9cf102d1d3a8abc3 SHA256 591331e41e5407c989fa292e66d04f7f4eb74757e7208b41b34ac5091658dbad
+EBUILD libwmf-0.2.8.4-r4.ebuild 2363 RMD160 ef4432ca4d4de8314248a1a74a496742f0d6d61e SHA1 36e84528c9184caecc1bfad71aec98fc7982c8ac SHA256 d72e89224ff5b990b7bb87ce60f64501827fa51cfc82165f2925956bdfc1dfe8
+MISC ChangeLog 10363 RMD160 45a7ee8dccd82ee1213e29e929dbc02cc463eef0 SHA1 8512ddae77b210c954490558c7d9cf784e6bbb26 SHA256 9c358258237cfa295cc02115c5c4e94ef35c8d0aae4b8562a12db1993b3f6da9
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3altQACgkQHB6c3gNBRYfgVwCfUGo5y9wtL4Vpt9n1cPZOyGDd
-Ty8AoJwlUGyHaRAunGaecBENYdz7N0qV
-=rJxI
+iEYEARECAAYFAk4ONikACgkQHB6c3gNBRYd0/QCgoz8x4WFmUMepMrToC/CpGVVa
+ejcAoM54Xn5fsfP1usGFVavL2qpTYP3e
+=ru5t
 -----END PGP SIGNATURE-----
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)
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild
new file mode 100644
index 000000000000..9b426a0872dc
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4-r4.ebuild,v 1.1 2011/07/01 21:03:48 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+#The configure script finds the 5.50 ghostscript Fontmap file while run.
+#This will probably work, especially since the real one (6.50) in this case
+#is empty. However beware in case there is any trouble
+
+DESCRIPTION="library for converting WMF files"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="X debug doc expat xml"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-fonts/urw-fonts
+	>=media-libs/freetype-2.0.1
+	>=media-libs/libpng-1.4
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2[X?]
+	virtual/jpeg
+	expat? ( dev-libs/expat )
+	xml? (  dev-libs/libxml2 )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-libs/libXpm
+	)"
+# plotutils are not really supported yet, so looks like that's it
+
+REQUIRED_USE="xml? ( !expat ) expat? ( !xml )"
+
+DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
+
+src_prepare() {
+	if ! use doc ; then
+		sed -e 's:doc::' -i Makefile.am || die
+	fi
+	epatch \
+		"${FILESDIR}"/${P}-intoverflow.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-pngfix.patch \
+		"${FILESDIR}"/${P}-libpng-1.5.patch \
+		"${FILESDIR}"/${P}-use-system-fonts.patch \
+		"${FILESDIR}"/${P}-gdk-pixbuf.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
+	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
+	# we're explicitly disabling gd use w.r.t. bug 268161
+	econf \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_with X x) \
+		$(use_with expat) \
+		$(use_with xml libxml2) \
+		--disable-gd \
+		--with-sys-gd \
+		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts \
+		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/ \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	MAKEOPTS+=" -j1" default
+	find "${ED}" -name '*.la' -exec rm -f '{}' +
+}
\ No newline at end of file