<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/566e206bbd721a4c57a9ba0acdf6d8e0ba828174">https://github.com/macports/macports-ports/commit/566e206bbd721a4c57a9ba0acdf6d8e0ba828174</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 566e206bbd7 fontforge: update to 20201107
</span>566e206bbd7 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 566e206bbd721a4c57a9ba0acdf6d8e0ba828174
</span>Author: Evan Miller <emmiller@gmail.com>
AuthorDate: Sun Jan 9 10:31:39 2022 -0500

<span style='display:block; white-space:pre;color:#404040;'>    fontforge: update to 20201107
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/60409
</span>---
 graphics/fontforge/Portfile                            | 18 +++++++++++-------
 .../files/patch-fontforge-startui-SRefCon-tiger.diff   | 13 +++++++++++++
 ...diff => patch-fontforge-startui-require-noerr.diff} | 15 ---------------
 3 files changed, 24 insertions(+), 22 deletions(-)

<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 93c9052c6d5..90627a6ad78 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;'>@@ -5,8 +5,8 @@ PortGroup           github 1.0
</span> PortGroup           cmake 1.1
 PortGroup           compiler_blacklist_versions 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        fontforge fontforge 20200314
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        fontforge fontforge 20201107
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            0
</span> github.tarball_from releases
 use_xz              yes
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,9 @@ long_description    FontForge allows you to edit outline and bitmap fonts.  You
</span> 
 homepage            https://fontforge.org
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  c7368a53f6a5b6649f7bc18a957368006870b67b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  cd190b237353dc3f48ddca7b0b3439da8ec4fcf27911d14cc1ccc76c1a47c861 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    13850076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  25ef811489661aa66200c3d49a5e6f8951129d9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  68bcba8f602819eddc29cd356ee13fafbad7a80d19b652d354c6791343476c78 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    14163424
</span> 
 # don't override cmake build dependencies
 depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,16 +57,20 @@ compiler.blacklist-append {clang < 500}
</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:#ffe0e0;'>-# use older noerr macros, and replace missing SRefCon definition
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use older noerr macros
</span> if {${os.platform} eq "darwin" && ${os.major} <= 9} {
     patchfiles-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                patch-fontforge-startui-require-noerr-and-SRefCon-fix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                patch-fontforge-startui-require-noerr.diff \
</span> }
 
 # the date command on Tiger is too old for this port, use gnu coreutils dates instead
 platform darwin 8 {
     depends_build-append path:libexec/coreutils/libstdbuf.so:coreutils
     configure.env-append PATH=${prefix}/libexec/gnubin/:$env(PATH)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # add SRefCon definition, which is missing in the Tiger SDK
</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-SRefCon-tiger.diff \
</span> }
 
 configure.args-append -DENABLE_GUI=False \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/fontforge/files/patch-fontforge-startui-SRefCon-tiger.diff b/graphics/fontforge/files/patch-fontforge-startui-SRefCon-tiger.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bf7df00f52e
</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-SRefCon-tiger.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</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,10 @@ 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;'>++/* add missing def on older MacOS systems */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef long SRefCon;
</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;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.diff
</span>similarity index 82%
rename from graphics/fontforge/files/patch-fontforge-startui-require-noerr-and-SRefCon-fix.diff
rename to graphics/fontforge/files/patch-fontforge-startui-require-noerr.diff
<span style='display:block; white-space:pre;color:#808080;'>index 3403cfc2db9..be65285faee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/fontforge/files/patch-fontforge-startui-require-noerr-and-SRefCon-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/fontforge/files/patch-fontforge-startui-require-noerr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git ./fontforgeexe/startui.c.orig ./fontforgeexe/startui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 39ff112..8284db9 100644
</span> --- ./fontforgeexe/startui.c.orig
 +++ ./fontforgeexe/startui.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,12 @@ extern uninm_blocks_db blocks_db;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __Mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern void setup_cocoa_app();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* replace missing def on older MacOS systems */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef SRefCon
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define SRefCon long
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _NO_LIBPNG
</span> @@ -545,23 +551,23 @@ static  OSErr install_apple_event_handlers(void) {
  
      err     = AEInstallEventHandler(kCoreEventClass, kAEOpenApplication,
</pre><pre style='margin:0'>

</pre>