Date: Thu, 19 Sep 2019 14:11:04 +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: r512342 - in head/print/fontforge: . files Message-ID: <201909191411.x8JEB4Qw095550@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Thu Sep 19 14:11:04 2019 New Revision: 512342 URL: https://svnweb.freebsd.org/changeset/ports/512342 Log: print/fontforge: Fix timeout without GUI Add an upstream patch to fix a timeout when starting fontforge without any gui available, such as when running fontforge -version. This fixes delays when building for instance print/lilypond. PR: 240680 Approved by: Naram Qashat Added: head/print/fontforge/files/patch-fontforgeexe_startui.c (contents, props changed) Modified: head/print/fontforge/Makefile Modified: head/print/fontforge/Makefile ============================================================================== --- head/print/fontforge/Makefile Thu Sep 19 14:04:26 2019 (r512341) +++ head/print/fontforge/Makefile Thu Sep 19 14:11:04 2019 (r512342) @@ -3,7 +3,7 @@ PORTNAME= fontforge PORTVERSION= 20190801 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MAINTAINER= cyberbotx@cyberbotx.com Added: head/print/fontforge/files/patch-fontforgeexe_startui.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/fontforge/files/patch-fontforgeexe_startui.c Thu Sep 19 14:11:04 2019 (r512342) @@ -0,0 +1,25 @@ +--- fontforgeexe/startui.c.orig 2019-08-01 08:28:36 UTC ++++ fontforgeexe/startui.c +@@ -1099,10 +1099,6 @@ int fontforge_main( int argc, char **argv ) { + CheckIsScript(argc,argv); /* Will run the script and exit if it is a script */ + /* If there is no UI, there is always a script */ + /* and we will never return from the above */ +-#ifdef FONTFORGE_CAN_USE_GDK +- gdk_init(&argc, &argv); +- gdk_set_allowed_backends("win32,quartz,x11"); +-#endif + if ( load_prefs==NULL || + (strcasecmp(load_prefs,"Always")!=0 && /* Already loaded */ + strcasecmp(load_prefs,"Never")!=0 )) +@@ -1185,7 +1181,10 @@ int fontforge_main( int argc, char **argv ) { + } + #endif + } +- ++#ifdef FONTFORGE_CAN_USE_GDK ++ gdk_init(&argc, &argv); ++ gdk_set_allowed_backends("win32,quartz,x11"); ++#endif + ensureDotFontForgeIsSetup(); + #if defined(__MINGW32__) && !defined(_NO_LIBCAIRO) + //Load any custom fonts for the user interface
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909191411.x8JEB4Qw095550>