Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-dev:uclibc commit in: media-gfx/fontforge/, media-gfx/fontforge/files/
Date: Tue, 28 May 2013 15:57:09
Message-Id: 1369756612.8f16c724d4571fa1a476fe998f7566fc805a2a83.blueness@gentoo
1 commit: 8f16c724d4571fa1a476fe998f7566fc805a2a83
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 28 15:56:52 2013 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Tue May 28 15:56:52 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=8f16c724
7
8 media-gfx/fontforge: fixed in tree, bug #469954
9
10 Package-Manager: portage-2.1.11.62
11 RepoMan-Options: --force
12 Manifest-Sign-Key: 0xF52D4BBA
13
14 ---
15 .../files/fontforge-20110222-libz.so-linkage.patch | 66 -----------
16 .../files/fontforge-20110222-lxkbui.patch | 13 ---
17 .../fontforge-20110222-remove-useless-extern.patch | 11 --
18 media-gfx/fontforge/fontforge-20110222-r99.ebuild | 126 ---------------------
19 media-gfx/fontforge/metadata.xml | 36 ------
20 5 files changed, 252 deletions(-)
21
22 diff --git a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch b/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
23 deleted file mode 100644
24 index 7e01e8a..0000000
25 --- a/media-gfx/fontforge/files/fontforge-20110222-libz.so-linkage.patch
26 +++ /dev/null
27 @@ -1,66 +0,0 @@
28 -https://bugs.gentoo.org/show_bug.cgi?id=367425
29 -
30 -diff -ruN fontforge-20110222~/fontforge/parsepdf.c fontforge-20110222/fontforge/parsepdf.c
31 ---- fontforge-20110222~/fontforge/parsepdf.c 2011-02-15 05:37:39.000000000 +0200
32 -+++ fontforge-20110222/fontforge/parsepdf.c 2011-05-17 22:19:56.000000000 +0300
33 -@@ -759,7 +759,11 @@
34 - if ( zlib!=NULL )
35 - return( true );
36 -
37 -- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) {
38 -+ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL
39 -+#ifdef SO_1_EXT
40 -+ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
41 -+#endif
42 -+ ) {
43 - LogError( "%s", dlerror());
44 - return( false );
45 - }
46 -diff -ruN fontforge-20110222~/fontforge/svg.c fontforge-20110222/fontforge/svg.c
47 ---- fontforge-20110222~/fontforge/svg.c 2011-02-18 23:33:27.000000000 +0200
48 -+++ fontforge-20110222/fontforge/svg.c 2011-05-17 22:19:56.000000000 +0300
49 -@@ -1153,7 +1153,11 @@
50 - if ( xmltested )
51 - return( libxml!=NULL );
52 -
53 -- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY);
54 -+ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY)
55 -+#ifdef SO_1_EXT
56 -+ || dlopen("libz" SO_1_EXT,RTLD_LAZY)
57 -+#endif
58 -+ ;
59 -
60 - libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
61 - # ifdef SO_2_EXT
62 -diff -ruN fontforge-20110222~/fontforge/ufo.c fontforge-20110222/fontforge/ufo.c
63 ---- fontforge-20110222~/fontforge/ufo.c 2011-02-17 02:20:37.000000000 +0200
64 -+++ fontforge-20110222/fontforge/ufo.c 2011-05-17 22:19:56.000000000 +0300
65 -@@ -929,7 +929,11 @@
66 - if ( xmltested )
67 - return( libxml!=NULL );
68 -
69 -- dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY);
70 -+ dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY)
71 -+#ifdef SO_1_EXT
72 -+ || dlopen("libz" SO_1_EXT,RTLD_LAZY)
73 -+#endif
74 -+ ;
75 -
76 - libxml = dlopen( "libxml2" SO_EXT,RTLD_LAZY);
77 - # ifdef SO_2_EXT
78 -diff -ruN fontforge-20110222~/fontforge/woff.c fontforge-20110222/fontforge/woff.c
79 ---- fontforge-20110222~/fontforge/woff.c 2011-02-15 05:37:40.000000000 +0200
80 -+++ fontforge-20110222/fontforge/woff.c 2011-05-17 22:19:56.000000000 +0300
81 -@@ -76,7 +76,11 @@
82 - if ( zlib!=NULL )
83 - return( true );
84 -
85 -- if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL ) {
86 -+ if ( (zlib = dlopen("libz" SO_EXT,RTLD_GLOBAL|RTLD_LAZY))==NULL
87 -+#ifdef SO_1_EXT
88 -+ && (zlib = dlopen("libz" SO_1_EXT,RTLD_LAZY))==NULL
89 -+#endif
90 -+ ) {
91 - LogError( "%s", dlerror());
92 - return( false );
93 - }
94
95 diff --git a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch b/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
96 deleted file mode 100644
97 index b344bc9..0000000
98 --- a/media-gfx/fontforge/files/fontforge-20110222-lxkbui.patch
99 +++ /dev/null
100 @@ -1,13 +0,0 @@
101 -=== modified file 'configure.in'
102 ---- a/configure.in
103 -+++ b/configure.in
104 -@@ -36,7 +36,7 @@
105 - dnl /usr/share/doc/XFree86-doc-4.2.0/Xi/lib.PS
106 -
107 - AC_CHECK_LIB(Xi, XOpenDevice, X_11LIB="-lXi -lX11" ,AC_DEFINE(_NO_XINPUT), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 )
108 -- AC_CHECK_LIB(xkbui, XkbQueryExtension, X_11LIB="$X_11LIB -lxkbui" ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
109 -+ AC_CHECK_LIB(X11, XkbQueryExtension, ,AC_DEFINE(_NO_XKB), $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11 -lm )
110 - fi
111 -
112 - gww_define_caps_for_alt="dontknow"
113 -
114
115 diff --git a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch b/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
116 deleted file mode 100644
117 index f7e7152..0000000
118 --- a/media-gfx/fontforge/files/fontforge-20110222-remove-useless-extern.patch
119 +++ /dev/null
120 @@ -1,11 +0,0 @@
121 -diff -Naur fontforge-20110222.orig/gutils/gimagereadrgb.c fontforge-20110222/gutils/gimagereadrgb.c
122 ---- fontforge-20110222.orig/gutils/gimagereadrgb.c 2013-05-05 18:03:18.884623199 +0000
123 -+++ fontforge-20110222/gutils/gimagereadrgb.c 2013-05-05 18:03:35.452624126 +0000
124 -@@ -86,7 +86,6 @@
125 -
126 - static void find_scanline(FILE *fp,struct sgiheader *header,int cur,
127 - unsigned long *starttab,unsigned char **ptrtab) {
128 -- extern int fgetc(FILE *);
129 - int (*getthingamy)(FILE *) = header->bpc==1?fgetc:getshort;
130 - int ch,i,cnt,val;
131 - unsigned char *pt;
132
133 diff --git a/media-gfx/fontforge/fontforge-20110222-r99.ebuild b/media-gfx/fontforge/fontforge-20110222-r99.ebuild
134 deleted file mode 100644
135 index 9c89e0c..0000000
136 --- a/media-gfx/fontforge/fontforge-20110222-r99.ebuild
137 +++ /dev/null
138 @@ -1,126 +0,0 @@
139 -# Copyright 1999-2012 Gentoo Foundation
140 -# Distributed under the terms of the GNU General Public License v2
141 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/fontforge/fontforge-20110222-r1.ebuild,v 1.8 2012/09/05 07:52:11 jlec Exp $
142 -
143 -# Some notes for maintainers this package:
144 -# 1. README-unix: freetype headers are required to make use of truetype debugger
145 -# in fontforge.
146 -# 2. --enable-{double,longdouble} these just make ff use more storage space. In
147 -# normal fonts neither is useful. Leave off.
148 -# 3. FontForge autodetects libraries but does not link with them. They are
149 -# dynamically loaded at run time if fontforge found them at build time.
150 -# --with-regular-link disables this behaviour. No reason to make it optional for
151 -# users. http://fontforge.sourceforge.net/faq.html#libraries. To see what
152 -# libraries fontforge thinks with use $ fontforge --library-status
153 -
154 -EAPI=3
155 -
156 -PYTHON_DEPEND="python? 2"
157 -inherit eutils fdo-mime python autotools
158 -
159 -HTDOCSV="20110221"
160 -CIDMAPV="20090121"
161 -DESCRIPTION="postscript font editor and converter"
162 -HOMEPAGE="http://fontforge.sourceforge.net/"
163 -SRC_URI="mirror://sourceforge/fontforge/${PN}_full-${PV}.tar.bz2
164 - doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-${HTDOCSV}.tar.bz2 )
165 - cjk? ( mirror://gentoo/cidmaps-${CIDMAPV}.tgz )" # http://fontforge.sf.net/cidmaps.tgz
166 -
167 -LICENSE="BSD"
168 -SLOT="0"
169 -KEYWORDS="amd64 arm ~mips ppc x86"
170 -IUSE="cjk cairo doc gif debug jpeg nls pasteafter png +python tiff tilepath truetype truetype-debugger pango type3 svg unicode +X"
171 -
172 -RDEPEND="gif? ( >=media-libs/giflib-4.1.0-r1 )
173 - jpeg? ( virtual/jpeg )
174 - png? ( >=media-libs/libpng-1.2.4 )
175 - tiff? ( >=media-libs/tiff-3.5.7-r1 )
176 - truetype? ( >=media-libs/freetype-2.1.4 )
177 - truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] )
178 - svg? ( >=dev-libs/libxml2-2.6.7 )
179 - unicode? ( >=media-libs/libuninameslist-030713 )
180 - cairo? ( >=x11-libs/cairo-1.6.4[X] )
181 - pango? ( >=x11-libs/pango-1.20.3 )
182 - x11-libs/libXi
183 - x11-proto/inputproto
184 - !media-gfx/pfaedit"
185 -DEPEND="${RDEPEND}
186 - nls? ( sys-devel/gettext )"
187 -
188 -pkg_setup() {
189 - if use python; then
190 - python_set_active_version 2
191 - python_pkg_setup
192 - fi
193 -}
194 -
195 -src_unpack() {
196 - unpack ${PN}_full-${PV}.tar.bz2
197 - use cjk && unpack cidmaps-${CIDMAPV}.tgz
198 - if use doc; then
199 - mkdir html
200 - cd html
201 - unpack fontforge_htdocs-${HTDOCSV}.tar.bz2
202 - fi
203 -}
204 -
205 -src_prepare() {
206 - epatch "${FILESDIR}/${P}-lxkbui.patch"
207 - epatch "${FILESDIR}/${P}-libz.so-linkage.patch"
208 - epatch "${FILESDIR}/${P}-remove-useless-extern.patch"
209 - if use doc; then
210 - chmod -x "${WORKDIR}"/html/*.html || die
211 - fi
212 - eautoconf
213 -}
214 -
215 -src_configure() {
216 - # no real way of disabling gettext/nls ...
217 - use nls || export ac_cv_header_libintl_h=no
218 - econf \
219 - --disable-static \
220 - $(use_with truetype-debugger freetype-src "/usr/include/freetype2/internal4fontforge/") \
221 - $(use_enable type3) \
222 - $(use_with python) \
223 - $(use_enable python pyextension) \
224 - $(use_enable pasteafter) \
225 - $(use_with X x) \
226 - $(use_enable cjk gb12345) \
227 - $(use_enable tilepath) \
228 - $(use_enable debug debug-raw-points) \
229 - $(use_with pango) \
230 - $(use_with cairo)
231 -}
232 -
233 -src_install() {
234 - emake install DESTDIR="${D}" || die
235 - dodoc AUTHORS README* || die
236 -
237 - find "${ED}" -name '*.la' -exec rm -f {} +
238 -
239 - if use cjk; then #129518
240 - insinto /usr/share/fontforge
241 - doins "${WORKDIR}"/*.cidmap || die
242 - fi
243 -
244 - doicon Packaging/fontforge.png || die
245 - domenu Packaging/fontforge.desktop || die
246 - insinto /usr/share/mime/application
247 - doins Packaging/fontforge.xml || die
248 -
249 - if use doc; then
250 - insinto /usr/share/doc/${PN}
251 - cd "${WORKDIR}/html/"
252 - doins -r * || die
253 - fi
254 -}
255 -
256 -pkg_postrm() {
257 - fdo-mime_desktop_database_update
258 - fdo-mime_mime_database_update
259 -}
260 -
261 -pkg_postinst() {
262 - fdo-mime_desktop_database_update
263 - fdo-mime_mime_database_update
264 -}
265
266 diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
267 deleted file mode 100644
268 index af748a8..0000000
269 --- a/media-gfx/fontforge/metadata.xml
270 +++ /dev/null
271 @@ -1,36 +0,0 @@
272 -<?xml version="1.0" encoding="UTF-8"?>
273 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
274 -<pkgmetadata>
275 -<herd>fonts</herd>
276 -<longdescription>
277 - FontForge -- An outline font editor that lets you create your own
278 - postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap
279 - (bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one
280 - format to another. FontForge has support for many macintosh font formats.
281 -</longdescription>
282 -<use>
283 -
284 - <flag name="truetype-debugger">Enable truetype debugger in
285 - fontforge</flag>
286 -
287 - <flag name='type3'>Build in support for type3/svg fonts containing
288 - multilayered drawing with strokes, fills, images, etc. Type3 fonts are only
289 - supported by postscript printers (not by most windowing displays). They are
290 - capable of more exotic images than normal fonts but require much more effort
291 - to support.</flag>
292 -
293 - <flag name="pango">Enable pango font rendering</flag>
294 -
295 - <flag name='pasteafter'>Controls whether fontforge has a paste after command
296 - (Useful for making words?). This is kind of fun, but it isn't useful for
297 - normal fonts.</flag>
298 -
299 - <flag name='cjk'>Controls whether fontforge understands the gb12345 encoding
300 - and installs cidmap package to edit CID-keyed fonts</flag>
301 -
302 - <flag name='tilepath'>Controls whether fontforge has a tile path command (a
303 - variant of expand stroke) This is useful for very decorative fonts, most
304 - people won't want it.</flag>
305 -
306 -</use>
307 -</pkgmetadata>
Report Message
Find on MARC Find on Google Groups