summaryrefslogtreecommitdiff
path: root/fonts/fontforge
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2017-11-15 10:18:06 +0000
committeradam <adam@pkgsrc.org>2017-11-15 10:18:06 +0000
commit1060ffd2f5d1f6e7d01f2a6d7db0e444c3a132ea (patch)
tree09950d9959dda94dc8225542c7405c58f0dc85e6 /fonts/fontforge
parent5d4a72987a1b461f50af33d1db206014e76e0eea (diff)
downloadpkgsrc-1060ffd2f5d1f6e7d01f2a6d7db0e444c3a132ea.tar.gz
Fix building on newer macOS
Diffstat (limited to 'fonts/fontforge')
-rw-r--r--fonts/fontforge/distinfo3
-rw-r--r--fonts/fontforge/patches/patch-fontforgeexe_startui.c35
2 files changed, 37 insertions, 1 deletions
diff --git a/fonts/fontforge/distinfo b/fonts/fontforge/distinfo
index d6c895edce4..1b5d9072016 100644
--- a/fonts/fontforge/distinfo
+++ b/fonts/fontforge/distinfo
@@ -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) = 5a7cad2f9516540048008a13a257d6c9720a22c9
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 --git a/fonts/fontforge/patches/patch-fontforgeexe_startui.c b/fonts/fontforge/patches/patch-fontforgeexe_startui.c
new file mode 100644
index 00000000000..83318dde94f
--- /dev/null
+++ b/fonts/fontforge/patches/patch-fontforgeexe_startui.c
@@ -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 ) {