From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 06B5B1381F3 for ; Sun, 5 May 2013 18:08:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B70C9E08F6; Sun, 5 May 2013 18:08:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A148E08F6 for ; Sun, 5 May 2013 18:08:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 05B4C33DD47 for ; Sun, 5 May 2013 18:08:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 94A2EE4BB7 for ; Sun, 5 May 2013 18:08:00 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1367777257.5c58105b900fa4aea0a8ace3f3bd14e13352860d.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: media-gfx/fontforge/, media-gfx/fontforge/files/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch media-gfx/fontforge/fontforge-20110222-r99.ebuild media-gfx/fontforge/metadata.xml X-VCS-Directories: media-gfx/fontforge/ media-gfx/fontforge/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 5c58105b900fa4aea0a8ace3f3bd14e13352860d X-VCS-Branch: uclibc Date: Sun, 5 May 2013 18:08:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8c98764e-2957-42a5-8a4d-d96c884db667 X-Archives-Hash: 2320d8b0bfbfdb81e3b660e9e7db2ffa commit: 5c58105b900fa4aea0a8ace3f3bd14e13352860d Author: Anthony G. Basile gentoo org> AuthorDate: Sun May 5 18:07:37 2013 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun May 5 18:07:37 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=5c58105b media-gfx/fontforge: remove useless extern Package-Manager: portage-2.1.11.62 RepoMan-Options: --force Manifest-Sign-Key: 0xF52D4BBA --- .../files/fontforge-20110222-libz.so-linkage.patch | 66 ++++++++++ .../files/fontforge-20110222-lxkbui.patch | 13 ++ .../fontforge-20110222-remove-useless-extern.patch | 11 ++ media-gfx/fontforge/fontforge-20110222-r99.ebuild | 126 ++++++++++++++++++++ media-gfx/fontforge/metadata.xml | 36 ++++++ 5 files changed, 252 insertions(+), 0 deletions(-) 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 0000000..7e01e8a --- /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/files/fontforge-20110222-lxkbui.patch b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch new file mode 100644 index 0000000..b344bc9 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch @@ -0,0 +1,13 @@ +=== modified file 'configure.in' +--- a/configure.in ++++ b/configure.in +@@ -36,7 +36,7 @@ + dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS + + AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 ) +- AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm ) ++ AC_CHECK_LIB(X11, XkbQueryExtension, ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm ) + fi + + gww_define_caps_for_alt="dontknow" + diff --git a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch new file mode 100644 index 0000000..f7e7152 --- /dev/null +++ b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch @@ -0,0 +1,11 @@ +diff -Naur fontforge-20110222.orig/gutils/gimagereadrgb.c fontforge-20110222/gutils/gimagereadrgb.c +--- fontforge-20110222.orig/gutils/gimagereadrgb.c 2013-05-05 18:03:18.884623199 +0000 ++++ fontforge-20110222/gutils/gimagereadrgb.c 2013-05-05 18:03:35.452624126 +0000 +@@ -86,7 +86,6 @@ + + static void find_scanline(FILE *fp,struct sgiheader *header,int cur, + unsigned long *starttab,unsigned char **ptrtab) { +- extern int fgetc(FILE *); + int (*getthingamy)(FILE *) = header->bpc==1?fgetc:getshort; + int ch,i,cnt,val; + unsigned char *pt; diff --git a/media-gfx/fontforge/fontforge-20110222-r99.ebuild b/media-gfx/fontforge/fontforge-20110222-r99.ebuild new file mode 100644 index 0000000..9c89e0c --- /dev/null +++ b/media-gfx/fontforge/fontforge-20110222-r99.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2012 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.8 2012/09/05 07:52:11 jlec 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="amd64 arm ~mips ppc x86" +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" + epatch "${FILESDIR}/${P}-remove-useless-extern.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 + domenu 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 +} diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml new file mode 100644 index 0000000..af748a8 --- /dev/null +++ b/media-gfx/fontforge/metadata.xml @@ -0,0 +1,36 @@ + + + +fonts + + FontForge -- An outline font editor that lets you create your own + postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap + (bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one + format to another. FontForge has support for many macintosh font formats. + + + + Enable truetype debugger in + fontforge + + Build in support for type3/svg fonts containing + multilayered drawing with strokes, fills, images, etc. Type3 fonts are only + supported by postscript printers (not by most windowing displays). They are + capable of more exotic images than normal fonts but require much more effort + to support. + + Enable pango font rendering + + Controls whether fontforge has a paste after command + (Useful for making words?). This is kind of fun, but it isn't useful for + normal fonts. + + Controls whether fontforge understands the gb12345 encoding + and installs cidmap package to edit CID-keyed fonts + + Controls whether fontforge has a tile path command (a + variant of expand stroke) This is useful for very decorative fonts, most + people won't want it. + + +