<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/093051eb20b83586b564af99324a2cf021782707">https://github.com/macports/macports-ports/commit/093051eb20b83586b564af99324a2cf021782707</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 093051eb20b nxcomp: Reorganize so patch.dir is top-level dir
</span>093051eb20b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 093051eb20b83586b564af99324a2cf021782707
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Dec 13 20:01:42 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> nxcomp: Reorganize so patch.dir is top-level dir
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This allows files in the top-level dir, like version.sh, to be patched,
</span><span style='display:block; white-space:pre;color:#404040;'> should the need arise.
</span>---
net/nxcomp/Portfile | 10 ++++++----
net/nxcomp/files/bind.patch | 4 ++--
.../patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff | 4 ++--
3 files changed, 10 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/Portfile b/net/nxcomp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9eafaffb213..2a416845a13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nxcomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +24,13 @@ long_description nxcomp is a library compressing X commands to be passed
</span> homepage https://wiki.x2go.org/doku.php/wiki:libs:nx-libs
master_sites https://code.x2go.org/releases/source/nx-libs/
distname nx-libs-${version}-lite
<span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir nx-libs-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.dir ${workpath}/${worksrcdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir ${worksrcdir}/${subport}
</span>
universal_variant yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# We are patching Makefile.am.
</span> use_autoreconf yes
# https://trac.macports.org/wiki/WimplicitFunctionDeclaration#strchr
configure.checks.implicit_function_declaration.whitelist-append strchr
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +44,8 @@ post-configure {
</span> # In file included from /Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk/usr/include/c++/v1/ostream:142:
# ../version:1:1: error: expected unqualified-id
# 3.5.99.22
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/ArcticaProject/nx-libs/issues/1086
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The VERSION file must not be moved until after the configure phase.
</span> move ${worksrcpath}/VERSION ${worksrcpath}/VERSION.txt
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,8 +58,6 @@ if {${name} eq ${subport}} {
</span> port:zlib \
port:xorg-xorgproto
<span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir nx-libs-${version}/nxcomp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append bind.patch
livecheck.url [lindex ${master_sites} 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,8 +77,6 @@ subport nxproxy {
</span>
depends_lib-append port:nxcomp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir nx-libs-${version}/nxproxy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles-append patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff
configure.cppflags-append -I${prefix}/include/nx
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/bind.patch b/net/nxcomp/files/bind.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 624c74381ba..37f4a709592 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/files/bind.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nxcomp/files/bind.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@ Fix:
</span> Loop.cpp:4224:34: error: invalid operands to binary expression ('__bind<int &, sockaddr *&, unsigned int &>' and 'int')
https://github.com/ArcticaProject/nx-libs/issues/1044
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Loop.cpp.orig 2019-08-27 08:46:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Loop.cpp 2024-11-22 20:22:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nxcomp/src/Loop.cpp.orig 2019-08-27 08:46:39.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nxcomp/src/Loop.cpp 2024-11-22 20:22:54.000000000 -0600
</span> @@ -4221,7 +4221,7 @@
goto SetupSocketError;
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/nxcomp/files/patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff b/net/nxcomp/files/patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b724103ff6..bc4ac39d464 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/nxcomp/files/patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/nxcomp/files/patch-nxproxy_src_Makefile.am-use-system-libXcomp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.am.old 2019-04-23 12:04:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.am 2019-04-23 12:08:02.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- nxproxy/src/Makefile.am.orig 2019-04-23 12:04:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ nxproxy/src/Makefile.am 2019-04-23 12:08:02.000000000 +0200
</span> @@ -9,7 +9,7 @@ nxproxy_SOURCES = \
$(NULL)
</pre><pre style='margin:0'>
</pre>