diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2019-09-19 14:11:04 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2019-09-19 14:11:04 +0000 |
| commit | 05dae60737e53c872bd7aae9d5fcabc34ce4aa36 (patch) | |
| tree | 82fab8262c01517a673f10189ac00cfa20ebe1d0 /print/fontforge | |
| parent | 7800d020d89cd078fac25b59c9770526bfbc3f18 (diff) | |
| download | ports-05dae60737e53c872bd7aae9d5fcabc34ce4aa36.tar.gz ports-05dae60737e53c872bd7aae9d5fcabc34ce4aa36.zip | |
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
Notes
Notes:
svn path=/head/; revision=512342
Diffstat (limited to 'print/fontforge')
| -rw-r--r-- | print/fontforge/Makefile | 2 | ||||
| -rw-r--r-- | print/fontforge/files/patch-fontforgeexe_startui.c | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index c1f804098253..71da30af8307 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -3,7 +3,7 @@ PORTNAME= fontforge PORTVERSION= 20190801 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MAINTAINER= cyberbotx@cyberbotx.com diff --git a/print/fontforge/files/patch-fontforgeexe_startui.c b/print/fontforge/files/patch-fontforgeexe_startui.c new file mode 100644 index 000000000000..a7e23b7834a6 --- /dev/null +++ b/print/fontforge/files/patch-fontforgeexe_startui.c @@ -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 |