Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Sep 2019 22:20:07 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r511370 - in head/print/fontforge: . files
Message-ID:  <201909062220.x86MK7sa064441@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Fri Sep  6 22:20:07 2019
New Revision: 511370
URL: https://svnweb.freebsd.org/changeset/ports/511370

Log:
  print/fontforge: Update to 20190801
  
  * Update to 20190801
  * Update distinfo
  * Update pkg-plist
  * Move most required things to options (only required LIB_DEPENDS is
    freetype2 and only required GNOME use is glib20 and libxml2)
  * USES autoreconf no longer needs to have the build argument because they
    made their bootstrap be just running autoreconf and not all the other
    junk it did before
  * USES localbase in favor of setting CPPFLAGS and LDFLAGS to those
  * iconv is forced on despite being an option as the build fails without
    iconv for some reason
  * Included options for some things that were not options before but are
    configurable via GNU configure
  * Removed patches from files: patch-Makefile.am (uthash not used anymore),
    patch-fontforge_cvexport.c and patch-fontforge_print.c (that code was
    removed and the patch is not needed anymore),
    patch-fontforge_splinefont.h (looking at SVN history, this was added
    to fix build for 8.x, but that isn't supported anymore and it builds
    without this)
  * Added patch to files: patch-m4-fontforge__arg__enable.m4 (without this,
    woff2 was always being enabled regardless of --enable/disable-woff2
    being set)
  
  Changelog:
  
  https://github.com/fontforge/fontforge/releases/tag/20190801
  
  PR:		239768
  Submitted by:	kunda
  Approved by:	Naram Qashat (maintainer)

Added:
  head/print/fontforge/files/patch-m4_fontforge__arg__enable.m4   (contents, props changed)
Deleted:
  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/files/patch-fontforge_splinefont.h
Modified:
  head/print/fontforge/Makefile
  head/print/fontforge/distinfo
  head/print/fontforge/pkg-plist

Modified: head/print/fontforge/Makefile
==============================================================================
--- head/print/fontforge/Makefile	Fri Sep  6 21:36:11 2019	(r511369)
+++ head/print/fontforge/Makefile	Fri Sep  6 22:20:07 2019	(r511370)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fontforge
-PORTVERSION=	20190413
+PORTVERSION=	20190801
 CATEGORIES=	print
 
 MAINTAINER=	cyberbotx@cyberbotx.com
@@ -11,31 +11,16 @@ COMMENT=	Type 1/TrueType/OpenType/bitmap font editor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash \
-		${LOCALBASE}/bin/gnulib-tool:devel/gnulib
-LIB_DEPENDS=	libuninameslist.so:textproc/libuninameslist \
-		libtiff.so:graphics/tiff \
-		libpng.so:graphics/png \
-		libgif.so:graphics/giflib \
-		libspiro.so:graphics/libspiro \
-		libfreetype.so:print/freetype2 \
-		libltdl.so:devel/libltdl \
-		libfontconfig.so:x11-fonts/fontconfig
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-USES=		autoreconf:build compiler desktop-file-utils gettext \
-		gmake gnome iconv jpeg libtool pkgconfig python \
-		readline:port shared-mime-info shebangfix
+USES=		autoreconf compiler gettext gmake gnome iconv:wchar_t libtool \
+		localbase pkgconfig
 USE_GITHUB=	yes
-USE_XORG=	ice sm x11 xi xkbui xft
-USE_GNOME=	cairo glib20 gtk20 libxml2 pango
+USE_GNOME=	glib20 libxml2
 
-SHEBANG_FILES=	pycontrib/gdraw/__init__.py \
-		pycontrib/gdraw/gdraw.py
+# It seems that iconv is required regardless of this setting, so forcing it on
+CONFIGURE_ARGS=	--with-iconv
 
-CONFIGURE_ARGS=	--enable-tile-path --enable-gtk2-use
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
@@ -43,29 +28,78 @@ INSTALLS_ICONS=	yes
 
 PORTDOCS=	* .htaccess
 
-OPTIONS_DEFINE=	DOCS FREETYPE CAIRO PYTHON
+OPTIONS_DEFINE=	CAIRO DOCS FREETYPE GIF JPEG PNG PYTHON READLINE SPIRO TIFF \
+		TILEPATH UNINAMESLIST WOFF2 WRITEPFM
+OPTIONS_GROUP=	GUI
+OPTIONS_GROUP_GUI=	GTK3 X11
+OPTIONS_SINGLE=	THEME
+OPTIONS_SINGLE_THEME=	TANGO 2012
+OPTIONS_DEFAULT=CAIRO GIF GTK3 JPEG PNG PYTHON READLINE SPIRO TANGO TIFF \
+		TILEPATH UNINAMESLIST WOFF2
 OPTIONS_SUB=	yes
-FREETYPE_DESC=	Include freetype's internal debugger
 
+2012_DESC=	Old theme that was used until 2012
+2012_CONFIGURE_ENABLE=	theme-2012
+
+CAIRO_USE=	gnome=cairo,pango
+CAIRO_CONFIGURE_WITH=	cairo
+CAIRO_IMPLIES=	PNG
+
+FREETYPE_DESC=	Include freetype's internal debugger
 FREETYPE_PATCH_DEPENDS=	${NONEXISTENT}:print/freetype2:extract
 FREETYPE_CONFIGURE_ENABLE=	freetype-debugger=${WRKSRC}/freetype
 
-CAIRO_CONFIGURE_WITH=	cairo
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+GIF_CONFIGURE_WITH=	giflib
 
+GTK3_USE=	gnome=gtk30
+GTK3_CONFIGURE_ENABLE=	gdk
+GTK3_IMPLIES=	CAIRO X11
+
+JPEG_USES=	jpeg
+JPEG_CONFIGURE_WITH=	libjpeg
+
+PNG_LIB_DEPENDS=libpng.so:graphics/png
+PNG_CONFIGURE_WITH=	libpng
+
+PYTHON_USES=	python:3.5-3.7
+PYTHON_USES_OFF=python:3.5-3.7,build
 PYTHON_CONFIGURE_ENABLE=	python-scripting python-extension
 
+READLINE_USES=	readline:port
+READLINE_CONFIGURE_WITH=	libreadline
+
+SPIRO_DESC=	Use libspiro to edit with clothoid splines
+SPIRO_LIB_DEPENDS=	libspiro.so:graphics/libspiro
+SPIRO_CONFIGURE_WITH=	libspiro
+
+TANGO_DESC=	Default theme based on the Tango Desktop Project
+
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_CONFIGURE_WITH=	libtiff
+
+TILEPATH_DESC=	Enable a 'tile path' command (a variant of 'expand stroke')
+TILEPATH_CONFIGURE_ENABLE=	tile-path
+
+UNINAMESLIST_DESC=	Use libuninameslist for Unicode attribute data
+UNINAMESLIST_LIB_DEPENDS=	libuninameslist.so:textproc/libuninameslist
+UNINAMESLIST_CONFIGURE_WITH=	libuninameslist
+
+WOFF2_DESC=	WOFF2 web font support
+WOFF2_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
+			libwoff2dec.so:devel/woff2
+WOFF2_CONFIGURE_ENABLE=	woff2
+
+WRITEPFM_DESC=	Add ability to save PFM file w/o creating associated font file
+WRITEPFM_CONFIGURE_ENABLE=	write-pfm
+
+X11_USES=	desktop-file-utils shared-mime-info xorg
+X11_USE=	gnome=pango xorg=ice,sm,x11,xft,xi
+X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+X11_RUN_DEPENDS=	${LOCALBASE}/share/fonts/gnu-unifont/unifont.pcf.gz:x11-fonts/gnu-unifont
+X11_CONFIGURE_WITH=	x
+
 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
-# can be passed into it. autoreconf is called here because I want to run it without
-# libtoolize being run along with it.
-pre-configure:
-	(cd ${WRKSRC} && \
-		${SH} -c '. ./bootstrap.conf ; \
-		${LOCALBASE}/bin/libtoolize -i -c -q ; \
-		${LOCALBASE}/bin/gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \
-		export LIBTOOLIZE=true ; ${AUTORECONF} -f -i)
 
 .include <bsd.port.mk>

Modified: head/print/fontforge/distinfo
==============================================================================
--- head/print/fontforge/distinfo	Fri Sep  6 21:36:11 2019	(r511369)
+++ head/print/fontforge/distinfo	Fri Sep  6 22:20:07 2019	(r511370)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558768709
-SHA256 (fontforge-fontforge-20190413_GH0.tar.gz) = d3b60f22d7a52fc2b11e1bd515ab7ba3176f8a3228330d2aea4d076896fe025d
-SIZE (fontforge-fontforge-20190413_GH0.tar.gz) = 24380527
+TIMESTAMP = 1567124778
+SHA256 (fontforge-fontforge-20190801_GH0.tar.gz) = e4501de5bd8e7f6c68fe7d3abd4667bf44a07b981d342ffa00e8f42e155ce633
+SIZE (fontforge-fontforge-20190801_GH0.tar.gz) = 21082347

Added: head/print/fontforge/files/patch-m4_fontforge__arg__enable.m4
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/fontforge/files/patch-m4_fontforge__arg__enable.m4	Fri Sep  6 22:20:07 2019	(r511370)
@@ -0,0 +1,11 @@
+--- m4/fontforge_arg_enable.m4.orig	2019-08-01 08:28:36 UTC
++++ m4/fontforge_arg_enable.m4
+@@ -232,7 +232,7 @@ AC_DEFUN([FONTFORGE_ARG_ENABLE_WOFF2],
+ AC_ARG_ENABLE([woff2],
+         [AS_HELP_STRING([--enable-woff2],
+                 [Enable WOFF2 support.])],
+-        [use_woff2=yes])
++        [use_woff2="${enableval}"])
+ if test x$use_woff2 = xyes ; then
+     PKG_CHECK_MODULES([WOFF2],[libwoff2enc,libwoff2dec],
+     [

Modified: head/print/fontforge/pkg-plist
==============================================================================
--- head/print/fontforge/pkg-plist	Fri Sep  6 21:36:11 2019	(r511369)
+++ head/print/fontforge/pkg-plist	Fri Sep  6 22:20:07 2019	(r511370)
@@ -12,11 +12,8 @@ include/fontforge/bitmapcontrol.h
 include/fontforge/carbon.h
 include/fontforge/chardata.h
 include/fontforge/charset.h
-include/fontforge/configure-fontforge.h
-include/fontforge/cvruler.h
 include/fontforge/delta.h
 include/fontforge/dlist.h
-include/fontforge/dynamic.h
 include/fontforge/edgelist.h
 include/fontforge/edgelist2.h
 include/fontforge/encoding.h
@@ -25,8 +22,8 @@ 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-version-extras.h
 include/fontforge/fontforge.h
 include/fontforge/fontforgevw.h
 include/fontforge/fvmetrics.h
@@ -39,7 +36,6 @@ 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
 include/fontforge/gresource.h
@@ -47,14 +43,15 @@ 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/libffstamp.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
@@ -69,8 +66,8 @@ 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/usermenu.h
 include/fontforge/ustring.h
 include/fontforge/utype.h
 include/fontforge/views.h
@@ -82,10 +79,10 @@ lib/libfontforgeexe.a
 lib/libfontforgeexe.so
 lib/libfontforgeexe.so.3
 lib/libfontforgeexe.so.3.0.0
-lib/libgdraw.a
-lib/libgdraw.so
-lib/libgdraw.so.6
-lib/libgdraw.so.6.0.0
+%%X11%%lib/libgdraw.a
+%%X11%%lib/libgdraw.so
+%%X11%%lib/libgdraw.so.6
+%%X11%%lib/libgdraw.so.6.0.0
 lib/libgunicode.a
 lib/libgunicode.so
 lib/libgunicode.so.5
@@ -102,37 +99,22 @@ man/man1/fontforge.1.gz
 man/man1/fontimage.1.gz
 man/man1/fontlint.1.gz
 man/man1/sfddiff.1.gz
-share/appdata/org.fontforge.FontForge.appdata.xml
-share/applications/org.fontforge.FontForge.desktop
+%%X11%%share/appdata/org.fontforge.FontForge.appdata.xml
+%%X11%%share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/hotkeys/default
-%%DATADIR%%/nodejs/collabwebview/client.html
-%%DATADIR%%/nodejs/collabwebview/css/print.css
-%%DATADIR%%/nodejs/collabwebview/css/styles.css
-%%DATADIR%%/nodejs/collabwebview/index.html
-%%DATADIR%%/nodejs/collabwebview/js/constants.js
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/component.json
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/contenteditable.jquery.json
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/example.html
-%%DATADIR%%/nodejs/collabwebview/js/contentEditable/jquery.contenteditable.js
-%%DATADIR%%/nodejs/collabwebview/js/fontdrag.js
-%%DATADIR%%/nodejs/collabwebview/js/jquery-1.9.1.min.js
-%%DATADIR%%/nodejs/collabwebview/js/jquery.masonry.min.js
-%%DATADIR%%/nodejs/collabwebview/js/otfeatures.js
-%%DATADIR%%/nodejs/collabwebview/package.json
-%%DATADIR%%/nodejs/collabwebview/server.js
-%%DATADIR%%/pixmaps/Cantarell-Bold.ttf
-%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf
-%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf
-%%DATADIR%%/pixmaps/Cantarell-Regular.ttf
-%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf
-%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf
-%%DATADIR%%/pixmaps/OFL.txt
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Bold.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-BoldOblique.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Oblique.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Cantarell-Regular.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Bold.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/Inconsolata-Regular.ttf
+%%TANGO%%%%DATADIR%%/pixmaps/OFL.txt
 %%DATADIR%%/pixmaps/changeweight.png
 %%DATADIR%%/pixmaps/charviewicon.xbm
-%%DATADIR%%/pixmaps/check_off_disabled.png
-%%DATADIR%%/pixmaps/check_off.png
-%%DATADIR%%/pixmaps/check_on_disabled.png
-%%DATADIR%%/pixmaps/check_on.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_off.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_off_disabled.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_on.png
+%%TANGO%%%%DATADIR%%/pixmaps/check_on_disabled.png
 %%DATADIR%%/pixmaps/chooseraudio.png
 %%DATADIR%%/pixmaps/chooserback.png
 %%DATADIR%%/pixmaps/chooserbookmark.png
@@ -148,7 +130,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/choosermacttf.png
 %%DATADIR%%/pixmaps/choosernobookmark.png
 %%DATADIR%%/pixmaps/chooserobject.png
-%%DATADIR%%/pixmaps/choosersfdir.png
+%%TANGO%%%%DATADIR%%/pixmaps/choosersfdir.png
 %%DATADIR%%/pixmaps/choosertar.png
 %%DATADIR%%/pixmaps/choosertextbdf.png
 %%DATADIR%%/pixmaps/choosertextc.png
@@ -166,7 +148,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/chooserupdir.png
 %%DATADIR%%/pixmaps/chooservideo.png
 %%DATADIR%%/pixmaps/colorwheel.png
-%%DATADIR%%/pixmaps/downarrow.png
+%%TANGO%%%%DATADIR%%/pixmaps/downarrow.png
 %%DATADIR%%/pixmaps/editclear.png
 %%DATADIR%%/pixmaps/editclearback.png
 %%DATADIR%%/pixmaps/editcopy.png
@@ -182,7 +164,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/editfind.png
 %%DATADIR%%/pixmaps/editjoin.png
 %%DATADIR%%/pixmaps/editmerge.png
-%%DATADIR%%/pixmaps/editmergetoline.png
+%%TANGO%%%%DATADIR%%/pixmaps/editmergetoline.png
 %%DATADIR%%/pixmaps/editpaste.png
 %%DATADIR%%/pixmaps/editpasteafter.png
 %%DATADIR%%/pixmaps/editpasteinto.png
@@ -230,7 +212,14 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/elementvbaselines.png
 %%DATADIR%%/pixmaps/exclude.png
 %%DATADIR%%/pixmaps/extendcondense.png
+%%DATADIR%%/pixmaps/fflogo.png
+%%DATADIR%%/pixmaps/fflogo13.png
+%%DATADIR%%/pixmaps/ffsplash1.png
+%%DATADIR%%/pixmaps/ffsplash2.png
+%%DATADIR%%/pixmaps/ffsplash3.png
 %%DATADIR%%/pixmaps/fileclose.png
+%%TANGO%%%%DATADIR%%/pixmaps/fileclose2.png
+%%DATADIR%%/pixmaps/filedisplay.png
 %%DATADIR%%/pixmaps/fileexecute.png
 %%DATADIR%%/pixmaps/fileexport.png
 %%DATADIR%%/pixmaps/filegenerate.png
@@ -249,13 +238,6 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/filesave.png
 %%DATADIR%%/pixmaps/filesaveall.png
 %%DATADIR%%/pixmaps/filesaveas.png
-%%DATADIR%%/pixmaps/fflogo.png
-%%DATADIR%%/pixmaps/fflogo13.png
-%%DATADIR%%/pixmaps/ffsplash1.png
-%%DATADIR%%/pixmaps/ffsplash2.png
-%%DATADIR%%/pixmaps/ffsplash3.png
-%%DATADIR%%/pixmaps/fileclose2.png
-%%DATADIR%%/pixmaps/filedisplay.png
 %%DATADIR%%/pixmaps/findinter.png
 %%DATADIR%%/pixmaps/fliphor.png
 %%DATADIR%%/pixmaps/flipvert.png
@@ -287,48 +269,48 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/overlapfindinter.png
 %%DATADIR%%/pixmaps/overlapintersection.png
 %%DATADIR%%/pixmaps/overlaprm.png
+%%TANGO%%%%DATADIR%%/pixmaps/palette3drotate-selected.png
 %%DATADIR%%/pixmaps/palette3drotate.png
-%%DATADIR%%/pixmaps/palette3drotate-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettecorner-selected.png
 %%DATADIR%%/pixmaps/palettecorner.png
-%%DATADIR%%/pixmaps/palettecorner-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettecurve-selected.png
 %%DATADIR%%/pixmaps/palettecurve.png
-%%DATADIR%%/pixmaps/palettecurve-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteelipse-selected.png
 %%DATADIR%%/pixmaps/paletteelipse.png
-%%DATADIR%%/pixmaps/paletteelipse-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteflip-selected.png
 %%DATADIR%%/pixmaps/paletteflip.png
-%%DATADIR%%/pixmaps/paletteflip-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettefreehand-selected.png
 %%DATADIR%%/pixmaps/palettefreehand.png
-%%DATADIR%%/pixmaps/palettefreehand-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettehand-selected.png
 %%DATADIR%%/pixmaps/palettehand.png
-%%DATADIR%%/pixmaps/palettehand-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettehvcurve-selected.png
 %%DATADIR%%/pixmaps/palettehvcurve.png
-%%DATADIR%%/pixmaps/palettehvcurve-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteknife-selected.png
 %%DATADIR%%/pixmaps/paletteknife.png
-%%DATADIR%%/pixmaps/paletteknife-selected.png
 %%DATADIR%%/pixmaps/paletteline.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettemagnify-selected.png
 %%DATADIR%%/pixmaps/palettemagnify.png
-%%DATADIR%%/pixmaps/palettemagnify-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettepen-selected.png
 %%DATADIR%%/pixmaps/palettepen.png
-%%DATADIR%%/pixmaps/palettepen-selected.png
 %%DATADIR%%/pixmaps/palettepencil.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteperspective-selected.png
 %%DATADIR%%/pixmaps/paletteperspective.png
-%%DATADIR%%/pixmaps/paletteperspective-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettepointer-selected.png
 %%DATADIR%%/pixmaps/palettepointer.png
-%%DATADIR%%/pixmaps/palettepointer-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettepoly-selected.png
 %%DATADIR%%/pixmaps/palettepoly.png
-%%DATADIR%%/pixmaps/palettepoly-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletterect-selected.png
 %%DATADIR%%/pixmaps/paletterect.png
-%%DATADIR%%/pixmaps/paletterect-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletterotate-selected.png
 %%DATADIR%%/pixmaps/paletterotate.png
-%%DATADIR%%/pixmaps/paletterotate-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteruler-selected.png
 %%DATADIR%%/pixmaps/paletteruler.png
-%%DATADIR%%/pixmaps/paletteruler-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettescale-selected.png
 %%DATADIR%%/pixmaps/palettescale.png
-%%DATADIR%%/pixmaps/palettescale-selected.png
-%%DATADIR%%/pixmaps/paletteselectedbg.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteselectedbg.png
 %%DATADIR%%/pixmaps/paletteshift.png
+%%TANGO%%%%DATADIR%%/pixmaps/paletteskew-selected.png
 %%DATADIR%%/pixmaps/paletteskew.png
-%%DATADIR%%/pixmaps/paletteskew-selected.png
 %%DATADIR%%/pixmaps/palettesmall3drotate.png
 %%DATADIR%%/pixmaps/palettesmallcorner.png
 %%DATADIR%%/pixmaps/palettesmallcurve.png
@@ -355,24 +337,24 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/palettesmallspiroright.png
 %%DATADIR%%/pixmaps/palettesmallstar.png
 %%DATADIR%%/pixmaps/palettesmalltangent.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespirocorner-selected.png
 %%DATADIR%%/pixmaps/palettespirocorner.png
-%%DATADIR%%/pixmaps/palettespirocorner-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespirocurve-selected.png
 %%DATADIR%%/pixmaps/palettespirocurve.png
-%%DATADIR%%/pixmaps/palettespirocurve-selected.png
 %%DATADIR%%/pixmaps/palettespirodisabled.png
 %%DATADIR%%/pixmaps/palettespirodown.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespirog2curve-selected.png
 %%DATADIR%%/pixmaps/palettespirog2curve.png
-%%DATADIR%%/pixmaps/palettespirog2curve-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespiroleft-selected.png
 %%DATADIR%%/pixmaps/palettespiroleft.png
-%%DATADIR%%/pixmaps/palettespiroleft-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespiroright-selected.png
 %%DATADIR%%/pixmaps/palettespiroright.png
-%%DATADIR%%/pixmaps/palettespiroright-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettespiroup-selected.png
 %%DATADIR%%/pixmaps/palettespiroup.png
-%%DATADIR%%/pixmaps/palettespiroup-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettestar-selected.png
 %%DATADIR%%/pixmaps/palettestar.png
-%%DATADIR%%/pixmaps/palettestar-selected.png
+%%TANGO%%%%DATADIR%%/pixmaps/palettetangent-selected.png
 %%DATADIR%%/pixmaps/palettetangent.png
-%%DATADIR%%/pixmaps/palettetangent-selected.png
 %%DATADIR%%/pixmaps/pointsG2curve.png
 %%DATADIR%%/pixmaps/pointsaddanchor.png
 %%DATADIR%%/pixmaps/pointscorner.png
@@ -390,11 +372,11 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/ptinfohvcurve.png
 %%DATADIR%%/pixmaps/ptinfotangent.png
 %%DATADIR%%/pixmaps/python.png
-%%DATADIR%%/pixmaps/radio_off_disabled.png
-%%DATADIR%%/pixmaps/radio_off.png
-%%DATADIR%%/pixmaps/radio_on_disabled.png
-%%DATADIR%%/pixmaps/radio_on.png
-%%DATADIR%%/pixmaps/resources
+%%TANGO%%%%DATADIR%%/pixmaps/radio_off.png
+%%TANGO%%%%DATADIR%%/pixmaps/radio_off_disabled.png
+%%TANGO%%%%DATADIR%%/pixmaps/radio_on.png
+%%TANGO%%%%DATADIR%%/pixmaps/radio_on_disabled.png
+%%TANGO%%%%DATADIR%%/pixmaps/resources
 %%DATADIR%%/pixmaps/rmoverlap.png
 %%DATADIR%%/pixmaps/rotate180.png
 %%DATADIR%%/pixmaps/rotateccw.png
@@ -420,7 +402,7 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/stylessmallcaps.png
 %%DATADIR%%/pixmaps/stylessubsuper.png
 %%DATADIR%%/pixmaps/styleswireframe.png
-%%DATADIR%%/pixmaps/text12210.png
+%%TANGO%%%%DATADIR%%/pixmaps/text12210.png
 %%DATADIR%%/pixmaps/tools3drotate.png
 %%DATADIR%%/pixmaps/toolselipse.png
 %%DATADIR%%/pixmaps/toolsflip.png
@@ -473,36 +455,27 @@ share/applications/org.fontforge.FontForge.desktop
 %%DATADIR%%/pixmaps/viewzoomout.png
 %%DATADIR%%/pixmaps/wireframe.png
 %%DATADIR%%/prefs
-%%PYTHON%%%%DATADIR%%/python/collab/sessionjoin-and-change-c.py
-%%PYTHON%%%%DATADIR%%/python/collab/sessionjoin-and-save-to-out.sfd.py
-%%PYTHON%%%%DATADIR%%/python/collab/sessionstart.py
-%%PYTHON%%%%DATADIR%%/python/collab/web-test-collab.py
 %%PYTHON%%%%DATADIR%%/python/excepthook.py
-%%DATADIR%%/python/gdraw/README
-%%DATADIR%%/python/gdraw/__init__.py
-%%DATADIR%%/python/gdraw/_gdraw.py
-%%DATADIR%%/python/gdraw/gdraw.html
-%%DATADIR%%/python/gdraw/gdraw.py
-%%DATADIR%%/python/webcollab.py
 %%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/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
+%%X11%%share/icons/hicolor/128x128/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/16x16/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/22x22/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/24x24/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/256x256/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/32x32/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/48x48/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/512x512/apps/org.fontforge.FontForge.png
+%%X11%%share/icons/hicolor/64x64/apps/org.fontforge.FontForge.png
+%%X11%%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
 share/locale/en_GB/LC_MESSAGES/FontForge.mo
 share/locale/es/LC_MESSAGES/FontForge.mo
 share/locale/fr/LC_MESSAGES/FontForge.mo
+share/locale/hr/LC_MESSAGES/FontForge.mo
 share/locale/it/LC_MESSAGES/FontForge.mo
 share/locale/ja/LC_MESSAGES/FontForge.mo
 share/locale/ko/LC_MESSAGES/FontForge.mo
@@ -514,8 +487,9 @@ 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
+%%X11%%share/metainfo/org.fontforge.FontForge.appdata.xml
+%%X11%%share/metainfo/org.fontforge.FontForge.metainfo.xml
+%%X11%%share/mime/packages/fontforge.xml
+%%X11%%share/pixmaps/org.fontforge.FontForge.png
+%%X11%%share/pixmaps/org.fontforge.FontForge.xpm
+%%NO_PYTHON%%@dir %%DATADIR%%/python



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909062220.x86MK7sa064441>