[pkgsrc/trunk]: pkgsrc/fonts/fontforge Fix building on newer macOS

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/173d89e29c33
branches:  trunk
changeset: 371552:173d89e29c33
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Nov 15 10:18:06 2017 +0000

description:
Fix building on newer macOS

diffstat:

 fonts/fontforge/distinfo                             |   3 +-
 fonts/fontforge/patches/patch-fontforgeexe_startui.c |  35 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletions(-)

diffs (54 lines):

diff -r 36f1a22afba0 -r 173d89e29c33 fonts/fontforge/distinfo
--- a/fonts/fontforge/distinfo  Wed Nov 15 10:05:39 2017 +0000
+++ b/fonts/fontforge/distinfo  Wed Nov 15 10:18:06 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2017/09/04 21:13:22 jperkin Exp $
+$NetBSD: distinfo,v 1.69 2017/11/15 10:18:06 adam Exp $
 
 SHA1 (fontforge-dist-20170731.tar.xz) = 89ab434e523dbea8fd9f81907dda33f023055b05
 RMD160 (fontforge-dist-20170731.tar.xz) = af473f403999937dd95715bdfd98f582d05c94cd
@@ -8,4 +8,5 @@
 SHA1 (patch-configure) = 23c953855960f65c539d9ccd15df14fb6a9a2428
 SHA1 (patch-fontforge_splinefont.h) = eda077c87d3bba57a6b6fe0f62d83956e6e13bc1
 SHA1 (patch-fontforgeexe_Makefile.in) = 725a0a033132bf859917e8f28c5d0cbbad3eea0e
+SHA1 (patch-fontforgeexe_startui.c) = e390742321931ded9f5143fbe3dc2f81e5abbbdc
 SHA1 (patch-po_Makefile.in) = 75990b7371e5ce525deba693c651dbd5222e558b
diff -r 36f1a22afba0 -r 173d89e29c33 fonts/fontforge/patches/patch-fontforgeexe_startui.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/fontforge/patches/patch-fontforgeexe_startui.c      Wed Nov 15 10:18:06 2017 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-fontforgeexe_startui.c,v 1.1 2017/11/15 10:18:06 adam Exp $
+
+Fix building on newer macOS.
+
+--- fontforgeexe/startui.c.orig        2017-07-22 05:00:39.000000000 +0000
++++ fontforgeexe/startui.c
+@@ -516,23 +516,23 @@ static  OSErr install_apple_event_handle
+ 
+     err     = AEInstallEventHandler(kCoreEventClass, kAEOpenApplication,
+                 NewAEEventHandlerUPP(OpenApplicationAE), 0, false);
+-    require_noerr(err, CantInstallAppleEventHandler);
++    __Require_noErr(err, CantInstallAppleEventHandler);
+ 
+     err     = AEInstallEventHandler(kCoreEventClass, kAEReopenApplication,
+                 NewAEEventHandlerUPP(ReopenApplicationAE), 0, false);
+-    require_noerr(err, CantInstallAppleEventHandler);
++    __Require_noErr(err, CantInstallAppleEventHandler);
+ 
+     err     = AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
+                 NewAEEventHandlerUPP(OpenDocumentsAE), 0, false);
+-    require_noerr(err, CantInstallAppleEventHandler);
++    __Require_noErr(err, CantInstallAppleEventHandler);
+ 
+     err     = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication,
+                 NewAEEventHandlerUPP(QuitApplicationAE), 0, false);
+-    require_noerr(err, CantInstallAppleEventHandler);
++    __Require_noErr(err, CantInstallAppleEventHandler);
+ 
+     err     = AEInstallEventHandler(kCoreEventClass, kAEShowPreferences,
+                 NewAEEventHandlerUPP(ShowPreferencesAE), 0, false);
+-    require_noerr(err, CantInstallAppleEventHandler);
++    __Require_noErr(err, CantInstallAppleEventHandler);
+ 
+  /* some debugging code, for now */
+  if ( getenv("HOME")!=NULL ) {