Date: Tue, 11 Jun 2019 22:30:14 +0000 (UTC) From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r503997 - in head/print/fontforge: . files Message-ID: <201906112230.x5BMUEsL071247@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rodrigo Date: Tue Jun 11 22:30:14 2019 New Revision: 503997 URL: https://svnweb.freebsd.org/changeset/ports/503997 Log: Update print/fontforge to 20190413 * Rework FREETYPE option using print/freetype2 to get freetype files instead of fetching distfile directly, removing the need of chasing the port's version. * Shift some things around in Makefile to appease portlint * Regenerate patches and remove patch-fontforge_splinefont.h Changelog: https://github.com/fontforge/fontforge/releases/tag/20190317 https://github.com/fontforge/fontforge/releases/tag/20190413 PR: 237855 Submitted by: kunda <chitty_cloud@me.com> Approved by: <cyberbotx@cyberbotx.com> (maintainer) Modified: head/print/fontforge/Makefile head/print/fontforge/distinfo head/print/fontforge/files/patch-Makefile.am head/print/fontforge/files/patch-fontforge_cvexport.c head/print/fontforge/files/patch-fontforge_print.c head/print/fontforge/pkg-plist Modified: head/print/fontforge/Makefile ============================================================================== --- head/print/fontforge/Makefile Tue Jun 11 22:30:00 2019 (r503996) +++ head/print/fontforge/Makefile Tue Jun 11 22:30:14 2019 (r503997) @@ -2,10 +2,8 @@ # $FreeBSD$ PORTNAME= fontforge -PORTVERSION= 20170731 -PORTREVISION= 1 +PORTVERSION= 20190413 CATEGORIES= print -DISTFILES= # Empty but needed because of the freetype distfile MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Type 1/TrueType/OpenType/bitmap font editor @@ -24,15 +22,15 @@ LIB_DEPENDS= libuninameslist.so:textproc/libuninamesli libltdl.so:devel/libltdl \ libfontconfig.so:x11-fonts/fontconfig +USES= autoreconf:build compiler desktop-file-utils gettext \ + gmake gnome iconv jpeg libtool pkgconfig python \ + readline:port shared-mime-info shebangfix USE_GITHUB= yes +USE_XORG= ice sm x11 xi xkbui xft +USE_GNOME= cairo glib20 gtk20 libxml2 pango -USES= autoreconf:build compiler desktop-file-utils gettext \ - gmake iconv jpeg libtool pkgconfig python readline:port \ - shared-mime-info shebangfix SHEBANG_FILES= pycontrib/gdraw/__init__.py \ pycontrib/gdraw/gdraw.py -USE_XORG= ice sm x11 xi xkbui xft -USE_GNOME= cairo glib20 gtk20 libxml2 pango CONFIGURE_ARGS= --enable-tile-path --enable-gtk2-use CPPFLAGS+= -I${LOCALBASE}/include @@ -49,26 +47,15 @@ OPTIONS_DEFINE= DOCS FREETYPE CAIRO PYTHON OPTIONS_SUB= yes FREETYPE_DESC= Include freetype's internal debugger -PYTHON_CONFIGURE_ENABLE= python-scripting python-extension +FREETYPE_PATCH_DEPENDS= ${NONEXISTENT}:print/freetype2:extract +FREETYPE_CONFIGURE_ENABLE= freetype-debugger=${WRKSRC}/freetype CAIRO_CONFIGURE_WITH= cairo -.include <bsd.port.options.mk> +PYTHON_CONFIGURE_ENABLE= python-scripting python-extension -.if ${PORT_OPTIONS:MFREETYPE} -MASTER_SITES+= http://savannah.nongnu.org/download/freetype/:freetype \ - SF/freetype/freetype2/${FREETYPE_VERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/:freetype \ - http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \ - http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \ - http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \ - ftp://ftp.freetype.org/freetype/freetype2/:freetype -FREETYPE_VERSION= 2.8 -FREETYPE_SRC= freetype-${FREETYPE_VERSION}.tar.bz2 -DISTFILES+= ${FREETYPE_SRC:C/$/:freetype/} -CONFIGURE_ARGS+= --enable-freetype-debugger=${WRKDIR}/freetype-${FREETYPE_VERSION} -.else -CONFIGURE_ARGS+= --disable-freetype-debugger -.endif +post-patch-FREETYPE-on: + @${LN} -s $$(${MAKE} -C ${PORTSDIR}/print/freetype2 -V WRKSRC) ${WRKSRC}/freetype # This is to get around calling fontforge's bootstrap script, as that script fails # if git isn't installed on a system DESPITE there being a --skip-git argument that Modified: head/print/fontforge/distinfo ============================================================================== --- head/print/fontforge/distinfo Tue Jun 11 22:30:00 2019 (r503996) +++ head/print/fontforge/distinfo Tue Jun 11 22:30:14 2019 (r503997) @@ -1,5 +1,3 @@ -TIMESTAMP = 1501649554 -SHA256 (freetype-2.8.tar.bz2) = a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b -SIZE (freetype-2.8.tar.bz2) = 1873526 -SHA256 (fontforge-fontforge-20170731_GH0.tar.gz) = 3f53d06caba2a96dc498df81717e35504815046b3178e811c85c4cc135492d8c -SIZE (fontforge-fontforge-20170731_GH0.tar.gz) = 25125022 +TIMESTAMP = 1558768709 +SHA256 (fontforge-fontforge-20190413_GH0.tar.gz) = d3b60f22d7a52fc2b11e1bd515ab7ba3176f8a3228330d2aea4d076896fe025d +SIZE (fontforge-fontforge-20190413_GH0.tar.gz) = 24380527 Modified: head/print/fontforge/files/patch-Makefile.am ============================================================================== --- head/print/fontforge/files/patch-Makefile.am Tue Jun 11 22:30:00 2019 (r503996) +++ head/print/fontforge/files/patch-Makefile.am Tue Jun 11 22:30:14 2019 (r503997) @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2014-11-27 00:40:08 UTC +--- Makefile.am.orig 2019-04-13 07:38:39 UTC +++ Makefile.am -@@ -43,7 +43,7 @@ GITIGNOREFILES = \ +@@ -46,7 +46,7 @@ GITIGNOREFILES = \ AM_CPPFLAGS = AM_LDFLAGS = @@ -9,15 +9,15 @@ EXTRA_DIST = CLEANFILES = MOSTLYCLEANFILES = -@@ -113,7 +113,6 @@ EXTRA_DIST += \ - Packaging/FontForge-doc.spec \ +@@ -116,7 +116,6 @@ EXTRA_DIST += \ Packaging/FontForge.spec \ Packaging/FontForge.static.spec \ + README \ - uthash/src \ $(NULL) #-------------------------------------------------------------------------- -@@ -129,11 +128,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-the +@@ -132,11 +131,6 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-theme-2012 --enab #-------------------------------------------------------------------------- Modified: head/print/fontforge/files/patch-fontforge_cvexport.c ============================================================================== --- head/print/fontforge/files/patch-fontforge_cvexport.c Tue Jun 11 22:30:00 2019 (r503996) +++ head/print/fontforge/files/patch-fontforge_cvexport.c Tue Jun 11 22:30:14 2019 (r503997) @@ -1,6 +1,6 @@ ---- fontforge/cvexport.c.orig 2014-11-27 00:40:08 UTC +--- fontforge/cvexport.c.orig 2019-04-13 07:38:39 UTC +++ fontforge/cvexport.c -@@ -213,20 +213,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc, +@@ -232,20 +232,7 @@ int _ExportPDF(FILE *pdf,SplineChar *sc,int layer) { fprintf( pdf, " /CreationDate (D:%04d%02d%02d%02d%02d%02d", 1900+tm->tm_year, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec ); @@ -8,7 +8,7 @@ fprintf( pdf, "Z)\n" ); -#else - tzset(); -- if ( timezone==0 ) +- if ( timezone==0 || getenv("SOURCE_DATE_EPOCH") ) - fprintf( pdf, "Z)\n" ); - else { - if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */ Modified: head/print/fontforge/files/patch-fontforge_print.c ============================================================================== --- head/print/fontforge/files/patch-fontforge_print.c Tue Jun 11 22:30:00 2019 (r503996) +++ head/print/fontforge/files/patch-fontforge_print.c Tue Jun 11 22:30:14 2019 (r503997) @@ -1,13 +1,13 @@ ---- fontforge/print.c.orig 2014-11-27 00:40:08 UTC +--- fontforge/print.c.orig 2019-04-13 07:38:39 UTC +++ fontforge/print.c -@@ -1148,19 +1148,7 @@ static void dump_pdfprologue(PI *pi) { - tm = localtime(&now); +@@ -1164,19 +1164,7 @@ static void dump_pdfprologue(PI *pi) { + } fprintf( pi->out, " /CreationDate (D:%04d%02d%02d%02d%02d%02d", tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec ); -#ifdef _NO_TZSET fprintf( pi->out, "Z)\n" ); -#else -- if ( timezone==0 ) +- if ( timezone==0 || getenv("SOURCE_DATE_EPOCH") ) - fprintf( pi->out, "Z)\n" ); - else { - if ( timezone<0 ) /* fprintf bug - this is a kludge to print +/- in front of a %02d-padded value */ Modified: head/print/fontforge/pkg-plist ============================================================================== --- head/print/fontforge/pkg-plist Tue Jun 11 22:30:00 2019 (r503996) +++ head/print/fontforge/pkg-plist Tue Jun 11 22:30:14 2019 (r503997) @@ -21,8 +21,10 @@ include/fontforge/edgelist.h include/fontforge/edgelist2.h include/fontforge/encoding.h include/fontforge/fffreetype.h +include/fontforge/ffgdk.h include/fontforge/ffglib.h include/fontforge/ffpython.h +include/fontforge/flaglist.h include/fontforge/fileutil.h include/fontforge/fontforge-config.h include/fontforge/fontforge.h @@ -36,6 +38,7 @@ include/fontforge/gimage.h include/fontforge/gio.h include/fontforge/gkeysym.h include/fontforge/glif_name_hash.h +include/fontforge/glyphcomp.h include/fontforge/gnetwork.h include/fontforge/gprogress.h include/fontforge/gresedit.h @@ -52,7 +55,6 @@ include/fontforge/mm.h include/fontforge/namehash.h include/fontforge/nonlineartrans.h include/fontforge/ofl.h -include/fontforge/plugins.h include/fontforge/print.h include/fontforge/psfont.h include/fontforge/savefont.h @@ -71,30 +73,27 @@ include/fontforge/unicoderange.h include/fontforge/usermenu.h include/fontforge/ustring.h include/fontforge/utype.h +include/fontforge/views.h lib/libfontforge.a lib/libfontforge.so -lib/libfontforge.so.2 -lib/libfontforge.so.2.0.0 +lib/libfontforge.so.3 +lib/libfontforge.so.3.0.0 lib/libfontforgeexe.a lib/libfontforgeexe.so -lib/libfontforgeexe.so.2 -lib/libfontforgeexe.so.2.0.0 +lib/libfontforgeexe.so.3 +lib/libfontforgeexe.so.3.0.0 lib/libgdraw.a lib/libgdraw.so -lib/libgdraw.so.5 -lib/libgdraw.so.5.0.0 -lib/libgioftp.a -lib/libgioftp.so -lib/libgioftp.so.2 -lib/libgioftp.so.2.0.0 +lib/libgdraw.so.6 +lib/libgdraw.so.6.0.0 lib/libgunicode.a lib/libgunicode.so -lib/libgunicode.so.4 -lib/libgunicode.so.4.0.0 +lib/libgunicode.so.5 +lib/libgunicode.so.5.0.0 lib/libgutils.a lib/libgutils.so -lib/libgutils.so.2 -lib/libgutils.so.2.0.0 +lib/libgutils.so.3 +lib/libgutils.so.3.0.1 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fontforge.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/psMat.so libdata/pkgconfig/libfontforge.pc @@ -103,14 +102,8 @@ man/man1/fontforge.1.gz man/man1/fontimage.1.gz man/man1/fontlint.1.gz man/man1/sfddiff.1.gz -share/applications/fontforge.desktop -%%DATADIR%%/Adobe-CNS1-6.cidmap -%%DATADIR%%/Adobe-GB1-5.cidmap -%%DATADIR%%/Adobe-Identity-0.cidmap -%%DATADIR%%/Adobe-Japan1-5.cidmap -%%DATADIR%%/Adobe-Japan1-6.cidmap -%%DATADIR%%/Adobe-Japan2-0.cidmap -%%DATADIR%%/Adobe-Korea1-2.cidmap +share/appdata/org.fontforge.FontForge.appdata.xml +share/applications/org.fontforge.FontForge.desktop %%DATADIR%%/hotkeys/default %%DATADIR%%/nodejs/collabwebview/client.html %%DATADIR%%/nodejs/collabwebview/css/print.css @@ -494,15 +487,16 @@ share/applications/fontforge.desktop %%PYTHON%%%%DATADIR%%/python/simple/expand-a.py %%PYTHON%%%%DATADIR%%/python/simple/load-font-and-show-name.py %%PYTHON%%%%DATADIR%%/python/test.sfd -share/icons/hicolor/128x128/apps/fontforge.png -share/icons/hicolor/16x16/apps/fontforge.png -share/icons/hicolor/22x22/apps/fontforge.png -share/icons/hicolor/24x24/apps/fontforge.png -share/icons/hicolor/256x256/apps/fontforge.png -share/icons/hicolor/32x32/apps/fontforge.png -share/icons/hicolor/48x48/apps/fontforge.png -share/icons/hicolor/64x64/apps/fontforge.png -share/icons/hicolor/scalable/apps/fontforge.svg +share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png +share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png +share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png +share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png +share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png +share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png +share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png +share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png +share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png +share/icons/hicolor/scalable/apps/org.fontforge.FontForge.svg share/locale/ca/LC_MESSAGES/FontForge.mo share/locale/de/LC_MESSAGES/FontForge.mo share/locale/el/LC_MESSAGES/FontForge.mo @@ -520,4 +514,8 @@ share/locale/uk/LC_MESSAGES/FontForge.mo share/locale/vi/LC_MESSAGES/FontForge.mo share/locale/zh_CN/LC_MESSAGES/FontForge.mo share/locale/zh_TW/LC_MESSAGES/FontForge.mo +share/metainfo/org.fontforge.FontForge.appdata.xml +share/metainfo/org.fontforge.FontForge.metainfo.xml share/mime/packages/fontforge.xml +share/pixmaps/org.fontforge.FontForge.png +share/pixmaps/org.fontforge.FontForge.xpm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906112230.x5BMUEsL071247>