<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/94a077483e1357f1cd532d31db8dff53f056ddbb">https://github.com/macports/macports-ports/commit/94a077483e1357f1cd532d31db8dff53f056ddbb</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 94a0774 tkimg: update to 1.4.9
</span>94a0774 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94a077483e1357f1cd532d31db8dff53f056ddbb
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Mar 9 15:47:38 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> tkimg: update to 1.4.9
</span>---
graphics/tkimg/Portfile | 11 ++---
graphics/tkimg/files/patch-quartz.diff | 78 +++++++++++++++++-----------------
2 files changed, 45 insertions(+), 44 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 ef5ab1c..7651365 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.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.4.9
</span> categories graphics
license Tcl/Tk
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,11 +15,12 @@ long_description The \"Img\" package adds a lot of image formats to Tcl/Tk.
</span> platforms darwin
master_sites sourceforge:tkimg/tkimg/[join [lrange [split ${version} .] 0 1] .]/tkimg%20${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname Img-Source-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname Img-${version}-Source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir Img-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0a3cb000acb2488b540fe74a0b540e99a1390d92 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5e513e0913e1f36f6802abf60cf9b8bfd6810bcc4b5a27c340e53bb4d12ab2ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7259144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6580f462a5729b1e3060c2b97603bf34427bdc42 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 89aa029d9352de02c483857bc85b27af52f1b77907ee276047e13e894d1e3629 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7702460
</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 569a7b4..96764b7 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,41 +1,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pixmap/pixmapUnix.c.orig 2017-12-30 09:09:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pixmap/pixmapUnix.c 2018-11-11 21:31:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pixmap/pixmapUnix.c.orig 2014-12-27 15:05:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pixmap/pixmapUnix.c 2019-03-09 15:40:56.000000000 -0600
</span> @@ -13,11 +13,15 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pixmapInt.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "X11/Xlib.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "X11/Xutil.h"
</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;'>- #ifdef MAC_OSX_TK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <X11_tk/Xlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <X11_tk/Xutil.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define XPutImage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <X11/Xutil.h>
</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;'>- typedef struct PixmapData {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- window/window.c.orig 2017-12-30 09:09:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ window/window.c 2018-11-11 21:40:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "pixmapInt.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "X11/Xlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "X11/Xutil.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef MAC_OSX_TK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11_tk/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11_tk/Xutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XPutImage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <X11/Xutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct PixmapData {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- window/window.c.orig 2018-09-14 08:53:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ window/window.c 2019-03-09 15:32:57.000000000 -0600
</span> @@ -13,13 +13,14 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "init.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "X11/Xutil.h"
</span><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:#ffe0e0;'>--# include "X11/Xproto.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <X11/Xutil.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <X11/Xproto.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include "X11/Xlib.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include "X11/Xfuncproto.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <X11_tk/Xutil.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <X11_tk/Xlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <X11_tk/Xfuncproto.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "X11/Xlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "init.c"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "X11/Xutil.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __WIN32__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ifndef MAC_OSX_TK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include "X11/Xproto.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <X11/Xutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <X11/Xproto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include "X11/Xlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# include "X11/Xfuncproto.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <X11_tk/Xutil.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <X11_tk/Xlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include <X11_tk/Xfuncproto.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include "X11/Xlib.h"
</span></pre><pre style='margin:0'>
</pre>