From: Daniel J. <dan...@us...> - 2010-04-30 23:42:21
|
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv27052 Modified Files: fontforge.patch Added Files: fontforge.info Removed Files: fontforge-10.4.info fontforge-10.5.info fontforge-10.6.info Log Message: New upstream version. Depend on python26 and consolidate info files. --- NEW FILE: fontforge.info --- Info2: << Package: fontforge Version: 20100429 Revision: 1 Type: python (2.6) License: BSD Description: Outline font editor DescDetail: << An outline font editor that lets you create your own postscript, truetype, opentype, cid-keyed, multi-master, cff, svg, bitmap (bdf) and woff fonts, or edit existing ones. Also lets you convert one format to another. FontForge has support for many Macintosh font formats. This program was formerly called PfaEdit. << DescUsage: << Will use autotrace or potrace to trace bitmaps if available. << DescPort: << Makefile ignores CPPFLAGS and LDFLAGS so we use CFLAGS instead. Had to remove setting of DYLD_LIBRARY_PATH in start.c. Caused ImageIO problems. Yuck. Enabled python scripting. Uses fink's python%type_pkg[python]. Patched Makefile.in's to remove useless -I and reorder flags. Reenabled building shared libs; put them into %p/lib/%n. Now installs a .app wrapper bundle at %p/Applications/FontForge.app Install desktop and mime files for KDE and Gnome. << Homepage: http://fontforge.sourceforge.net/ Maintainer: Daniel Johnson <da...@da...> Source: mirror:sourceforge:%n/%n_full-%v.tar.bz2 Source-MD5: aa243b214e55423a3959c34205004c59 SourceDirectory: %n-%v Source2: mirror:sourceforge:%n/%n_htdocs-%v.tar.bz2 Source2-MD5: 7ff67bcb694b673dbe0b8ca3dfd4675e Source2ExtractDir: %n-%v/htdocs Source3: http://fontforge.sourceforge.net/cidmaps.tgz Source3-MD5: 063691163e592515b31514515bb3ce8c Source3Rename: cidmaps-20081215.tgz Source3ExtractDir: %n-%v/cidmap Depends: << cairo-shlibs (>= 1.8.8-5), desktop-file-utils, expat1-shlibs, fontconfig2-shlibs (>= 2.8.0-4), freetype219-shlibs (>= 2.3.12-1), giflib-shlibs, glib2-shlibs (>= 2.22.4-2), glitz-shlibs, libgettext8-shlibs, libiconv, libjpeg8-shlibs, libpng14-shlibs, libspiro0-shlibs, libtiff-shlibs, libuninameslist1-shlibs, libxml2-shlibs, pango1-xft2-ft219-shlibs (>= 1.24.5-7), pixman-shlibs (>= 0.16.6-1), python%type_pkg[python], shared-mime-info, x11 << BuildDepends: << cairo (>= 1.8.8-5), expat1, fink (>= 0.28.0), fontconfig2-dev (>= 2.8.0-4), freetype219 (>= 2.3.12-1), gettext-tools, giflib, glib2-dev (>= 2.22.4-2), glitz, libgettext8-dev, libiconv-dev, libjpeg8, libpng14, libspiro0, libtiff, libuninameslist1, libxml2, pango1-xft2-ft219-dev (>= 1.24.5-7), pkgconfig (>= 0.23-1), pixman (>= 0.16.6-1), x11-dev << Recommends: autotrace-bin | potrace Conflicts: pfaedit Replaces: pfaedit DocFiles: AUTHORS INSTALL LICENSE README-Mac.html README-Unix.html VERSION PatchFile: %n.patch PatchFile-MD5: ec93da3205b30a47f4c991634ec917fe PatchScript: << %{default_script} #Use fink's python to build the python extension. perl -pi -e 's,python setup.py,%p/bin/python%type_raw[python] setup.py,g' Makefile.dynamic.in #Make extension look for private libs in %p/lib/%n perl -pi -e 's,/lib/,/lib/%n/,g' pyhook/loadfontforge.h #Fix path to fontforge.png in fontforge.desktop perl -pi -e 's,fontforge.png,%p/share/fontforge/fontforge.png,' Packaging/fontforge.desktop #/usr/include/libxml2 -- Do Not Want. perl -pi -e 's|/usr/include/libxml2|%p/include/libxml2|g' configure << NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 NoSetCPPFLAGS: True NoSetLDFLAGS: True SetCFLAGS: -Os -I%p/include/libxml2 -I%p/lib/fontconfig2/include -I%p/include SetCPPFLAGS: -I%p/lib/fontconfig2/include SetLIBRARY_PATH: %p/lib/fontconfig2/lib:%p/lib:/usr/X11R6/lib SetLDFLAGS: -L%p/lib/fontconfig2/lib -L%p/lib/python%type_raw[python]/config -L%p/lib -L/usr/X11R6/lib ConfigureParams: << --mandir='${prefix}/share/man'\ --libdir='${prefix}/lib/%n'\ --with-x\ --with-regular-link\ --with-python=%p/bin/python%type_raw[python]\ --with-python-lib=-lpython%type_raw[python]\ --enable-shared=yes\ --enable-static=no\ --enable-libff\ --enable-pyextension\ --enable-type3\ --enable-double\ --enable-pasteafter\ --enable-tilepath\ --without-freetype-src << CompileScript: << #!/bin/bash -ev export CPATH="%p/include" export F77=no # This bit enables stripping unused libs on 10.5 and later. let version=`uname -r | cut -f 1 -d .` if [ $version -ge 9 ]; then export LDFLAGS="$LDFLAGS -Wl,-dead_strip_dylibs" fi ./configure %c make << InstallScript: << make install DESTDIR=%d /bin/rm -rf %i/include /bin/ln -s %p/bin/fontforge fontforge/FontForge.app/Contents/MacOS/FontForge /bin/mkdir -p %i/share/applications /bin/mkdir -p %i/share/fontforge /bin/mkdir -p %i/share/mime/packages /bin/cp Packaging/fontforge.desktop %i/share/applications /bin/cp Packaging/fontforge.png %i/share/fontforge /bin/cp Packaging/fontforge.xml %i/share/mime/packages << PostInstScript: << . %p/bin/init.sh [ -x %p/bin/update-mime-database ] && update-mime-database %p/share/mime > /dev/null 2>&1 || : [ -x %p/bin/update-desktop-database ] && update-desktop-database -q %p/share/applications || : << PostRmScript: << . %p/bin/init.sh [ -x %p/bin/update-mime-database ] && update-mime-database %p/share/mime > /dev/null 2>&1 || : [ -x %p/bin/update-desktop-database ] && update-desktop-database -q %p/share/applications || : << AppBundles: fontforge/FontForge.app Shlibs: << !%p/lib/%n/libfontforge.1.dylib !%p/lib/%n/libgdraw.4.dylib !%p/lib/%n/libgunicode.3.dylib !%p/lib/%n/libgutils.1.dylib !%p/lib/%n/libgioftp.1.dylib << << --- fontforge-10.4.info DELETED --- --- fontforge-10.6.info DELETED --- --- fontforge-10.5.info DELETED --- Index: fontforge.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/fontforge.patch,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- fontforge.patch 5 Feb 2010 21:21:10 -0000 1.24 +++ fontforge.patch 30 Apr 2010 23:42:11 -0000 1.25 @@ -1,6 +1,6 @@ -diff -ru fontforge-20090923.orig/Makefile.dynamic.in fontforge-20090923/Makefile.dynamic.in ---- fontforge-20090923.orig/Makefile.dynamic.in 2008-11-14 00:31:07.000000000 -0500 -+++ fontforge-20090923/Makefile.dynamic.in 2010-02-05 14:30:18.000000000 -0500 +diff -ru fontforge-20100429.orig/Makefile.dynamic.in fontforge-20100429/Makefile.dynamic.in +--- fontforge-20100429.orig/Makefile.dynamic.in 2010-02-04 20:16:29.000000000 -0500 ++++ fontforge-20100429/Makefile.dynamic.in 2010-04-30 17:12:12.000000000 -0400 @@ -127,8 +127,8 @@ # You may need to be root to do the install #explicit use of sh to make sure we don't invoke csh with different "if" syntax @@ -12,9 +12,9 @@ #we don't always create a setup.py -(cd pyhook ; if test -r setup.py ; then python setup.py install --prefix=$(prefix) --root=$(DESTDIR); for dir in * ; do if test -d $$dir -a "$$dir" != "CVS" ; then rm -rf $$dir ; fi; done ; fi ) -diff -ru fontforge-20090923.orig/Packaging/fontforge.desktop fontforge-20090923/Packaging/fontforge.desktop ---- fontforge-20090923.orig/Packaging/fontforge.desktop 2008-12-14 11:37:59.000000000 -0500 -+++ fontforge-20090923/Packaging/fontforge.desktop 2010-02-05 14:30:18.000000000 -0500 +diff -ru fontforge-20100429.orig/Packaging/fontforge.desktop fontforge-20100429/Packaging/fontforge.desktop +--- fontforge-20100429.orig/Packaging/fontforge.desktop 2008-12-03 16:24:28.000000000 -0500 ++++ fontforge-20100429/Packaging/fontforge.desktop 2010-04-30 17:12:12.000000000 -0400 @@ -11,6 +11,5 @@ Icon=fontforge.png Terminal=false @@ -23,9 +23,9 @@ -Encoding=UTF-8 +Categories=Graphics; MimeType=application/vnd.font-fontforge-sfd;application/x-font-ttf;application/x-font-otf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-tex; -diff -ru fontforge-20090923.orig/Unicode/Makefile.dynamic.in fontforge-20090923/Unicode/Makefile.dynamic.in ---- fontforge-20090923.orig/Unicode/Makefile.dynamic.in 2009-07-01 18:37:16.000000000 -0400 -+++ fontforge-20090923/Unicode/Makefile.dynamic.in 2010-02-05 14:30:18.000000000 -0500 +diff -ru fontforge-20100429.orig/Unicode/Makefile.dynamic.in fontforge-20100429/Unicode/Makefile.dynamic.in +--- fontforge-20100429.orig/Unicode/Makefile.dynamic.in 2010-04-14 16:49:48.000000000 -0400 ++++ fontforge-20100429/Unicode/Makefile.dynamic.in 2010-04-30 17:12:12.000000000 -0400 @@ -18,8 +18,8 @@ cjk.lo memory.lo ucharmap.lo unialt.lo ustring.lo utype.lo \ usprintf.lo gwwiconv.lo @@ -37,10 +37,10 @@ ../libgunicode.la: $(libgunicode_OBJECTS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -no-undefined @LDFLAGS@ -o ../libgunicode.la $(libgunicode_OBJECTS) \ -diff -ru fontforge-20090923.orig/configure fontforge-20090923/configure ---- fontforge-20090923.orig/configure 2009-09-23 19:55:22.000000000 -0400 -+++ fontforge-20090923/configure 2010-02-05 15:09:31.000000000 -0500 -@@ -4605,7 +4605,7 @@ +diff -ru fontforge-20100429.orig/configure fontforge-20100429/configure +--- fontforge-20100429.orig/configure 2010-04-29 14:29:04.000000000 -0400 ++++ fontforge-20100429/configure 2010-04-30 17:12:12.000000000 -0400 +@@ -4633,7 +4633,7 @@ oldCPPFLAGS="$CPPFLAGS" gww_extraincludes="" oldLDFLAGS="$LDFLAGS" @@ -49,19 +49,10 @@ case "$host" in *-apple-darwin*) -@@ -22843,7 +22843,7 @@ - LDFLAGS="$LDFLAGS $gww_archlist" - fi - --CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-O2// | sed -e s/-O//` -+CFLAGS_NOOPT=`echo $CFLAGS | sed -e s/-Os// | sed -e s/-O//` - - cp $ac_confdir/Makefile.dynamic.in $ac_confdir/Makefile.in - cp $ac_confdir/Unicode/Makefile.dynamic.in $ac_confdir/Unicode/Makefile.in -diff -ru fontforge-20090923.orig/fontforge/Makefile.dynamic.in fontforge-20090923/fontforge/Makefile.dynamic.in ---- fontforge-20090923.orig/fontforge/Makefile.dynamic.in 2009-09-23 18:16:48.000000000 -0400 -+++ fontforge-20090923/fontforge/Makefile.dynamic.in 2010-02-05 14:33:07.000000000 -0500 -@@ -66,12 +66,12 @@ +diff -ru fontforge-20100429.orig/fontforge/Makefile.dynamic.in fontforge-20100429/fontforge/Makefile.dynamic.in +--- fontforge-20100429.orig/fontforge/Makefile.dynamic.in 2010-02-01 23:30:20.000000000 -0500 ++++ fontforge-20100429/fontforge/Makefile.dynamic.in 2010-04-30 17:12:12.000000000 -0400 +@@ -67,12 +67,12 @@ #I used to include -L/usr/lib explicitly after static_libs. Not sure why. Should be implied & breaks 64bit compiles LDFLAGS = $(X_LIBS) @LDFLAGS@ @@ -80,9 +71,9 @@ all: @FINAL_TARGET@ @MACAPP@ sfddiff fontimage fontlint -diff -ru fontforge-20090923.orig/fontforge/start.c fontforge-20090923/fontforge/start.c ---- fontforge-20090923.orig/fontforge/start.c 2009-02-22 12:26:03.000000000 -0500 -+++ fontforge-20090923/fontforge/start.c 2010-02-05 14:30:18.000000000 -0500 +diff -ru fontforge-20100429.orig/fontforge/start.c fontforge-20100429/fontforge/start.c +--- fontforge-20100429.orig/fontforge/start.c 2010-02-04 10:33:53.000000000 -0500 ++++ fontforge-20100429/fontforge/start.c 2010-04-30 17:12:12.000000000 -0400 @@ -125,7 +125,6 @@ /* install image libs. For some reason fink installs in a place */ /* the dynamic loader doesn't find */ @@ -91,9 +82,9 @@ #endif } -diff -ru fontforge-20090923.orig/gdraw/Makefile.dynamic.in fontforge-20090923/gdraw/Makefile.dynamic.in ---- fontforge-20090923.orig/gdraw/Makefile.dynamic.in 2009-09-07 21:21:46.000000000 -0400 -+++ fontforge-20090923/gdraw/Makefile.dynamic.in 2010-02-05 14:35:24.000000000 -0500 +diff -ru fontforge-20100429.orig/gdraw/Makefile.dynamic.in fontforge-20100429/gdraw/Makefile.dynamic.in +--- fontforge-20100429.orig/gdraw/Makefile.dynamic.in 2010-04-15 11:54:05.000000000 -0400 ++++ fontforge-20100429/gdraw/Makefile.dynamic.in 2010-04-30 17:12:12.000000000 -0400 @@ -34,12 +34,12 @@ gtextfield.lo gtextinfo.lo gwidgets.lo gxdraw.lo gxcdraw.lo \ ghvbox.lo gmatrixedit.lo gdrawable.lo gspacer.lo xkeysyms_unicode.lo @@ -110,9 +101,9 @@ $(STATIC_LIBS) $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) \ -rpath $(libdir) -version-info $(GD_VERSION):$(GD_REVISION):$(GD_AGE) -diff -ru fontforge-20090923.orig/gutils/Makefile.dynamic.in fontforge-20090923/gutils/Makefile.dynamic.in ---- fontforge-20090923.orig/gutils/Makefile.dynamic.in 2009-09-07 21:22:05.000000000 -0400 -+++ fontforge-20090923/gutils/Makefile.dynamic.in 2010-02-05 14:30:18.000000000 -0500 +diff -ru fontforge-20100429.orig/gutils/Makefile.dynamic.in fontforge-20100429/gutils/Makefile.dynamic.in +--- fontforge-20100429.orig/gutils/Makefile.dynamic.in 2009-09-07 21:50:16.000000000 -0400 ++++ fontforge-20100429/gutils/Makefile.dynamic.in 2010-04-30 17:12:12.000000000 -0400 @@ -30,21 +30,19 @@ gio.lo giofile.lo giohosts.lo giomime.lo giothread.lo giotrans.lo libgioftp_OBJECTS = gioftp.lo @@ -139,3 +130,116 @@ -rpath $(libdir) -version-info $(GFTP_VERSION):$(GFTP_REVISION):$(GFTP_AGE) %.lo: %.c +diff -ru fontforge-20100429.orig/po/el.po fontforge-20100429/po/el.po +--- fontforge-20100429.orig/po/el.po 2010-04-29 16:09:33.000000000 -0400 ++++ fontforge-20100429/po/el.po 2010-04-30 17:12:51.000000000 -0400 +@@ -16551,10 +16551,6 @@ + msgid "Saving SVG font" + msgstr "" + +-#: savefontdlg.c:1902 +-msgid "Saving PostScript Font" +-msgstr "" +- + #: savefontdlg.c:1954 + msgid "Ofm Save Failed" + msgstr "" +diff -ru fontforge-20100429.orig/po/fr.po fontforge-20100429/po/fr.po +--- fontforge-20100429.orig/po/fr.po 2010-04-29 16:09:36.000000000 -0400 ++++ fontforge-20100429/po/fr.po 2010-04-30 17:17:24.000000000 -0400 +@@ -21750,10 +21750,6 @@ + msgid "Saving Unified Font Object" + msgstr "Enregistrement Objet Fonte Unifié" + +-#: savefontdlg.c:1909 +-msgid "Saving PostScript Font" +-msgstr "Enregistrement fonte PostScript" +- + #: savefontdlg.c:1960 + msgid "Ofm Save Failed" + msgstr "Ãchec enregistrement de l'OFM" +diff -ru fontforge-20100429.orig/po/ja.po fontforge-20100429/po/ja.po +--- fontforge-20100429.orig/po/ja.po 2010-04-29 16:09:37.000000000 -0400 ++++ fontforge-20100429/po/ja.po 2010-04-30 17:22:01.000000000 -0400 +@@ -9486,9 +9486,6 @@ + msgid "Saving SVG font" + msgstr "SVGãã©ã³ããä¿åä¸" + +-msgid "Saving PostScript Font" +-msgstr "PostScriptãã©ã³ããä¿åä¸" +- + msgid "Load bitmap fonts?" + msgstr "ãããããããã©ã³ãããã¼ããã¾ãã?" + +diff -ru fontforge-20100429.orig/po/ru.po fontforge-20100429/po/ru.po +--- fontforge-20100429.orig/po/ru.po 2010-04-29 16:09:39.000000000 -0400 ++++ fontforge-20100429/po/ru.po 2010-04-30 17:27:09.000000000 -0400 +@@ -26754,10 +26754,6 @@ + msgid "Saving Unified Font Object" + msgstr "Ð¡Ð¾Ñ Ñанение Ñайла Unified Font Object" + +-#: savefont.c:805 +-msgid "Saving PostScript Font" +-msgstr "Ð¡Ð¾Ñ Ñанение ÑÑиÑÑа PostScript" +- + #: savefont.c:814 + msgid "Mac Resource Not Remote" + msgstr "" +diff -ru fontforge-20100429.orig/po/uk.po fontforge-20100429/po/uk.po +--- fontforge-20100429.orig/po/uk.po 2010-04-29 16:09:40.000000000 -0400 ++++ fontforge-20100429/po/uk.po 2010-04-30 17:27:38.000000000 -0400 +@@ -26622,11 +26622,6 @@ + msgid "Saving Unified Font Object" + msgstr "ÐбеÑÐµÐ¶ÐµÐ½Ð½Ñ SFD (Spline Font Database)" + +-#: savefont.c:805 +-#, fuzzy +-msgid "Saving PostScript Font" +-msgstr "ÐбеÑÐµÐ¶ÐµÐ½Ð½Ñ ÑÑиÑÑÑ PostScript" +- + #: savefont.c:814 + msgid "Mac Resource Not Remote" + msgstr "" +diff -ru fontforge-20100429.orig/po/vi.po fontforge-20100429/po/vi.po +--- fontforge-20100429.orig/po/vi.po 2010-04-29 16:09:41.000000000 -0400 ++++ fontforge-20100429/po/vi.po 2010-04-30 17:28:03.000000000 -0400 +@@ -27426,10 +27426,6 @@ + msgid "Saving Unified Font Object" + msgstr "Äang lÆ°u Äá»i Tượng Phông Thá»ng Nhất" + +-#: savefont.c:804 +-msgid "Saving PostScript Font" +-msgstr "Äang lÆ°u phông PostScript" +- + #: savefont.c:813 + msgid "Mac Resource Not Remote" + msgstr "Tà i nguyên Mac không phải từ xa" +diff -ru fontforge-20100429.orig/po/zh_CN.po fontforge-20100429/po/zh_CN.po +--- fontforge-20100429.orig/po/zh_CN.po 2010-04-29 16:09:42.000000000 -0400 ++++ fontforge-20100429/po/zh_CN.po 2010-04-30 17:28:25.000000000 -0400 +@@ -26660,11 +26660,6 @@ + msgid "Saving Unified Font Object" + msgstr "ä¿åä¸è´åä½å¯¹è±¡" + +-# +-#: savefont.c:805 +-msgid "Saving PostScript Font" +-msgstr "ä¿åPostScriptåä½" +- + #: savefont.c:814 + msgid "Mac Resource Not Remote" + msgstr "" +diff -ru fontforge-20100429.orig/po/zh_TW.po fontforge-20100429/po/zh_TW.po +--- fontforge-20100429.orig/po/zh_TW.po 2010-04-29 16:09:42.000000000 -0400 ++++ fontforge-20100429/po/zh_TW.po 2010-04-30 17:28:45.000000000 -0400 +@@ -19408,10 +19408,6 @@ + msgid "Saving Unified Font Object" + msgstr "å²åæ²ç·ååè³æ庫" + +-#: savefontdlg.c:1908 +-msgid "Saving PostScript Font" +-msgstr "å²å PostScript åå" +- + #: savefontdlg.c:1963 + msgid "Ofm Save Failed" + msgstr "Ofm å²å失æ" |