<pre style='margin:0'>
Leonardo Brondani Schenkel (lbschenkel) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/695b9c4a8a8b775fe74d9e2428c6124fbeb9fd60">https://github.com/macports/macports-ports/commit/695b9c4a8a8b775fe74d9e2428c6124fbeb9fd60</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 695b9c4a8a8 argyll: fix for macOS 10.15 (backwards-compatible)
</span>695b9c4a8a8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 695b9c4a8a8b775fe74d9e2428c6124fbeb9fd60
</span>Author: Leonardo Brondani Schenkel <lbschenkel@macports.org>
AuthorDate: Mon Nov 9 09:06:10 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> argyll: fix for macOS 10.15 (backwards-compatible)
</span>---
graphics/argyll/Portfile | 4 ++
graphics/argyll/files/patch-obj_msgSend.diff | 70 ++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/argyll/Portfile b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dfcb4292fef..33e2f26f1aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/argyll/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,6 +45,10 @@ post-extract {
</span> delete ${worksrcpath}/zlib
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://www.freelists.org/post/argyllcms/Patch-Fix-macOS-build-failures-from-obj-msgSend-definition-change
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-obj_msgSend.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
build.env-append HAVE_JPEG=true
build.env-append HAVE_PNG=true
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/argyll/files/patch-obj_msgSend.diff b/graphics/argyll/files/patch-obj_msgSend.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4fa7ded526c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/argyll/files/patch-obj_msgSend.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/numlib/numsup.c b/numlib/numsup.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 435e1ec..12f2a73 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/numlib/numsup.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/numlib/numsup.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -841,17 +841,17 @@ void osx_userinitiated_start() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Get the process instance */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((pi = objc_msgSend((id)pic, pis)) == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((pi = ((id (*)(id, SEL))objc_msgSend)((id)pic, pis)) == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a reason string */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- str = objc_msgSend((id)objc_getClass("NSString"), sel_getUid("alloc"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- str = objc_msgSend(str, sel_getUid("initWithUTF8String:"), "ArgyllCMS");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ str = ((id (*)(id, SEL))objc_msgSend)((id)objc_getClass("NSString"), sel_getUid("alloc"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ str = ((id (*)(id, SEL, char*))objc_msgSend)(str, sel_getUid("initWithUTF8String:"), "ArgyllCMS");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Start activity that tells App Nap to mind its own business. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* NSActivityUserInitiatedAllowingIdleSystemSleep */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- osx_userinitiated_activity = objc_msgSend(pi, bawo, 0x00FFFFFFULL, str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ osx_userinitiated_activity = ((id (*)(id, SEL, uint64_t, id))objc_msgSend)(pi, bawo, 0x00FFFFFFULL, str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Done with user initiated */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -860,8 +860,8 @@ void osx_userinitiated_end() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osx_userinitiated_cnt--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (osx_userinitiated_cnt == 0 && osx_userinitiated_activity != nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a1logd(g_log, 7, "OS X - User Initiated Activity end");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- objc_msgSend(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- objc_msgSend((id)objc_getClass("NSProcessInfo"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((id (*)(id, SEL, id))objc_msgSend)(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((id (*)(id, SEL))objc_msgSend)((id)objc_getClass("NSProcessInfo"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sel_getUid("processInfo")), sel_getUid("endActivity:"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osx_userinitiated_activity);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osx_userinitiated_activity = nil;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -900,17 +900,17 @@ void osx_latencycritical_start() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Get the process instance */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((pi = objc_msgSend((id)pic, pis)) == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((pi = ((id (*)(id, SEL))objc_msgSend)((id)pic, pis)) == nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Create a reason string */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- str = objc_msgSend((id)objc_getClass("NSString"), sel_getUid("alloc"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- str = objc_msgSend(str, sel_getUid("initWithUTF8String:"), "Measuring Color");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ str = ((id (*)(id, SEL))objc_msgSend)((id)objc_getClass("NSString"), sel_getUid("alloc"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ str = ((id (*)(id, SEL, char*))objc_msgSend)(str, sel_getUid("initWithUTF8String:"), "Measuring Color");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Start activity that tells App Nap to mind its own business. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* NSActivityUserInitiatedAllowingIdleSystemSleep | NSActivityLatencyCritical */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- osx_latencycritical_activity = objc_msgSend(pi, bawo, 0x00FFFFFFULL | 0xFF00000000ULL, str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ osx_latencycritical_activity = ((id (*)(id, SEL, uint64_t, id))objc_msgSend)(pi, bawo, 0x00FFFFFFULL | 0xFF00000000ULL, str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Done with latency critical */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -919,8 +919,8 @@ void osx_latencycritical_end() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osx_latencycritical_cnt--;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (osx_latencycritical_cnt == 0 && osx_latencycritical_activity != nil) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a1logd(g_log, 7, "OS X - Latency Critical Activity end");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- objc_msgSend(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- objc_msgSend((id)objc_getClass("NSProcessInfo"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((id (*)(id, SEL, id))objc_msgSend)(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((id (*)(id, SEL))objc_msgSend)((id)objc_getClass("NSProcessInfo"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sel_getUid("processInfo")), sel_getUid("endActivity:"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osx_latencycritical_activity);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ osx_latencycritical_activity = nil;
</span></pre><pre style='margin:0'>
</pre>