<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/154136086d14a0044a25aba90ea7826ca9b7f89a">https://github.com/macports/macports-ports/commit/154136086d14a0044a25aba90ea7826ca9b7f89a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 154136086d14a0044a25aba90ea7826ca9b7f89a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Sep 1 04:00:07 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gtkglext: avoid name conflict with strings.h func
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56260
</span>---
devel/gtkglext/Portfile | 5 ++++-
devel/gtkglext/files/patch-strings.h.diff | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gtkglext/Portfile b/devel/gtkglext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 011bda1..5b9fb72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gtkglext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gtkglext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name gtkglext
version 1.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span> categories devel
license LGPL-2.1+
maintainers lifehertz.com:jd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,9 @@ patchfiles patch-examples-pixmap-mixed.c.diff \
</span> patch-examples-pixmap.c.diff \
patch-gtk-gtkglwidget.c.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/56260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-strings.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --x-include=${prefix}/include \
--x-lib=${prefix}/lib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gtkglext/files/patch-strings.h.diff b/devel/gtkglext/files/patch-strings.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..749bcf3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gtkglext/files/patch-strings.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdk/gdkglshapes.c.orig 2018-09-01 03:18:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdk/gdkglshapes.c 2018-09-01 03:36:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -549,7 +549,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {-Z, -X, 0}
</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;'>+-static int index[20][3] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int bindex[20][3] =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {0, 4, 1},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {0, 9, 4},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -579,7 +579,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 19; i >= 0; i--) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- drawtriangle(i, idata, index, shadeType);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ drawtriangle(i, idata, bindex, shadeType);
</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;'>+
</span></pre><pre style='margin:0'>
</pre>