<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/0b9b0e0461390ebe113ea47f82b79331fee7d054">https://github.com/macports/macports-ports/commit/0b9b0e0461390ebe113ea47f82b79331fee7d054</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 0b9b0e04613 links: Fix X detection
</span>0b9b0e04613 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0b9b0e0461390ebe113ea47f82b79331fee7d054
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Thu Nov 14 18:39:16 2024 -0600
<span style='display:block; white-space:pre;color:#404040;'> links: Fix X detection
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70504
</span>---
www/links/Portfile | 5 +++--
www/links/files/X.patch | 33 +++++++++++++++++++++++++++++++++
www/links/files/implicit.patch | 14 --------------
3 files changed, 36 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links/Portfile b/www/links/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b44bfb5710..94ca6f999bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/links/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,8 @@ checksums rmd160 e90763c244fc0e79f0e9ad4ce3d138be3cdc57bb \
</span> maintainers nomaintainer
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:bzip2 \
port:libevent \
port:xz \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +33,7 @@ depends_lib port:bzip2 \
</span>
openssl.branch 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles X.patch
</span>
configure.args --disable-graphics \
--disable-javascript \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links/files/X.patch b/www/links/files/X.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..343d1ae23e2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/links/files/X.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix X detection to work properly.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-07-27 08:25:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-11-14 18:14:04.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8941,7 +8941,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check for the libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test -z "$x_direct_test_library" && x_direct_test_library=Xt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -z "$x_direct_test_function" && x_direct_test_function='int XtMalloc'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See if we find them without any special options.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't add to $LIBS permanently.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8951,8 +8951,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #line 8943 "configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "confdefs.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <${x_direct_test_include}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-${x_direct_test_function}()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++${x_direct_test_function}(0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ; return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { (eval echo configure:8950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- rebuild.orig 2024-07-22 15:47:06.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ rebuild 2024-11-14 18:47:14.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -124,7 +124,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /DELETE1/-1,/DELETE1/d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /DELETE2/-1,/DELETE2/d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,s/^main/int main/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-,s/XtMalloc/'int XtMalloc'/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,s/foo()/int foo()/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ w
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ q
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/links/files/implicit.patch b/www/links/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b9293eddb86..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/links/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8951,8 +8951,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #line 8943 "configure"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "confdefs.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <X11/Intrinsic.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--${x_direct_test_function}()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+${x_direct_test_function}(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ; return 0; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (eval echo configure:8950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
</span></pre><pre style='margin:0'>
</pre>