<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2982768a78e7a7cacadbe8f8db42561bedd4f531">https://github.com/macports/macports-ports/commit/2982768a78e7a7cacadbe8f8db42561bedd4f531</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 2982768a78e tix: specify X11 paths, patch cleanup
</span>2982768a78e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2982768a78e7a7cacadbe8f8db42561bedd4f531
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sun Jun 27 23:20:47 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> tix: specify X11 paths, patch cleanup
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Revert implicit function declaration fix attempt from 80d3dcac29:
</span><span style='display:block; white-space:pre;color:#404040;'> Tcl/Tk projects (as of 8.4) are to use Tcl_Panic() instead of panic(),
</span><span style='display:block; white-space:pre;color:#404040;'> and typically prefer to not include standard library headers directly
</span><span style='display:block; white-space:pre;color:#404040;'> from individual source files.
</span><span style='display:block; white-space:pre;color:#404040;'> macports#9400 was already open when the issue was reported via trac
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/61891
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> +x11 variant: provide explicit paths to ensure MacPorts' libX11 is used
</span>---
x11/tix/Portfile | 10 +++++--
x11/tix/files/implicit.patch | 51 --------------------------------
x11/tix/files/panic.patch | 3 ++
x11/tix/files/patch-missing-headers.diff | 5 ++++
4 files changed, 15 insertions(+), 54 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tix/Portfile b/x11/tix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a6b8c341d84..d30ee16e165 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup active_variants 1.1
</span>
name tix
version 8.4.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
categories x11
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,8 +35,7 @@ depends_lib port:tcl \
</span> patchfiles patch-generic-tixGrSort.c.diff \
patch-tk_x11.diff \
patch-dyld_variable.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tk_aqua.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-tk_aqua.diff
</span>
# Fix implicit function declarations
patchfiles-append patch-missing-headers.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +51,11 @@ variant quartz conflicts x11 {
</span>
variant x11 conflicts quartz {
require_active_variants tk x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-libraries=${prefix}/lib
</span> }
if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tix/files/implicit.patch b/x11/tix/files/implicit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3b7ada45889..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tix/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,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicitly declaring library function 'isspace' with type 'int (int)' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-error: implicit declaration of function 'panic' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2020-12-25 18:21:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2020-12-25 18:23:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3470,8 +3470,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < 256; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (XOR (islower (i), ISLOWER (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || toupper (i) != TOUPPER (i))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f conftest$ac_exeext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- generic/tixGrUtl.c.orig 2004-03-27 20:44:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ generic/tixGrUtl.c 2020-12-25 18:28:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tixPort.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tixInt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tixDef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- generic/tixImgXpm.c.orig 2008-02-27 22:05:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ generic/tixImgXpm.c 2020-12-25 18:38:10.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,6 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tixPort.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tixInt.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <tixImgXpm.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- generic/tixPort.h.orig 2020-12-25 18:27:26.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ generic/tixPort.h 2020-12-25 18:36:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+EXTERN void panic(char * format, ...);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTERN Tcl_HashTable * TixGetHashTable _ANSI_ARGS_((Tcl_Interp * interp,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char * name, Tcl_InterpDeleteProc *deleteProc,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int keyType));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tix/files/panic.patch b/x11/tix/files/panic.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index f19d61abff0..ce454a4a5bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tix/files/panic.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tix/files/panic.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'panic' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span> --- generic/tixDiStyle.c.orig 2004-03-27 20:44:56.000000000 -0600
+++ generic/tixDiStyle.c 2020-12-10 01:14:46.000000000 -0600
@@ -785,7 +785,7 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tix/files/patch-missing-headers.diff b/x11/tix/files/patch-missing-headers.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e584ac9c48c..fd150e81666 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tix/files/patch-missing-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tix/files/patch-missing-headers.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))' [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicitly declaring library function 'isspace' with type 'int (int)' [-Werror,-Wimplicit-function-declaration]
</span> --- configure.orig 2008-02-27 22:35:01.000000000 -0600
+++ configure 2020-12-10 02:54:53.000000000 -0600
@@ -3450,6 +3450,7 @@
</pre><pre style='margin:0'>
</pre>