<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/e9edde1869b5df6cb44c65368d494b5f8b3cae1c">https://github.com/macports/macports-ports/commit/e9edde1869b5df6cb44c65368d494b5f8b3cae1c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e9edde1869b5df6cb44c65368d494b5f8b3cae1c
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Apr 30 07:24:36 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> tkimg: update version 1.4.9->1.4.10
</span>---
graphics/tkimg/Portfile | 8 ++++----
graphics/tkimg/files/patch-quartz.diff | 17 ++++++++---------
2 files changed, 12 insertions(+), 13 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 7651365..7f64462 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.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.10
</span> categories graphics
license Tcl/Tk
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,9 +18,9 @@ master_sites sourceforge:tkimg/tkimg/[join [lrange [split ${version} .]
</span> distname Img-${version}-Source
worksrcdir Img-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 6580f462a5729b1e3060c2b97603bf34427bdc42 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 89aa029d9352de02c483857bc85b27af52f1b77907ee276047e13e894d1e3629 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7702460
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a612e5f18790ed6496d9dcc68dbf6af742bc4ffb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e65ceb5d9d4c5b2189c0aa298250dd696b51e17b991aec753ca25be47fa0436a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7503331
</span>
# ensure tkimg works when tk is installed +quartz
patchfiles-append patch-quartz.diff
<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 96764b7..9e5fcf1 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,12 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pixmap/pixmapUnix.c.orig 2014-12-27 15:05:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pixmap/pixmapUnix.c 2019-03-09 15:40:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,11 +13,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pixmap/pixmapUnix.c.orig 2020-04-30 07:19:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pixmap/pixmapUnix.c 2020-04-30 07:18:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,11 +13,14 @@
</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>
#ifdef MAC_OSX_TK
+#include <X11_tk/Xlib.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,15 +17,15 @@
</span> #endif
typedef struct PixmapData {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- window/window.c.orig 2018-09-14 08:53:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ window/window.c 2019-03-09 15:32:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- window/window.c.orig 2020-04-30 07:21:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ window/window.c 2020-04-30 07:21:04.000000000 -0700
</span> @@ -13,13 +13,14 @@
#include "init.c"
-#include "X11/Xutil.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __WIN32__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ifndef MAC_OSX_TK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if !defined(__WIN32__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if !defined(MAC_OSX_TK)
</span> -# include "X11/Xproto.h"
+# include <X11/Xutil.h>
+# include <X11/Xproto.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +35,6 @@
</span> +# include <X11_tk/Xutil.h>
+# include <X11_tk/Xlib.h>
+# include <X11_tk/Xfuncproto.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # undef X_GetImage
</span> # endif
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "X11/Xlib.h"
</span></pre><pre style='margin:0'>
</pre>