<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/d6817d05cc64b835d0f4a82836242cd704b3acba">https://github.com/macports/macports-ports/commit/d6817d05cc64b835d0f4a82836242cd704b3acba</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 d6817d05cc6 tkimg: update to 1.4.16
</span>d6817d05cc6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d6817d05cc64b835d0f4a82836242cd704b3acba
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Mon Nov 27 21:39:47 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> tkimg: update to 1.4.16
</span>---
graphics/tkimg/Portfile | 12 +++++-------
graphics/tkimg/files/no_tif_lerc.patch | 26 --------------------------
graphics/tkimg/files/patch-quartz.diff | 15 ++++++++-------
3 files changed, 13 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tkimg/Portfile b/graphics/tkimg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ab14be70215..c14c8d76496 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tkimg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tkimg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup active_variants 1.1
name tkimg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.4.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.16
</span> revision 0
categories graphics
license Tcl/Tk
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,17 +17,15 @@ platforms darwin
</span>
master_sites sourceforge:tkimg/tkimg/[join [lrange [split ${version} .] 0 1] .]/tkimg%20${version}
distname Img-${version}-Source
<span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.rename yes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 47cdda888476a5a0ed6c408cf8a6e6f7bdbbb3ec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2bd8615ee87197aca48dc7bfeef0749aac5c8c56ac499def94cc5a4700a59d73 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 12108837
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6b4fb4bd3558990ffc8aa4bb30246973027b5a7c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d99af4835fe3e20960817c7a1b5235dcfaa97c642593cce50bdb64c5827cd321 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 12129708
</span>
# ensure tkimg works when tk is installed +quartz
patchfiles-append patch-quartz.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://sourceforge.net/p/tkimg/bugs/114/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append no_tif_lerc.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # tkimg builds local copies of jpeg, libpng, and tiff
# Other package management systems have patches that allow tkimg to use external (MacPorts) versions.
# Unfortunately, these patches are highly intrusive and difficult to maintain.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tkimg/files/no_tif_lerc.patch b/graphics/tkimg/files/no_tif_lerc.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 435523c4d3e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tkimg/files/no_tif_lerc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: libtiff/configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libtiff/configure.ac (revision 666)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libtiff/configure.ac (revision 667)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TIFFHOST="$host"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${srcdir}/../compat/libtiff/configure --disable-zlib --disable-zstd --disable-lzma \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- --disable-pixarlog --disable-jpeg --disable-jbig --disable-webp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --disable-pixarlog --disable-jpeg --disable-jbig --disable-webp --disable-lerc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "--with-CC=$TIFFCC" $TIFFHOST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mv -f tifftcl_confdefs.h confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: libtiff/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libtiff/configure (revision 666)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libtiff/configure (revision 667)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5747,7 +5747,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TIFFHOST="$host"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${srcdir}/../compat/libtiff/configure --disable-zlib --disable-zstd --disable-lzma \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- --disable-pixarlog --disable-jpeg --disable-jbig --disable-webp \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --disable-pixarlog --disable-jpeg --disable-jbig --disable-webp --disable-lerc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "--with-CC=$TIFFCC" $TIFFHOST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mv -f tifftcl_confdefs.h confdefs.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/tkimg/files/patch-quartz.diff b/graphics/tkimg/files/patch-quartz.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ae76b2f05be..75f5a1e945c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/tkimg/files/patch-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/tkimg/files/patch-quartz.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pixmap/pixmapUnix.c.orig 2020-04-30 07:19:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pixmap/pixmapUnix.c 2020-04-30 07:18:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,11 +13,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Index: pixmap/pixmapUnix.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+==================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pixmap/pixmapUnix.c (revision 716)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pixmap/pixmapUnix.c (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,8 +13,13 @@
</span>
#include "pixmapInt.h"
#include <stdlib.h>
-#include "X11/Xlib.h"
-#include "X11/Xutil.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef MAC_OSX_TK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef MAC_OSX_TK
</span> +#include <X11_tk/Xlib.h>
+#include <X11_tk/Xutil.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #define XPutImage
</span> +#else
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span>
typedef struct PixmapData {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ Pixmap mask; /* Mask: only display pixmap pixels where
</span> --- window/window.c.orig 2023-04-03 08:24:00.000000000 +0000
+++ window/window.c 2023-08-21 12:42:04.000000000 -0500
@@ -13,13 +13,14 @@
</pre><pre style='margin:0'>
</pre>