<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0501b5b95cf57c43a4b18c0c73639626b2fc24b8">https://github.com/macports/macports-ports/commit/0501b5b95cf57c43a4b18c0c73639626b2fc24b8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0501b5b95cf57c43a4b18c0c73639626b2fc24b8
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Thu Sep 5 22:42:27 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> fontforge: fix build on < SnowLeopard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add missing definition and use the older noErr macro names
</span>---
graphics/fontforge/Portfile | 6 +++
...orge-startui-require-noerr-and-SRefCon-fix.diff | 46 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/Portfile b/graphics/fontforge/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 82936cf..1ce555c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontforge/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,12 @@ configure.cflags-append -std=gnu11
</span> # fix 32bit builds by masking an old Carbon call to GetTime
patchfiles-append patch-fontforge-carbon-gettime-namecollision.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# use older noerr macros, and replace missing SRefCon definition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fontforge-startui-require-noerr-and-SRefCon-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --mandir=${prefix}/share/man \
--disable-python-scripting \
--disable-python-extension \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/patch-fontforge-startui-require-noerr-and-SRefCon-fix.diff b/graphics/fontforge/files/patch-fontforge-startui-require-noerr-and-SRefCon-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3403cfc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontforge/files/patch-fontforge-startui-require-noerr-and-SRefCon-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git ./fontforgeexe/startui.c.orig ./fontforgeexe/startui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 39ff112..8284db9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./fontforgeexe/startui.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./fontforgeexe/startui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,12 @@ extern uninm_blocks_db blocks_db;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __Mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void setup_cocoa_app();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* replace missing def on older MacOS systems */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef SRefCon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define SRefCon long
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef _NO_LIBPNG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -545,23 +551,23 @@ static OSErr install_apple_event_handlers(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = AEInstallEventHandler(kCoreEventClass, kAEOpenApplication,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NewAEEventHandlerUPP(OpenApplicationAE), 0, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __Require_noErr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ require_noerr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = AEInstallEventHandler(kCoreEventClass, kAEReopenApplication,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NewAEEventHandlerUPP(ReopenApplicationAE), 0, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __Require_noErr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ require_noerr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NewAEEventHandlerUPP(OpenDocumentsAE), 0, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __Require_noErr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ require_noerr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = AEInstallEventHandler(kCoreEventClass, kAEQuitApplication,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NewAEEventHandlerUPP(QuitApplicationAE), 0, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __Require_noErr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ require_noerr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = AEInstallEventHandler(kCoreEventClass, kAEShowPreferences,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NewAEEventHandlerUPP(ShowPreferencesAE), 0, false);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- __Require_noErr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ require_noerr(err, CantInstallAppleEventHandler);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* some debugging code, for now */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ( getenv("HOME")!=NULL ) {
</span></pre><pre style='margin:0'>
</pre>