From: Peter Volkov Date: Sun, 2 Oct 2011 17:43:29 +0000 (+0000) Subject: Fix zlib linkage, bug #367425 thank Siim Ainsaar for the patch. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9fc4933b72b67a3f8d80adfca218669b804f7451;p=gentoo.git Fix zlib linkage, bug #367425 thank Siim Ainsaar for the patch. Package-Manager: portage-2.1.10.20/cvs/Linux x86_64 --- diff --git a/media-gfx/fontforge/ChangeLog b/media-gfx/fontforge/ChangeLog index d7fdbe7663da..e7408ec379a2 100644 --- a/media-gfx/fontforge/ChangeLog +++ b/media-gfx/fontforge/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/fontforge # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.141 2011/09/09 12:14:51 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/ChangeLog,v 1.142 2011/10/02 17:43:29 pva Exp $ + +*fontforge-20110222-r1 (02 Oct 2011) + + 02 Oct 2011; Peter Volkov +fontforge-20110222-r1.ebuild, + +files/fontforge-20110222-libz.so-linkage.patch: + Fix zlib linkage, bug #367425 thank Siim Ainsaar for the patch. 09 Sep 2011; Tomáš Chvátal fontforge-20110222.ebuild: diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index f38038ccba3f..ab5a7f8d60ca 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -1,6 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 +AUX fontforge-20110222-libz.so-linkage.patch 2959 RMD160 f82d5e2ae3be6fa45068286d3e652f7d478b96e9 SHA1 ea90cd7f80db8faf4a2ab053ec0aaf2f7f7c08b6 SHA256 8358e7fa2fd43876cb24f3d1c58765aacc8560ddfd7d3577d65984e2c796128e AUX fontforge-20110222-lxkbui.patch 545 RMD160 5f2138356b8f475a633176e0ecebd778241f0ed8 SHA1 251cea6906610bcc5d5d86e106ee56b8041d28e8 SHA256 192d3606dcf8f925a9cc5f79e7430979d0eb1a0f209a4447682f135f79d33828 AUX fontforge-desktop.patch 662 RMD160 2242c71cbb88941e398fe0bb28798df941b05cd6 SHA1 c170824b25ad698d0ef8d3a59e16312c418c1fd8 SHA256 b2308b21b7db3c1ad0f8e2880678a0866f401e3ce57903e98ed68472f1e187e8 AUX fontforge-py27.diff 387 RMD160 633fbf1f53495d0bb87975f657e00f452d7cae9b SHA1 406b97dbd894a97f1f1a66376a1ab41c7a6081f2 SHA256 18d71c28258a00459621113a0126b525b08cfd0a2dfb406fc90c6bed3d3790ed @@ -10,23 +11,14 @@ DIST fontforge_full-20110222.tar.bz2 5126031 RMD160 7f276e9e3ef673b78355bb7be50f DIST fontforge_htdocs-20100429.tar.bz2 3115782 RMD160 f1dedf39898d12398ffe463c06ebcb5d88fb575b SHA1 eeda060ad5e83392d1a27f6c9c1eac2a9c780c09 SHA256 842a5e675341578aacdd2614ec416719eba51826749d73b2044731335d1a1883 DIST fontforge_htdocs-20110221.tar.bz2 3129839 RMD160 ac92a01aafbb39ccbecff2953f3b6f49c3721f71 SHA1 e966fea60a2f7f022af71669f67e15e258948e0e SHA256 7a81b9a30fa8f287e63abcfee568d7fcfd1a21c75c5c69effe95fe677d963fec EBUILD fontforge-20100501.ebuild 3530 RMD160 3a71105e6270f449767242c92b72803bc55d4489 SHA1 2f8f35fde5cb890e246c2005fa0b8ed712c42258 SHA256 cb9cc8fbe6ee58eaa12ceaf718160faddfe7de7780e24f73f4e6e09c5c24a5e7 +EBUILD fontforge-20110222-r1.ebuild 3779 RMD160 5c6241a1c5834fa373d830d92d100ade004f2322 SHA1 534e4ce82e0fac928cc7b9cbb71e324ef8bc92f3 SHA256 68f9fa6a7a04bd5733fa2cabfa037595df1bbae2e2892c6c8bd0423b78c95105 EBUILD fontforge-20110222.ebuild 3733 RMD160 b276315c701505831e0abf0cd7d58fa95d0ae683 SHA1 56f2450dc93f703a083c1843fe3c1db79d0216f7 SHA256 e26534f1866da52fdaf89e89c8cd81e8b327cc328d673b0c9c7129cf2ab33efd -MISC ChangeLog 20864 RMD160 a160c826b13a0a4b3415daa235d04b59a8548bc4 SHA1 669ddaa79c37b52637e0685a667053e682de9130 SHA256 2605404bd6389b8b634d6780d7569cc5ed92557401e5b66628d8dc9b37b54c60 +MISC ChangeLog 21090 RMD160 639fbc9cc387d14d90299b71570b0abce4de1430 SHA1 ba03ca20d40689bdba71b96fcc9ec9c54af946ec SHA256 95ebf8041f10d81e59697b19c50fff533e0090bfa9c073c3a7aafc6f21819dc7 MISC metadata.xml 1457 RMD160 1d4951de15b18f544ad32bed8b23c86d9c062f99 SHA1 8cdb030e20d35deb3a7491fa2c622b67a4d9e0e7 SHA256 964fda064eb8db8a937daf398f089df1779527e1fe45aee0edede3142ea62604 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJOagNNAAoJEOSiRoyO7jvoHTQP/0opaHcOucVdeJwM3M2fmsCG -WtOFxSqVNYE28u2uAetvQsmeQ4sjBksN5nH8s68eg0O7X/GDanDxu+rFIlm7V8Hs -Y1WjhHCSIKQtYV9xLvXwqFPwnxj4mpku80LNsQ4l6Ool8wpE6yQECj0GsggcdykG -FOUSh8FSZzyahWy2zD3pVQJLaHaj4zJtqhk0ls/MQYtRdL1RuByFyXQfixJdroUb -pO0lkUtMsv8J0FW/XVKOm7+9OLMINXxFz+CGVXv9PxUgdoWNEAD7HkJOsDdQIMfC -5Fj9krqmLajf3QWaWNuC5mtUuASSaRmiDhK1F44oS8JHKYM/mk+NHsv9oFqZ7Tuf -OtK8HO31GnfRBUvfUHSi2Phmp0xcU+UUhgW/6qTBWu79+O4AGtuaM0jAc0YctCUe -BuMRFoYruPt9zqZw4O8W9WDDURJyMjU6F/u/1TburMunXZ09kAxAF8bZRGBcCqtp -6pdEJ1zJ9/KNDfmBObuNb7RFX0IDNihd4MY2sf4enY9r0B4DrmEcFc0Esh5+O1kC -l8LnaXI4ue62SlkhQV5DifS+R9nPw2kdBr0DwlfyWOI+6fwzlmy6N3kJbONvao3D -6JcTFHgrpk6tM4lGy9Pd1ardlYoCMkst8RiabYiZyXL6zOaG020qDkj1AH6VEvH5 -HXBjlYsGr1/TjhsSrzl6 -=COb2 +iF4EAREIAAYFAk6IonMACgkQGrk+8vGYmwf1kQEAq2mp+1ozzjl57FhY9DfE1rEL +OupR1W3AmIQCPxz7vswBAJawXNhdkDyJPYh3yQtjHPzd6hCIR/SWvON9Ry3GHhXC +=5KTa -----END PGP SIGNATURE----- diff --git a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch new file mode 100644 index 000000000000..7e01e8a3a76f --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch @@ -0,0 +1,66 @@ +https://bugs.gentoo.org/show_bug.cgi?id=367425 + +diff -ruN fontforge-20110222~/fontforge/parsepdf.c fontforge-20110222/fontforge/parsepdf.c +--- fontforge-20110222~/fontforge/parsepdf.c 2011-02-15 05:37:39.000000000 +0200 ++++ fontforge-20110222/fontforge/parsepdf.c 2011-05-17 22:19:56.000000000 +0300 +@@ -759,7 +759,11 @@ + if ( zlib!=NULL ) + return( true ); + +- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) { ++ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ++#ifdef SO_1_EXT ++ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL ++#endif ++ ) { + LogError( "%s", dlerror()); + return( false ); + } +diff -ruN fontforge-20110222~/fontforge/svg.c fontforge-20110222/fontforge/svg.c +--- fontforge-20110222~/fontforge/svg.c 2011-02-18 23:33:27.000000000 +0200 ++++ fontforge-20110222/fontforge/svg.c 2011-05-17 22:19:56.000000000 +0300 +@@ -1153,7 +1153,11 @@ + if ( xmltested ) + return( libxml!=NULL ); + +- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY); ++ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY) ++#ifdef SO_1_EXT ++ || dlopen("libz" SO_1_EXT,RTLD_LAZY) ++#endif ++ ; + + libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY); + # ifdef SO_2_EXT +diff -ruN fontforge-20110222~/fontforge/ufo.c fontforge-20110222/fontforge/ufo.c +--- fontforge-20110222~/fontforge/ufo.c 2011-02-17 02:20:37.000000000 +0200 ++++ fontforge-20110222/fontforge/ufo.c 2011-05-17 22:19:56.000000000 +0300 +@@ -929,7 +929,11 @@ + if ( xmltested ) + return( libxml!=NULL ); + +- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY); ++ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY) ++#ifdef SO_1_EXT ++ || dlopen("libz" SO_1_EXT,RTLD_LAZY) ++#endif ++ ; + + libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY); + # ifdef SO_2_EXT +diff -ruN fontforge-20110222~/fontforge/woff.c fontforge-20110222/fontforge/woff.c +--- fontforge-20110222~/fontforge/woff.c 2011-02-15 05:37:40.000000000 +0200 ++++ fontforge-20110222/fontforge/woff.c 2011-05-17 22:19:56.000000000 +0300 +@@ -76,7 +76,11 @@ + if ( zlib!=NULL ) + return( true ); + +- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) { ++ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ++#ifdef SO_1_EXT ++ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL ++#endif ++ ) { + LogError( "%s", dlerror()); + return( false ); + } diff --git a/media-gfx/fontforge/fontforge-20110222-r1.ebuild b/media-gfx/fontforge/fontforge-20110222-r1.ebuild new file mode 100644 index 000000000000..64de1daa5f9b --- /dev/null +++ b/media-gfx/fontforge/fontforge-20110222-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.1 2011/10/02 17:43:29 pva Exp $ + +# Some notes for maintainers this package: +# 1. README-unix: freetype headers are required to make use of truetype debugger +# in fontforge. +# 2. --enable-{double,longdouble} these just make ff use more storage space. In +# normal fonts neither is useful. Leave off. +# 3. FontForge autodetects libraries but does not link with them. They are +# dynamically loaded at run time if fontforge found them at build time. +# --with-regular-link disables this behaviour. No reason to make it optional for +# users. http://fontforge.sourceforge.net/faq.html#libraries. To see what +# libraries fontforge thinks with use $ fontforge --library-status + +EAPI=3 + +PYTHON_DEPEND="python? 2" +inherit eutils fdo-mime python autotools + +HTDOCSV="20110221" +CIDMAPV="20090121" +DESCRIPTION="postscript font editor and converter" +HOMEPAGE="http://fontforge.sourceforge.net/" +SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2 + doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-${HTDOCSV}.tar.bz2 ) + cjk? ( mirror://gentoo/cidmaps-${CIDMAPV}.tgz )" # http://fontforge.sf.net/cidmaps.tgz + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="cjk cairo doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger pango type3 svg unicode +X" + +RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 ) + jpeg? ( virtual/jpeg ) + png? ( >=media-libs/libpng-1.2.4 ) + tiff? ( >=media-libs/tiff-3.5.7-r1 ) + truetype? ( >=media-libs/freetype-2.1.4 ) + truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] ) + svg? ( >=dev-libs/libxml2-2.6.7 ) + unicode? ( >=media-libs/libuninameslist-030713 ) + cairo? ( >=x11-libs/cairo-1.6.4[X] ) + pango? ( >=x11-libs/pango-1.20.3 ) + x11-libs/libXi + x11-proto/inputproto + !media-gfx/pfaedit" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext )" + +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + +src_unpack() { + unpack ${PN}_full-${PV}.tar.bz2 + use cjk && unpack cidmaps-${CIDMAPV}.tgz + if use doc; then + mkdir html + cd html + unpack fontforge_htdocs-${HTDOCSV}.tar.bz2 + fi +} + +src_prepare() { + epatch "${FILESDIR}/${P}-lxkbui.patch" + epatch "${FILESDIR}/${P}-libz.so-linkage.patch" + if use doc; then + chmod -x "${WORKDIR}"/html/*.html || die + fi + eautoconf +} + +src_configure() { + # no real way of disabling gettext/nls ... + use nls || export ac_cv_header_libintl_h=no + econf \ + --disable-static \ + $(use_with truetype-debugger freetype-src "/usr/include/freetype2/internal4fontforge/") \ + $(use_enable type3) \ + $(use_with python) \ + $(use_enable python pyextension) \ + $(use_enable pasteafter) \ + $(use_with X x) \ + $(use_enable cjk gb12345) \ + $(use_enable tilepath) \ + $(use_enable debug debug-raw-points) \ + $(use_with pango) \ + $(use_with cairo) +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc AUTHORS README* || die + + find "${ED}" -name '*.la' -exec rm -f {} + + + if use cjk; then #129518 + insinto /usr/share/fontforge + doins "${WORKDIR}"/*.cidmap || die + fi + + doicon Packaging/fontforge.png || die + insinto /usr/share/applications + doins Packaging/fontforge.desktop || die + insinto /usr/share/mime/application + doins Packaging/fontforge.xml || die + + if use doc; then + insinto /usr/share/doc/${PN} + cd "${WORKDIR}/html/" + doins -r * || die + fi +} + +pkg_postrm() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update +}