<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c9f306211f8759b379667bdc9e95d6146f098163">https://github.com/macports/macports-ports/commit/c9f306211f8759b379667bdc9e95d6146f098163</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c9f306211f8759b379667bdc9e95d6146f098163
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Thu Jun 22 03:26:25 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> psi: update to 1.5, fix for 10.14+
</span>---
net/psi/Portfile | 18 +++++++++++-------
net/psi/files/patch-xcode11.diff | 29 +++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/psi/Portfile b/net/psi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38982f970ff..ec077b2347c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/psi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/psi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name psi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net chat
maintainers {rowue @rowue}
description jabber-based instant messaging client
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,15 +13,13 @@ long_description \
</span> goals are simplicity and stability.
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> homepage https://psi-im.org/
master_sites sourceforge
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2f047baa0e2af16c949f6bb33667124253e231e4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 761934c1c62daf69215f085ba24d7f9cd4db05ef0ad735383d68fb03d21571ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2119840
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fbea608528f90d90b3acf76014e1a6312e39d340 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3167350fd43fab4dc948cb5179ca10159a7aa318472d1a8a7617e41f5aa8b5b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2125104
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +38,10 @@ if {${os.major} < 13} {
</span> patchfiles-append \
patch-os-compat.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} > 17} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-xcode11.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
depends_lib-append port:libidn \
port:minizip \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +60,8 @@ universal_variant no
</span> # Qt provides it's own optimization flag
configure.optflags
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# FIXME: older systems need a fix-up: https://github.com/psi-im/psi/issues/719
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant qt4 conflicts qt5 description "build Qt4 version of ${name}" {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/psi/files/patch-xcode11.diff b/net/psi/files/patch-xcode11.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..12a13633312
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/psi/files/patch-xcode11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/psi-im/psi/commit/73cd894861345ee7cca10e4296e455efa85c0f1d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CocoaUtilities/CocoaTrayClick.cpp.orig 2020-09-06 15:44:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CocoaUtilities/CocoaTrayClick.cpp 2023-06-22 02:36:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +28,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#define DEBUG_OUTPUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef objc_object* (*object_type)(struct objc_object *self, SEL _cmd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++object_type objc_msgSendObject = (object_type)objc_msgSend;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool dockClickHandler(id /*self*/, SEL /*_cmd*/, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CocoaTrayClick::instance()->emitTrayClicked();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,11 +50,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : QObject(qApp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Class cls = objc_getClass("NSApplication");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- objc_object *appInst = objc_msgSend((objc_object*)cls, sel_registerName("sharedApplication"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ objc_object *appInst = objc_msgSendObject((objc_object*)cls, sel_registerName("sharedApplication"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(appInst != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- objc_object* delegate = objc_msgSend(appInst, sel_registerName("delegate"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Class delClass = (Class)objc_msgSend(delegate, sel_registerName("class"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ objc_object* delegate = objc_msgSendObject(appInst, sel_registerName("delegate"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Class delClass = (Class)objc_msgSendObject(delegate, sel_registerName("class"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SEL shouldHandle = sel_registerName("applicationShouldHandleReopen:hasVisibleWindows:");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (class_getInstanceMethod(delClass, shouldHandle)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (class_replaceMethod(delClass, shouldHandle, (IMP)dockClickHandler, "B@:")) {
</span></pre><pre style='margin:0'>
</pre>