CVS commit: pkgsrc/fonts/fontforge

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Nov 15 10:18:06 UTC 2017

Modified Files:
        pkgsrc/fonts/fontforge: distinfo
Added Files:
        pkgsrc/fonts/fontforge/patches: patch-fontforgeexe_startui.c

Log Message:
Fix building on newer macOS


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/fonts/fontforge/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_startui.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/fontforge/distinfo
diff -u pkgsrc/fonts/fontforge/distinfo:1.68 pkgsrc/fonts/fontforge/distinfo:1.69
--- pkgsrc/fonts/fontforge/distinfo:1.68        Mon Sep  4 21:13:22 2017
+++ pkgsrc/fonts/fontforge/distinfo     Wed Nov 15 10:18:06 2017
@@ -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-Makefile.in) = 5a7cad2f95165
 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

Added files:

Index: pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_startui.c
diff -u /dev/null pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_startui.c:1.1
--- /dev/null   Wed Nov 15 10:18:06 2017
+++ pkgsrc/fonts/fontforge/patches/patch-fontforgeexe_startui.c Wed Nov 15 10:18:06 2017
@@ -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 ) {