From b501093795de2f93eafd5301acdf63046b960838 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 9 Sep 2020 10:32:08 +0000 Subject: fontforge: update to 20200314. Significant changes include the following. FontForge now has much improved stroke expansion functionality. The main change is that it actually works most of the time. New features include support for arbitrary convex nibs and the miter-clip and arc join styles from SVG 2. All functionality is accessible from the Python and native APIs. (By @skef.) Remove overlap handles certain important edge cases better. (By @skef and @frank-trampe.) The Python API now has a function called genericGlyphChange that matches the "Change Glyph" command in the GUI. See #4133 for more details. (By @skef.) The Python API now has functions for getting Unicode script and for interrogating glyph boundaries. (By @ctrlcctrlv.) One can now use text flags (rather than just numerical flags) when opening a font file via the Python API. (By @skef.) UFO import now outputs the note field properly. (By @skef.) SVG import is much more robust. (By @skef.) We have dropped most gnulib and autotools logic in favor of CMake, which dramatically simplifies the build system and just as dramatically improves build time. (By @jtanx.) As part of the switch to CMake, per the deprecation of Python 2, and per the lack of objections to the proposal on the mailing list, we have dropped support for building FontForge with Python 2 support. The non-build-system Python 2 code remains, but it is neither tested nor maintained nor supported and is likely to follow a trajectory of decay and then removal. Documentation is now rendered in Sphinx, which makes maintenance and improvement easier. (By @jtanx.) Translations now happen on crowdin, which makes contributions easier. (By @jtanx.) We got such a contribution for Croatian. (By @milotype.) Character view point coloring is more consistent, and preview fills support transparency. (By @skef.) The user can now move and close tabs in the character view. (By @ctrlcctrlv.) The metrics view now allows for entry of negative kerning values and runs a bit more smoothly. (By @ctrlcctrlv.) There is now a warning when a user is about to discard an unsaved script. (By @ctrlcctrlv.) We fixed bugs all over, as always, with particular attention given to the metrics view, Python, Spiro, and high-resolution displays. Notes on build system changes: libgutils and libgunicode have been combined into libfontforge libgdraw and libfontforgeexe have been combined into the fontforge executable itself No development files are installed (headers, or pkg-config). This is because we do not provide a stable API or ABI to work against, nor are the headers actually well configured to be used externally. We are also not aware of any maintained product that compiles against FontForge itself. --- fonts/fontforge/Makefile | 49 +- fonts/fontforge/PLIST | 831 +-------------------------- fonts/fontforge/PLIST.Darwin | 2 - fonts/fontforge/distinfo | 12 +- fonts/fontforge/hacks.mk | 18 - fonts/fontforge/patches/patch-configure | 96 ---- fonts/fontforge/patches/patch-po_Makefile.in | 15 - 7 files changed, 23 insertions(+), 1000 deletions(-) delete mode 100644 fonts/fontforge/PLIST.Darwin delete mode 100644 fonts/fontforge/hacks.mk delete mode 100644 fonts/fontforge/patches/patch-configure delete mode 100644 fonts/fontforge/patches/patch-po_Makefile.in diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile index 03bca98cf0c..1e1e39da1fb 100644 --- a/fonts/fontforge/Makefile +++ b/fonts/fontforge/Makefile @@ -1,64 +1,40 @@ -# $NetBSD: Makefile,v 1.115 2020/08/17 20:18:41 leot Exp $ +# $NetBSD: Makefile,v 1.116 2020/09/09 10:32:08 wiz Exp $ -DISTNAME= fontforge-20190801 -PKGREVISION= 5 +DISTNAME= fontforge-20200314 CATEGORIES= fonts editors MASTER_SITES= ${MASTER_SITE_GITHUB:=fontforge/} GITHUB_PROJECT= fontforge GITHUB_RELEASE= ${PKGVERSION_NOREV} +EXTRACT_SUFX= .tar.xz MAINTAINER= adam@NetBSD.org HOMEPAGE= https://fontforge.github.io/ COMMENT= Postscript font editor LICENSE= modified-bsd -EXTRACT_USING= bsdtar - USE_TOOLS+= gmake msgfmt pkg-config xgettext USE_LANGUAGES= c c++11 -USE_LIBTOOL= yes -GNU_CONFIGURE= yes +USE_CMAKE= yes # C++11 GCC_REQD+= 4.8 -# Make the build reproducable. -CONFIGURE_ENV+= SOURCE_DATE_EPOCH=${PKGVERSION_NOREV}0000 - -CONFIGURE_ARGS+= --enable-gdk -CONFIGURE_ARGS+= --enable-woff2 +CONFIGURE_DIRS+= build +CMAKE_ARGS+= .. -USE_PKGLOCALEDIR= yes PY_PATCHPLIST= yes -PKGCONFIG_OVERRIDE_STAGE= post-configure -PKGCONFIG_OVERRIDE+= libfontforge.pc -PKGCONFIG_OVERRIDE+= libfontforgeexe.pc - CHECK_PORTABILITY_SKIP+= osx/FontForge.app/Contents/MacOS/* -CHECK_INTERPRETER_SKIP+= share/fontforge/python/collab/* -CHECK_INTERPRETER_SKIP+= share/fontforge/python/gdraw/* -CHECK_INTERPRETER_SKIP+= share/fontforge/python/simple/* -.include "../../mk/bsd.prefs.mk" +PYTHON_VERSIONS_INCOMPATIBLE= 27 -# Requires GNU date features -.if ${OPSYS} == "SunOS" -_TOOLS_USE_PKGSRC.date= yes -.endif +pre-configure: + ${MKDIR} ${WRKSRC}/build -.include "../../lang/python/application.mk" -# Python38 needs use of pkgconfig python-3.8-embed -.if ${PYPKGPREFIX} == "py38" -EMBED=-embed -.else -EMBED= -.endif -SUBST_CLASSES+= pkgconf -SUBST_STAGE.pkgconf= pre-configure -SUBST_FILES.pkgconf= configure -SUBST_VARS.pkgconf= EMBED +# XXX msgfmt: unknown option -- xml +_TOOLS_USE_PKGSRC.msgfmt= yes +.include "../../lang/python/application.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../databases/shared-mime-info/mimedb.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -81,4 +57,5 @@ SUBST_VARS.pkgconf= EMBED .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/fontforge/PLIST b/fonts/fontforge/PLIST index 04bde10051a..842a8eae0bb 100644 --- a/fonts/fontforge/PLIST +++ b/fonts/fontforge/PLIST @@ -1,834 +1,17 @@ -@comment $NetBSD: PLIST,v 1.36 2019/09/02 14:45:37 nia Exp $ +@comment $NetBSD: PLIST,v 1.37 2020/09/09 10:32:08 wiz Exp $ bin/fontforge bin/fontimage bin/fontlint bin/sfddiff -include/fontforge/PfEd.h -include/fontforge/autowidth.h -include/fontforge/autowidth2.h -include/fontforge/baseviews.h -include/fontforge/basics.h -include/fontforge/bezctx_ff.h -include/fontforge/bitmapcontrol.h -include/fontforge/carbon.h -include/fontforge/chardata.h -include/fontforge/charset.h -include/fontforge/delta.h -include/fontforge/dlist.h -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/fontforge-config.h -include/fontforge/fontforge-version-extras.h -include/fontforge/fontforge.h -include/fontforge/fontforgevw.h -include/fontforge/fvmetrics.h -include/fontforge/gdraw.h -include/fontforge/gfile.h -include/fontforge/ggadget.h -include/fontforge/gicons.h -include/fontforge/gimage.h -include/fontforge/gio.h -include/fontforge/gkeysym.h -include/fontforge/glif_name_hash.h -include/fontforge/glyphcomp.h -include/fontforge/gprogress.h -include/fontforge/gresedit.h -include/fontforge/gresource.h -include/fontforge/groups.h -include/fontforge/gutils.h -include/fontforge/gwidget.h -include/fontforge/gwwiconv.h -include/fontforge/hotkeys.h -include/fontforge/intl.h -include/fontforge/lookups.h -include/fontforge/mem.h -include/fontforge/mm.h -include/fontforge/namehash.h -include/fontforge/nonlineartrans.h -include/fontforge/ofl.h -include/fontforge/prefs.h -include/fontforge/print.h -include/fontforge/psfont.h -include/fontforge/savefont.h -include/fontforge/scriptfuncs.h -include/fontforge/scripting.h -include/fontforge/sd.h -include/fontforge/search.h -include/fontforge/sfd1.h -include/fontforge/sflayoutP.h -include/fontforge/splinefont.h -include/fontforge/stemdb.h -include/fontforge/ttf.h -include/fontforge/ttfinstrs.h -include/fontforge/uiinterface.h -include/fontforge/unicodelibinfo.h -include/fontforge/unicoderange.h -include/fontforge/ustring.h -include/fontforge/utype.h -include/fontforge/views.h -lib/libfontforge.la -lib/libfontforgeexe.la -lib/libgdraw.la -lib/libgunicode.la -lib/libgutils.la -lib/pkgconfig/libfontforge.pc -lib/pkgconfig/libfontforgeexe.pc -${PYSITELIB}/fontforge.la -${PYSITELIB}/psMat.la +lib/libfontforge.so +lib/libfontforge.so.4 +${PYSITELIB}/fontforge.so +${PYSITELIB}/psMat.so man/man1/fontforge.1 man/man1/fontimage.1 man/man1/fontlint.1 man/man1/sfddiff.1 -share/appdata/org.fontforge.FontForge.appdata.xml share/applications/org.fontforge.FontForge.desktop -share/doc/fontforge/.htaccess -share/doc/fontforge/AA-Comparison.html -share/doc/fontforge/AddLookup-Liga.png -share/doc/fontforge/AmbrosiaFV-bm.png -share/doc/fontforge/AmbrosiaFV.png -share/doc/fontforge/Anna.gif -share/doc/fontforge/Antigone.gif -share/doc/fontforge/As.png -share/doc/fontforge/BASEdlg.png -share/doc/fontforge/BASEfeat.png -share/doc/fontforge/BASElang.png -share/doc/fontforge/BDFgrey.html -share/doc/fontforge/BethSans.png -share/doc/fontforge/BethSerif.png -share/doc/fontforge/BexpandBigSerifs.png -share/doc/fontforge/BexpandCJK.png -share/doc/fontforge/BexpandLCG.png -share/doc/fontforge/BexpandLCGsquish.png -share/doc/fontforge/Big5.txt -share/doc/fontforge/BitmapReference.png -share/doc/fontforge/BitmapView.png -share/doc/fontforge/BoldHiraDA.png -share/doc/fontforge/BottomSerif.png -share/doc/fontforge/Bperspective.png -share/doc/fontforge/C1.png -share/doc/fontforge/C10.png -share/doc/fontforge/C2.png -share/doc/fontforge/C3.png -share/doc/fontforge/C4.png -share/doc/fontforge/C5.png -share/doc/fontforge/C6.png -share/doc/fontforge/C7.png -share/doc/fontforge/C8.png -share/doc/fontforge/C9.png -share/doc/fontforge/CaslonOriginality.png -share/doc/fontforge/ChangeGlyph1Dlg.png -share/doc/fontforge/ChangeGlyph2Dlg.png -share/doc/fontforge/ChangeGlyph3Dlg.png -share/doc/fontforge/ChangeWeight.png -share/doc/fontforge/ChangeXHeightDlg.png -share/doc/fontforge/CharPrint.png -share/doc/fontforge/ClippedA.png -share/doc/fontforge/ClippedARaster.png -share/doc/fontforge/CondenseExtend.png -share/doc/fontforge/Constrain1_1.png -share/doc/fontforge/Constrain1_2.png -share/doc/fontforge/Constrain2_1.png -share/doc/fontforge/Constrain2_2.png -share/doc/fontforge/Cspirals.png -share/doc/fontforge/Cspiro0.png -share/doc/fontforge/Cspiro1.png -share/doc/fontforge/Cspiro10.png -share/doc/fontforge/Cspiro2.png -share/doc/fontforge/Cspiro3.png -share/doc/fontforge/Cspiro4.png -share/doc/fontforge/Cspiro5.png -share/doc/fontforge/Cspiro6.png -share/doc/fontforge/Cspiro6_5.png -share/doc/fontforge/Cspiro7.png -share/doc/fontforge/Cspiro8.png -share/doc/fontforge/Cspiro9.png -share/doc/fontforge/CyrilItalicComp.png -share/doc/fontforge/DisplayFonts.png -share/doc/fontforge/Eback.png -share/doc/fontforge/EbackTtf.png -share/doc/fontforge/Efore.png -share/doc/fontforge/EforeTtf.png -share/doc/fontforge/Ehinted.png -share/doc/fontforge/EhintedTtf.png -share/doc/fontforge/Encodings.ps.gz -share/doc/fontforge/Eperspective.png -share/doc/fontforge/FF32.png -share/doc/fontforge/FFmacotfIcon.png -share/doc/fontforge/FFsfd32.png -share/doc/fontforge/FVHMetrics.png -share/doc/fontforge/FVVMetrics.png -share/doc/fontforge/FlatSerif.png -share/doc/fontforge/FontDisplay.png -share/doc/fontforge/FontForge.css -share/doc/fontforge/FontForgeSplash.png -share/doc/fontforge/FontImage.png -share/doc/fontforge/FontSample.png -share/doc/fontforge/GButton.png -share/doc/fontforge/GCancelButton.png -share/doc/fontforge/GComboBox.png -share/doc/fontforge/GComboBoxMenu.png -share/doc/fontforge/GDefaultButton.png -share/doc/fontforge/GDropList.png -share/doc/fontforge/GLabel.png -share/doc/fontforge/GListMark.png -share/doc/fontforge/GMatrixEdit.png -share/doc/fontforge/GNumericField.png -share/doc/fontforge/GNumericFieldSpinner.png -share/doc/fontforge/GRadio.png -share/doc/fontforge/GSUB-Order.png -share/doc/fontforge/GTextField.png -share/doc/fontforge/GenerateFamily.png -share/doc/fontforge/GenerateOptions.png -share/doc/fontforge/GenerateTTC.png -share/doc/fontforge/GlossaryFS.html -share/doc/fontforge/GlossaryFrame.html -share/doc/fontforge/GlyphSep-To.png -share/doc/fontforge/GlyphSep-rectangles.png -share/doc/fontforge/GradientDlg.png -share/doc/fontforge/GridFit.png -share/doc/fontforge/GridFitM.png -share/doc/fontforge/H-bm.png -share/doc/fontforge/H-gm.png -share/doc/fontforge/HI.hints.png -share/doc/fontforge/HI.nohints.png -share/doc/fontforge/HebrewMetrics.png -share/doc/fontforge/HebrewSerifs.png -share/doc/fontforge/Hints.png -share/doc/fontforge/HotKeys.html -share/doc/fontforge/IndexFS.html -share/doc/fontforge/IndexFrame.html -share/doc/fontforge/InsertTextDlg.html -share/doc/fontforge/InsertTxtDlg.png -share/doc/fontforge/ItalicCompCaslon.png -share/doc/fontforge/ItalicCompGalliard.png -share/doc/fontforge/ItalicDlg.png -share/doc/fontforge/JustOutside.png -share/doc/fontforge/JustifyDlg.png -share/doc/fontforge/JustifyExtenderDlg.png -share/doc/fontforge/JustifyLangDlg.png -share/doc/fontforge/JustifyLookupDlg.png -share/doc/fontforge/KernPairs.png -share/doc/fontforge/LinearGradient.png -share/doc/fontforge/MATH-Constants.png -share/doc/fontforge/MATH-Exten.png -share/doc/fontforge/MATH-GlyphConstructed.png -share/doc/fontforge/MATH-GlyphConstruction.png -share/doc/fontforge/MATH-GlyphConstructionDlg.png -share/doc/fontforge/MATH-Italic.png -share/doc/fontforge/MATH-MathKern.png -share/doc/fontforge/MATH-MathKernGraph.png -share/doc/fontforge/MATH-MathKernText.png -share/doc/fontforge/MATH-TopAccent.png -share/doc/fontforge/MATH-VertVariants.png -share/doc/fontforge/MacFeatName.png -share/doc/fontforge/MacMapping.png -share/doc/fontforge/MassRename.png -share/doc/fontforge/MenuWithMacIcons.png -share/doc/fontforge/MenuWithoutMacIcons.png -share/doc/fontforge/Metal-fontforge-600.jpeg -share/doc/fontforge/MetalType.jpeg -share/doc/fontforge/MetricsView-features.png -share/doc/fontforge/MetricsView.png -share/doc/fontforge/MultiPrint.png -share/doc/fontforge/NoPointHint.png -share/doc/fontforge/OFL-FAQ-Unofficial-fr.html -share/doc/fontforge/OFL-FAQ-Unofficial-vi.html -share/doc/fontforge/OFL-Unofficial-el.html -share/doc/fontforge/OFL-Unofficial-fr.html -share/doc/fontforge/OFL-Unofficial-pl.html -share/doc/fontforge/OFL-Unofficial-vi.html -share/doc/fontforge/OFL-Unofficial.html -share/doc/fontforge/OutlineInline.png -share/doc/fontforge/PageSetup.png -share/doc/fontforge/PathToBind.png -share/doc/fontforge/PfaEdit-TeX.html -share/doc/fontforge/PfaEdits.gif -share/doc/fontforge/PoV.png -share/doc/fontforge/Print.png -share/doc/fontforge/QGDlg.png -share/doc/fontforge/QGList.png -share/doc/fontforge/RadialGradient.png -share/doc/fontforge/RadialGradientDlg.png -share/doc/fontforge/ReviewHints.png -share/doc/fontforge/SelectByATT.png -share/doc/fontforge/Shades.png -share/doc/fontforge/Shades2.png -share/doc/fontforge/Shades4.png -share/doc/fontforge/ShadowWireframe.png -share/doc/fontforge/ShowGridFit.png -share/doc/fontforge/Sigma13x16.png -share/doc/fontforge/Sigma28x33.png -share/doc/fontforge/Sigma54x64.png -share/doc/fontforge/SmallcapsDlg.png -share/doc/fontforge/Spacem_1.png -share/doc/fontforge/Spacem_2.png -share/doc/fontforge/Styles.html -share/doc/fontforge/SubSuperDlg.png -share/doc/fontforge/SuggestDeltas.html -share/doc/fontforge/TTCvt.png -share/doc/fontforge/TTPoints.png -share/doc/fontforge/TTRaster.png -share/doc/fontforge/TTRegisters.png -share/doc/fontforge/TTStack.png -share/doc/fontforge/TTStorage.png -share/doc/fontforge/TTgloss.png -share/doc/fontforge/TextBoundDistortedGlyphs.png -share/doc/fontforge/TextBoundUnitaryGlyph.png -share/doc/fontforge/TextUnbound.png -share/doc/fontforge/Tile.png -share/doc/fontforge/TilePath.png -share/doc/fontforge/TilePath2.png -share/doc/fontforge/TilePattern.png -share/doc/fontforge/TilePatternDlg.png -share/doc/fontforge/TiledPattern.png -share/doc/fontforge/TiledPattern45.png -share/doc/fontforge/To-kerned.png -share/doc/fontforge/To-unkerned.png -share/doc/fontforge/Tricolor.png -share/doc/fontforge/TrueOpenTables.html -share/doc/fontforge/UniqueID.html -share/doc/fontforge/VerticalMetrics.png -share/doc/fontforge/aItalic.png -share/doc/fontforge/a_dieresis_macron.png -share/doc/fontforge/a_with_anchor.png -share/doc/fontforge/aacutebase.png -share/doc/fontforge/aacutemid.png -share/doc/fontforge/accented.html -share/doc/fontforge/acenter.png -share/doc/fontforge/acorn2sfd.html -share/doc/fontforge/addlookup-kern.png -share/doc/fontforge/agetinfo.png -share/doc/fontforge/agrave_anchored.png -share/doc/fontforge/ahighest.png -share/doc/fontforge/alignedBaselines.png -share/doc/fontforge/allgreek.png -share/doc/fontforge/alphakappaiota.png -share/doc/fontforge/alphakappaiotatheta.png -share/doc/fontforge/anchorcontrol-base.png -share/doc/fontforge/anchorcontrol-mark.png -share/doc/fontforge/anchorcontrol.html -share/doc/fontforge/arabic-seen.png -share/doc/fontforge/asm1.png -share/doc/fontforge/asm2.png -share/doc/fontforge/asm3.png -share/doc/fontforge/asm4.png -share/doc/fontforge/autotrace.html -share/doc/fontforge/autowidth.html -share/doc/fontforge/autowidth.png -share/doc/fontforge/baseline.html -share/doc/fontforge/bdfinfo.html -share/doc/fontforge/bdfinfo.png -share/doc/fontforge/bed-script.png -share/doc/fontforge/bezier.gif -share/doc/fontforge/bezier.html -share/doc/fontforge/bibliography.html -share/doc/fontforge/bitmapchar.png -share/doc/fontforge/bitmaponlysfnt.html -share/doc/fontforge/bitmapsavail.png -share/doc/fontforge/bitmapview.html -share/doc/fontforge/boustrophedon.png -share/doc/fontforge/bowlweb.gif -share/doc/fontforge/bvlayers.png -share/doc/fontforge/bvtools.png -share/doc/fontforge/cap-height.png -share/doc/fontforge/changelog.html -share/doc/fontforge/charinfo-comment.png -share/doc/fontforge/charinfo-comp.png -share/doc/fontforge/charinfo-counters.png -share/doc/fontforge/charinfo-lig.png -share/doc/fontforge/charinfo-pos.png -share/doc/fontforge/charinfo-subs.png -share/doc/fontforge/charinfo-tex.png -share/doc/fontforge/charinfo-tilesize.png -share/doc/fontforge/charinfo-variants.png -share/doc/fontforge/charinfo.html -share/doc/fontforge/charinfo.png -share/doc/fontforge/charview-multilayer.png -share/doc/fontforge/charview-quadratic.png -share/doc/fontforge/charview-vert.png -share/doc/fontforge/charview.html -share/doc/fontforge/charview2.png -share/doc/fontforge/charwithhintmask.png -share/doc/fontforge/cidmapformat.html -share/doc/fontforge/cidmenu.html -share/doc/fontforge/cliargs.html -share/doc/fontforge/colorbutton.png -share/doc/fontforge/colorpicker.jpeg -share/doc/fontforge/contextchain-class.png -share/doc/fontforge/contextchain-classlist.png -share/doc/fontforge/contextchain-coverage.png -share/doc/fontforge/contextchain-format.png -share/doc/fontforge/contextchain-glyphlists.png -share/doc/fontforge/contextchain-pickglyph.png -share/doc/fontforge/contextchain-rcover.png -share/doc/fontforge/contextchain-simpleclasses.png -share/doc/fontforge/contextchain-simplecoverage.png -share/doc/fontforge/contextchain-simpleglyph.png -share/doc/fontforge/contextchain.html -share/doc/fontforge/copyfeatures.png -share/doc/fontforge/corpchar.html -share/doc/fontforge/corpchar.txt -share/doc/fontforge/cpinfo.png -share/doc/fontforge/cpodd.png -share/doc/fontforge/cubic2quad.png -share/doc/fontforge/cvarrowicon.png -share/doc/fontforge/cvcornericon.png -share/doc/fontforge/cvcurveicon.png -share/doc/fontforge/cvdebug.png -share/doc/fontforge/cvellipseicon.png -share/doc/fontforge/cvflipicon.png -share/doc/fontforge/cvfreehandicon.png -share/doc/fontforge/cvhandicon.png -share/doc/fontforge/cvhvcurveicon.png -share/doc/fontforge/cvknifeicon.png -share/doc/fontforge/cvmagicon.png -share/doc/fontforge/cvpenicon.png -share/doc/fontforge/cvperspectiveicon.png -share/doc/fontforge/cvpolyicon.png -share/doc/fontforge/cvrecticon.png -share/doc/fontforge/cvrotate3dicon.png -share/doc/fontforge/cvrotateicon.png -share/doc/fontforge/cvrulericon.png -share/doc/fontforge/cvscaleicon.png -share/doc/fontforge/cvskewicon.png -share/doc/fontforge/cvspiroG2icon.png -share/doc/fontforge/cvspiroG4icon.png -share/doc/fontforge/cvspirocornericon.png -share/doc/fontforge/cvspirolefticon.png -share/doc/fontforge/cvspiromodeicon.png -share/doc/fontforge/cvspirorighticon.png -share/doc/fontforge/cvstaricon.png -share/doc/fontforge/cvt-to-mac.png -share/doc/fontforge/cvtangenticon.png -share/doc/fontforge/definegroups.png -share/doc/fontforge/delta0.png -share/doc/fontforge/delta1.png -share/doc/fontforge/devaBaseline.png -share/doc/fontforge/devaHangBaseline.png -share/doc/fontforge/devaLatinBaseline.png -share/doc/fontforge/diffs.html -share/doc/fontforge/display.html -share/doc/fontforge/displaygroups.png -share/doc/fontforge/donate.png -share/doc/fontforge/doublestruck-B.png -share/doc/fontforge/eItalic.png -share/doc/fontforge/editcvt.png -share/doc/fontforge/editexample-fr.html -share/doc/fontforge/editexample.html -share/doc/fontforge/editexample2.html -share/doc/fontforge/editexample3.html -share/doc/fontforge/editexample4.html -share/doc/fontforge/editexample5.html -share/doc/fontforge/editexample6-5.html -share/doc/fontforge/editexample6.html -share/doc/fontforge/editexample7.html -share/doc/fontforge/editexample8.html -share/doc/fontforge/editmenu.html -share/doc/fontforge/editspiro.html -share/doc/fontforge/edittransition-context.png -share/doc/fontforge/edittransition-indic.png -share/doc/fontforge/edittransition-insert.png -share/doc/fontforge/edittransition-kern.png -share/doc/fontforge/elementmenu.html -share/doc/fontforge/emptyfont-A-sel.png -share/doc/fontforge/emptyhlig.png -share/doc/fontforge/encodingmenu.html -share/doc/fontforge/errrecovery.html -share/doc/fontforge/exclude-post.png -share/doc/fontforge/exclude-pre.png -share/doc/fontforge/expand-joint-post.png -share/doc/fontforge/expand-joint-pre.png -share/doc/fontforge/expand-post.png -share/doc/fontforge/expand-pre.png -share/doc/fontforge/expandedlines.png -share/doc/fontforge/expandstroke.png -share/doc/fontforge/extrema-poi.png -share/doc/fontforge/f+i.png -share/doc/fontforge/fItalic.png -share/doc/fontforge/faq.html -share/doc/fontforge/faqFS.html -share/doc/fontforge/faqFrame.html -share/doc/fontforge/featsetdlg.png -share/doc/fontforge/featurefile.html -share/doc/fontforge/ff-history.html -share/doc/fontforge/ff-screenshot.png -share/doc/fontforge/ffanvil16.png -share/doc/fontforge/ffanvil300.png -share/doc/fontforge/ffanvil32.png -share/doc/fontforge/ffcartouche.png -share/doc/fontforge/ffdownload.png -share/doc/fontforge/ffi-caret.png -share/doc/fontforge/ffi-moved.png -share/doc/fontforge/ffi-refs.png -share/doc/fontforge/ffi-rmoverlap.png -share/doc/fontforge/ffi-unlink.png -share/doc/fontforge/fftype16.png -share/doc/fontforge/fftype300.svg -share/doc/fontforge/fftype32.png -share/doc/fontforge/fi.png -share/doc/fontforge/filemenu.html -share/doc/fontforge/files.html -share/doc/fontforge/findprobs-att.png -share/doc/fontforge/findprobs-bb.png -share/doc/fontforge/findprobs-cid.png -share/doc/fontforge/findprobs-hint.png -share/doc/fontforge/findprobs-paths.png -share/doc/fontforge/findprobs-random.png -share/doc/fontforge/findprobs-refs.png -share/doc/fontforge/findprobs.png -share/doc/fontforge/flags/BrasilFlag.png -share/doc/fontforge/flags/English.gif -share/doc/fontforge/flags/GermanFlag.png -share/doc/fontforge/flags/Greece.png -share/doc/fontforge/flags/Nisshoki-Japan.png -share/doc/fontforge/flags/Polish.png -share/doc/fontforge/flags/RussianFlag.png -share/doc/fontforge/flags/StarsStripes.gif -share/doc/fontforge/flags/Tricolor.gif -share/doc/fontforge/flags/UnionJack.gif -share/doc/fontforge/flags/VietnamFlag.png -share/doc/fontforge/flags/taiwan.png -share/doc/fontforge/floating-A.png -share/doc/fontforge/fontcompdlg.png -share/doc/fontforge/fontcompresults.png -share/doc/fontforge/fontforge-banner-420.jpeg -share/doc/fontforge/fontforge-themes.html -share/doc/fontforge/fontforge-tutorial.pdf -share/doc/fontforge/fontimage.html -share/doc/fontforge/fontinfo-charsets.png -share/doc/fontforge/fontinfo-cid.png -share/doc/fontforge/fontinfo-comment.png -share/doc/fontforge/fontinfo-gasp.png -share/doc/fontforge/fontinfo-general.png -share/doc/fontforge/fontinfo-layers.png -share/doc/fontforge/fontinfo-lookups.png -share/doc/fontforge/fontinfo-macfeat.png -share/doc/fontforge/fontinfo-macstyle.png -share/doc/fontforge/fontinfo-markclasses.png -share/doc/fontforge/fontinfo-marksets.png -share/doc/fontforge/fontinfo-panose.png -share/doc/fontforge/fontinfo-private.png -share/doc/fontforge/fontinfo-psuid.png -share/doc/fontforge/fontinfo-size.png -share/doc/fontforge/fontinfo-ssnames.png -share/doc/fontforge/fontinfo-subsup.png -share/doc/fontforge/fontinfo-tex.png -share/doc/fontforge/fontinfo-ttfmetrics.png -share/doc/fontforge/fontinfo-ttfname-bigedit.png -share/doc/fontforge/fontinfo-ttfname.png -share/doc/fontforge/fontinfo-ttfvals.png -share/doc/fontforge/fontinfo-unicode.png -share/doc/fontforge/fontinfo-woff.png -share/doc/fontforge/fontinfo.html -share/doc/fontforge/fontinfo.png -share/doc/fontforge/fontlint.html -share/doc/fontforge/fontstyles.html -share/doc/fontforge/fontutils.html -share/doc/fontforge/fontview-cid.png -share/doc/fontforge/fontview-grouped.png -share/doc/fontforge/fontview.fr.png -share/doc/fontforge/fontview.html -share/doc/fontforge/fontview.ru.png -share/doc/fontforge/fraktur-A.png -share/doc/fontforge/freehandctl.png -share/doc/fontforge/future.html -share/doc/fontforge/fv-normal.png -share/doc/fontforge/fv-smallcaps.png -share/doc/fontforge/fvOutOfDateHinting.png -share/doc/fontforge/generate-upload.png -share/doc/fontforge/generate.html -share/doc/fontforge/generate.png -share/doc/fontforge/getinfo.html -share/doc/fontforge/glossary.html -share/doc/fontforge/glyphinfo-one.png -share/doc/fontforge/gposgsub.html -share/doc/fontforge/grave_with_anchor.png -share/doc/fontforge/greymapedit.png -share/doc/fontforge/greymapsavail.png -share/doc/fontforge/groups.html -share/doc/fontforge/helpmenu.html -share/doc/fontforge/hexley.png -share/doc/fontforge/hintboundingbox.png -share/doc/fontforge/hintdiagonalends.png -share/doc/fontforge/hintdiagonalinter.png -share/doc/fontforge/hinting.html -share/doc/fontforge/hintmaskinfo.png -share/doc/fontforge/hintsmenu.html -share/doc/fontforge/histogram.html -share/doc/fontforge/histogram.png -share/doc/fontforge/hligaheadruledone.png -share/doc/fontforge/hligallrulesdone.png -share/doc/fontforge/hligback.png -share/doc/fontforge/hligbacknomatch.png -share/doc/fontforge/hligbackrule.png -share/doc/fontforge/hligbackruledone.png -share/doc/fontforge/hligbyclasses.png -share/doc/fontforge/hliggreekahead.png -share/doc/fontforge/hliggreekback.png -share/doc/fontforge/hliggreekclass.png -share/doc/fontforge/hligiotaclass.png -share/doc/fontforge/hligkappa.png -share/doc/fontforge/hligkappaclass.png -share/doc/fontforge/hligkappaiota.png -share/doc/fontforge/hligmatchsubs.png -share/doc/fontforge/hlignewrule.png -share/doc/fontforge/hligrule.png -share/doc/fontforge/hligseqdlg.png -share/doc/fontforge/hotkeys.jpeg -share/doc/fontforge/i1.png -share/doc/fontforge/i2.png -share/doc/fontforge/i3.png -share/doc/fontforge/i4.png -share/doc/fontforge/import.png -share/doc/fontforge/importexample.html -share/doc/fontforge/index.html -share/doc/fontforge/intersect-post.png -share/doc/fontforge/justify.html -share/doc/fontforge/k1.png -share/doc/fontforge/k2.png -share/doc/fontforge/k3.png -share/doc/fontforge/k4.png -share/doc/fontforge/k5.png -share/doc/fontforge/k6.png -share/doc/fontforge/ka-change.png -share/doc/fontforge/kanjichar.png -share/doc/fontforge/kanjifont.png -share/doc/fontforge/kappa_iota-context.png -share/doc/fontforge/kappa_iota-lookup.png -share/doc/fontforge/kappa_iota-subtable.png -share/doc/fontforge/kappaiota-lookups.png -share/doc/fontforge/kappaiotatheta.png -share/doc/fontforge/kern-We-12.png -share/doc/fontforge/kern-We-150.png -share/doc/fontforge/kernbyclasses.png -share/doc/fontforge/kerningclass.png -share/doc/fontforge/kerningformat.png -share/doc/fontforge/kernpairclose.png -share/doc/fontforge/kernpairs.html -share/doc/fontforge/l1.png -share/doc/fontforge/l10.png -share/doc/fontforge/l2.png -share/doc/fontforge/l3.png -share/doc/fontforge/l4.png -share/doc/fontforge/l5.png -share/doc/fontforge/l6.png -share/doc/fontforge/l7.png -share/doc/fontforge/l8.png -share/doc/fontforge/l9.png -share/doc/fontforge/lang-dlg.png -share/doc/fontforge/latinBaseline.png -share/doc/fontforge/latinHangBaseline.png -share/doc/fontforge/latinNormalBaseline.png -share/doc/fontforge/layerdlg.png -share/doc/fontforge/layers.png -share/doc/fontforge/lcani.gif -share/doc/fontforge/lcdigits.png -share/doc/fontforge/license.html -share/doc/fontforge/logo3.gif -share/doc/fontforge/lookup-metadata.png -share/doc/fontforge/lookups.html -share/doc/fontforge/lparen-108.png -share/doc/fontforge/mItalic.png -share/doc/fontforge/mac-install.html -share/doc/fontforge/macFeatureSetting.png -share/doc/fontforge/macfeature.png -share/doc/fontforge/macformats.html -share/doc/fontforge/mad.html -share/doc/fontforge/manual-ja-hover.png -share/doc/fontforge/manual-ja.png -share/doc/fontforge/math.html -share/doc/fontforge/menu_down.png -share/doc/fontforge/mergepost.png -share/doc/fontforge/mergepre.png -share/doc/fontforge/metrics-kappa_iota.png -share/doc/fontforge/metricsmenu.html -share/doc/fontforge/metricsview.html -share/doc/fontforge/misalignedBaselines.png -share/doc/fontforge/mmappleaxes.png -share/doc/fontforge/mmaxes.png -share/doc/fontforge/mmcharview.png -share/doc/fontforge/mmcounts.png -share/doc/fontforge/mmdesigns.png -share/doc/fontforge/mmextrapolate2.png -share/doc/fontforge/mmfinal.png -share/doc/fontforge/mmfuncs.png -share/doc/fontforge/mmmenu.html -share/doc/fontforge/mmnamedstyles.png -share/doc/fontforge/mmnamingastyle.png -share/doc/fontforge/ms-install.html -share/doc/fontforge/multilayer.html -share/doc/fontforge/multiplemaster.html -share/doc/fontforge/newanchor.png -share/doc/fontforge/newcountermask.png -share/doc/fontforge/newfont.png -share/doc/fontforge/nix-install.html -share/doc/fontforge/non-linear.png -share/doc/fontforge/non-standard.html -share/doc/fontforge/nonBMP/index.html -share/doc/fontforge/nvd.html -share/doc/fontforge/o-baddir.png -share/doc/fontforge/o1.png -share/doc/fontforge/o2.png -share/doc/fontforge/o3.png -share/doc/fontforge/o4.png -share/doc/fontforge/o5.png -share/doc/fontforge/oldchangelog.html -share/doc/fontforge/openfont.png -share/doc/fontforge/otherlinks.html -share/doc/fontforge/outlinechar.png -share/doc/fontforge/overlappedlines.png -share/doc/fontforge/overshoot.png -share/doc/fontforge/overview.html -share/doc/fontforge/palmfonts.html -share/doc/fontforge/pcf-format.html -share/doc/fontforge/pfaeditchangelog.html -share/doc/fontforge/pfaeditmath.html -share/doc/fontforge/phi-hints-filled.png -share/doc/fontforge/phi-hints-outline.png -share/doc/fontforge/phi-nohints-filled.png -share/doc/fontforge/phi-nohints-outline.png -share/doc/fontforge/pnts.gif -share/doc/fontforge/pointinfo-interp.png -share/doc/fontforge/pointinfo.png -share/doc/fontforge/pointmenu.html -share/doc/fontforge/pointsize.png -share/doc/fontforge/prefs-accent.png -share/doc/fontforge/prefs-apps.png -share/doc/fontforge/prefs-editing.png -share/doc/fontforge/prefs-font.png -share/doc/fontforge/prefs-generate.png -share/doc/fontforge/prefs-generic.png -share/doc/fontforge/prefs-macfeat.png -share/doc/fontforge/prefs-macmap.png -share/doc/fontforge/prefs-navigation.png -share/doc/fontforge/prefs-newfont.png -share/doc/fontforge/prefs-openfont.png -share/doc/fontforge/prefs-opentype.png -share/doc/fontforge/prefs-pshints.png -share/doc/fontforge/prefs-script.png -share/doc/fontforge/prefs-sync.png -share/doc/fontforge/prefs-tt.png -share/doc/fontforge/prefs-ttinstrs.png -share/doc/fontforge/prefs.html -share/doc/fontforge/privatekey.png -share/doc/fontforge/privatekeymenu.png -share/doc/fontforge/problems.html -share/doc/fontforge/python.html -share/doc/fontforge/quadbezier.gif -share/doc/fontforge/quadbezier.png -share/doc/fontforge/quadraticspline.gif -share/doc/fontforge/quadraticspline.png -share/doc/fontforge/quotations.html -share/doc/fontforge/realindex.html -share/doc/fontforge/ref-caveats.html -share/doc/fontforge/removefeature.png -share/doc/fontforge/resedit.html -share/doc/fontforge/resedit.png -share/doc/fontforge/retagfeature.png -share/doc/fontforge/rgetinfo.png -share/doc/fontforge/rparen-108.png -share/doc/fontforge/rplprocess.png -share/doc/fontforge/rplref.png -share/doc/fontforge/rplsansserifs.png -share/doc/fontforge/rplserifs.png -share/doc/fontforge/ruler.png -share/doc/fontforge/running.html -share/doc/fontforge/sans-serif-def.png -share/doc/fontforge/script-A.png -share/doc/fontforge/script-lang-dlg.png -share/doc/fontforge/scripting-alpha.html -share/doc/fontforge/scripting-tutorial.html -share/doc/fontforge/scripting.html -share/doc/fontforge/scriptnotes.html -share/doc/fontforge/search.html -share/doc/fontforge/selectbyatt.html -share/doc/fontforge/selections.html -share/doc/fontforge/serif-def.png -share/doc/fontforge/serif.png -share/doc/fontforge/serif2.png -share/doc/fontforge/setwidth.png -share/doc/fontforge/sfd.html -share/doc/fontforge/sfdchangelog.html -share/doc/fontforge/sfddiff.html -share/doc/fontforge/sfdformat.html -share/doc/fontforge/short-long-s.png -share/doc/fontforge/showatt.html -share/doc/fontforge/showatt.png -share/doc/fontforge/sidebearings.png -share/doc/fontforge/sm-picture.png -share/doc/fontforge/source-build.html -share/doc/fontforge/spacekappaiotaspace.png -share/doc/fontforge/spacer1x20.png -share/doc/fontforge/spironextconstraint.png -share/doc/fontforge/spiropointinfo.png -share/doc/fontforge/spiroprevconstraint.png -share/doc/fontforge/splinefont.html -share/doc/fontforge/splines.gif -share/doc/fontforge/src.html -share/doc/fontforge/statemachine-context.png -share/doc/fontforge/statemachine-indic.png -share/doc/fontforge/statemachine-insert.png -share/doc/fontforge/statemachine.html -share/doc/fontforge/strokechar.png -share/doc/fontforge/subtable-ffi.png -share/doc/fontforge/subtable-gpos-anchor.png -share/doc/fontforge/subtable-gpos-kernpair.png -share/doc/fontforge/subtable-gpos-singlefull.png -share/doc/fontforge/subtable-gpos-singlehide.png -share/doc/fontforge/subtable-gsub-ligature.png -share/doc/fontforge/subtable-gsub-single.png -share/doc/fontforge/subtable-oldstyle.png -share/doc/fontforge/subtable-to.png -share/doc/fontforge/tilepath-center.png -share/doc/fontforge/tilepath-final.png -share/doc/fontforge/tilepath-left.png -share/doc/fontforge/tilepath-orig.png -share/doc/fontforge/tilepath-right.png -share/doc/fontforge/tilepath-scale.png -share/doc/fontforge/tilepath-selection.png -share/doc/fontforge/tilepath-tile.png -share/doc/fontforge/tilepath-ts.png -share/doc/fontforge/tilepath.html -share/doc/fontforge/tools.png -share/doc/fontforge/toolsmenu.html -share/doc/fontforge/transform.html -share/doc/fontforge/transform.png -share/doc/fontforge/transition-context.png -share/doc/fontforge/transition-indic.png -share/doc/fontforge/transition-insert.png -share/doc/fontforge/transition-kern.png -share/doc/fontforge/ttfinstrs-edit.png -share/doc/fontforge/ttfinstrs-view.png -share/doc/fontforge/ttfinstrs.html -share/doc/fontforge/tutorial-ja-hover.png -share/doc/fontforge/tutorial-ja.png -share/doc/fontforge/tutorial-zh_TW-hover.png -share/doc/fontforge/tutorial-zh_TW.png -share/doc/fontforge/twolines.png -share/doc/fontforge/u432Italic.png -share/doc/fontforge/u433Italic.png -share/doc/fontforge/ucEItalic.png -share/doc/fontforge/uitranslationnotes.html -share/doc/fontforge/uninstall.html -share/doc/fontforge/vItalic.png -share/doc/fontforge/validation.html -share/doc/fontforge/validation.png -share/doc/fontforge/viewmenu.html -share/doc/fontforge/views.html -share/doc/fontforge/vms-install.html -share/doc/fontforge/wItalic.png -share/doc/fontforge/wacom.html -share/doc/fontforge/windowmenu.html -share/doc/fontforge/x-height.png -share/doc/fontforge/xItalic.png -share/doc/fontforge/xim.html -share/doc/fontforge/xres.html share/fontforge/hotkeys/default share/fontforge/pixmaps/Cantarell-Bold.ttf share/fontforge/pixmaps/Cantarell-BoldOblique.ttf @@ -1184,9 +367,6 @@ share/fontforge/pixmaps/viewzoomout.png share/fontforge/pixmaps/wireframe.png share/fontforge/prefs share/fontforge/python/excepthook.py -share/fontforge/python/simple/expand-a.py -share/fontforge/python/simple/load-font-and-show-name.py -share/fontforge/python/test.sfd 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 @@ -1216,7 +396,6 @@ 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 diff --git a/fonts/fontforge/PLIST.Darwin b/fonts/fontforge/PLIST.Darwin deleted file mode 100644 index cb48e0e7714..00000000000 --- a/fonts/fontforge/PLIST.Darwin +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2008/11/01 09:51:59 adam Exp $ -share/locale/en/LC_MESSAGES/Mac-FontForge-MenuShortCuts.mo diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo index cdddebce2df..3281d341947 100644 --- a/fonts/fontforge/distinfo +++ b/fonts/fontforge/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.71 2020/05/24 12:00:51 markd Exp $ +$NetBSD: distinfo,v 1.72 2020/09/09 10:32:08 wiz Exp $ -SHA1 (fontforge-20190801.tar.gz) = b0a248b8c7709550347a8d8cf6d2dbbb2e28d252 -RMD160 (fontforge-20190801.tar.gz) = 1b8e8ba52dc35034e250c0b2cd9c4acef01794f2 -SHA512 (fontforge-20190801.tar.gz) = 78f3e1e94e38e26dcf52c6a0e038753033dc47052b7492f0ac0aaf1b8962e4e4bbf07c2550ef6014ea7290a6429bf669acb0691735efe0aee368480b4b7e6236 -Size (fontforge-20190801.tar.gz) = 20766334 bytes -SHA1 (patch-configure) = aef6f9b16cbde58d3ae691c79c0cb5011f8bb8af +SHA1 (fontforge-20200314.tar.xz) = 63c13a6f1773b04f87342a2553e28be844401498 +RMD160 (fontforge-20200314.tar.xz) = c7368a53f6a5b6649f7bc18a957368006870b67b +SHA512 (fontforge-20200314.tar.xz) = 09f5dc93f87ca63668d72d108690604489d6b3cec7eedff1c07ad6d1ce5eae442ab60e79e71ae8b99e9808f3551011788025a86ffc3a9738518d99761d849975 +Size (fontforge-20200314.tar.xz) = 13850076 bytes SHA1 (patch-fontforge_splinefont.h) = be7739b6145b3c622913efa9f2d679860c35cccb -SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b diff --git a/fonts/fontforge/hacks.mk b/fonts/fontforge/hacks.mk deleted file mode 100644 index 527a7f562ed..00000000000 --- a/fonts/fontforge/hacks.mk +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: hacks.mk,v 1.2 2017/05/04 19:23:18 adam Exp $ - -# On NetBSD 7.x for a while a version of freetype2 that was supposed -# to have ftttdrv.h was shipped without actually installing that -# header. This causes fontforge-20150824 and up to fail to build. - -.include "../../mk/bsd.prefs.mk" - -.if ${X11_TYPE} == "native" && !empty(MACHINE_PLATFORM:MNetBSD-7.*) && \ - !exists(/usr/X11R7/include/freetype2/ftttdrv.h) -BUILDLINK_TARGETS+= buildlink-freetype2-ftttdrv.h -buildlink-freetype2-ftttdrv.h: - ${RUN} \ - dest=${BUILDLINK_DIR}"/include/freetype2/ftttdrv.h"; \ - ${ECHO_BUILDLINK_MSG} "Hacking around missing ftttdrv.h"; \ - ${ECHO} '#define TT_INTERPRETER_VERSION_35 35' >> "$$dest"; \ - ${ECHO} '#define TT_INTERPRETER_VERSION_38 38' >> "$$dest" -.endif diff --git a/fonts/fontforge/patches/patch-configure b/fonts/fontforge/patches/patch-configure deleted file mode 100644 index 9f7b607e552..00000000000 --- a/fonts/fontforge/patches/patch-configure +++ /dev/null @@ -1,96 +0,0 @@ -$NetBSD: patch-configure,v 1.5 2020/05/24 12:00:51 markd Exp $ - -Remove unsupported date argument. -Python 3.8 requires different pkg_config call. - ---- configure.orig 2019-08-01 09:12:22.865001000 +0000 -+++ configure -@@ -21315,11 +21315,11 @@ if test -n "$PYTHON_CFLAGS"; then - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"" 2>/dev/null` -+ pkg_cv_PYTHON_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -21332,11 +21332,11 @@ if test -n "$PYTHON_LIBS"; then - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"" 2>/dev/null` -+ pkg_cv_PYTHON_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -21357,9 +21357,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1` -+ PYTHON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1` - else -- PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1` -+ PYTHON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$PYTHON_PKG_ERRORS" >&5 -@@ -21384,11 +21384,11 @@ if test -n "$PYTHONDEV_CFLAGS"; then - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"" 2>/dev/null` -+ pkg_cv_PYTHONDEV_CFLAGS=`$PKG_CONFIG --cflags "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -21401,11 +21401,11 @@ if test -n "$PYTHONDEV_LIBS"; then - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"python-\"\${PYTHON_VERSION}\"\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "python-"${PYTHON_VERSION}"@EMBED@") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"" 2>/dev/null` -+ pkg_cv_PYTHONDEV_LIBS=`$PKG_CONFIG --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes - else - pkg_failed=yes -@@ -21426,9 +21426,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1` -+ PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1` - else -- PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"" 2>&1` -+ PYTHONDEV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "python-"${PYTHON_VERSION}"@EMBED@" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$PYTHONDEV_PKG_ERRORS" >&5 -@@ -26865,7 +26865,7 @@ FONTFORGE_DATE_NOW=${SOURCE_DATE_EPOCH:- - FONTFORGE_DATE_OPTS="--date=@${FONTFORGE_DATE_NOW}" - if ! date --version 2>/dev/null ; then - # Use POSIX date instead of GNU date on BSD systems -- FONTFORGE_DATE_OPTS="-j -f %s ${FONTFORGE_DATE_NOW}" -+ FONTFORGE_DATE_OPTS="-j ${FONTFORGE_DATE_NOW}" - fi - FONTFORGE_MODTIME="$(date -u $FONTFORGE_DATE_OPTS +'%s')L" - FONTFORGE_MODTIME_STR="$(date -u $FONTFORGE_DATE_OPTS +'%H:%M %Z %e-%b-%Y')" diff --git a/fonts/fontforge/patches/patch-po_Makefile.in b/fonts/fontforge/patches/patch-po_Makefile.in deleted file mode 100644 index 3e90e21a435..00000000000 --- a/fonts/fontforge/patches/patch-po_Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-po_Makefile.in,v 1.1 2016/03/14 15:37:47 tnn Exp $ - ---check trips up gettext 0.14. - ---- po/Makefile.in.orig 2015-08-25 09:53:09.000000000 +0000 -+++ po/Makefile.in -@@ -1396,7 +1396,7 @@ uninstall-am: uninstall-local - - - .po.mo: -- $(MSGFMT) --check --output-file=$@ $< -+ $(MSGFMT) --output-file=$@ $< - - all-local: $(MO_FILES) - -- cgit v1.2.3