<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d75e07c5d03136cc940e0f7fda45b7613be38c80">https://github.com/macports/macports-ports/commit/d75e07c5d03136cc940e0f7fda45b7613be38c80</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 d75e07c psi: respect more MacPorts compiler flags
</span>d75e07c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d75e07c5d03136cc940e0f7fda45b7613be38c80
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Nov 27 19:13:03 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> psi: respect more MacPorts compiler flags
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/57684
</span>---
net/psi/Portfile | 14 +++++++++++++-
net/psi/files/patch-os-compat.diff | 11 +++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
<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 3cb43be..307a4bd 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;'>@@ -5,6 +5,7 @@ PortGroup cxx11 1.1
</span>
name psi
version 1.4
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories net chat
maintainers {rowue @rowue}
description jabber-based instant messaging client
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +35,10 @@ pre-configure {
</span> }
patchfiles-append patch-qt4-compat.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-os-compat.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;'>@@ -49,6 +54,9 @@ post-destroot {
</span> # Further research is required.
universal_variant no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Qt provides it's own optimization flag
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.optflags
</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;background:#e0e0e0;'>@@ -57,10 +65,14 @@ variant qt4 conflicts qt5 description "build Qt4 version of ${name}" {
</span>
pre-configure {
# port requires C++11 compiler
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/57684
</span> set extra_conf "
QMAKE_CXX=${configure.cxx}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LINK=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_CXXFLAGS+=\\\"${configure.cxxflags}\\\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKE_LFLAGS+=\\\"${configure.cxxflags}\\\"
</span> "
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --extraconf="[join ${extra_conf} \n]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --extraconf="${extra_conf}"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/psi/files/patch-os-compat.diff b/net/psi/files/patch-os-compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..6bd09e8
</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-os-compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CocoaUtilities/CocoaTrayClick.cpp.orig 2018-11-01 17:15:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CocoaUtilities/CocoaTrayClick.cpp 2018-11-27 19:04:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CocoaTrayClick::CocoaTrayClick()
</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;'>++ id 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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(appInst != NULL) {
</span></pre><pre style='margin:0'>
</pre>