<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/791c20f9daea67d57a86cc3b632ff5a673c867b6">https://github.com/macports/macports-ports/commit/791c20f9daea67d57a86cc3b632ff5a673c867b6</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 791c20f gegl: fix build with glib2 1.54+
</span>791c20f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 791c20f9daea67d57a86cc3b632ff5a673c867b6
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Wed Oct 4 16:53:08 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gegl: fix build with glib2 1.54+
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As part of the old introspection patch, this port
</span><span style='display:block; white-space:pre;color:#404040;'> patches gegl-enums.h. This in turn causes the build
</span><span style='display:block; white-space:pre;color:#404040;'> to try and regenerate gegl-enums.c using the glib-mkenums
</span><span style='display:block; white-space:pre;color:#404040;'> utility provided as part of glib2's GObject API.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Unfortunately, for reasons that are still not clear, the
</span><span style='display:block; white-space:pre;color:#404040;'> new python implementation of glib-mkenums provided in glib2
</span><span style='display:block; white-space:pre;color:#404040;'> 1.54+ chokes on this conversion.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As a work-around, this commit patches gegl-enums.c to match
</span><span style='display:block; white-space:pre;color:#404040;'> the patched gegl-enums.h, as generated in earlier versions,
</span><span style='display:block; white-space:pre;color:#404040;'> allowing the build to complete as before and without tempting
</span><span style='display:block; white-space:pre;color:#404040;'> the build to try and use glib-mkenums.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Note that this problem is specific to gegl and not the newer
</span><span style='display:block; white-space:pre;color:#404040;'> versions gegl-0.3 and gegl-devel which now include a properly
</span><span style='display:block; white-space:pre;color:#404040;'> generated gegl-enums.c in the upstream git repo.
</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/54932
</span>---
graphics/gegl/Portfile | 1 +
graphics/gegl/files/gegl-enums.c.patch | 55 ++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/Portfile b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d34043..ff3e359 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +49,7 @@ depends_lib port:babl \
</span> port:vala
patchfiles patch-fix-introspection.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gegl-enums.c.patch \
</span> patch-configure.ac.diff \
patch-use-intltoolize.diff \
patch-examples-Makefile.am.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/gegl-enums.c.patch b/graphics/gegl/files/gegl-enums.c.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8babd6c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl/files/gegl-enums.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/gegl-enums.c.orig 2017-10-03 23:30:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/gegl-enums.c 2017-10-03 23:33:15.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (etype == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const GEnumValue values[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { GEGL_ABYSS_NONE, "none", "none" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { GEGL_ABYSS_CLAMP, "clamp", "clamp" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { GEGL_ABYSS_LOOP, "loop", "loop" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { GEGL_ABYSS_BLACK, "black", "black" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { GEGL_ABYSS_WHITE, "white", "white" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { 0, NULL, NULL }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ etype = g_enum_register_static ("GeglAbyssPolicy", values);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,41 +43,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return etype;
</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;'>+-GType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gegl_ripple_wave_type_get_type (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static GType etype = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (etype == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static const GEnumValue values[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGl_RIPPLE_WAVE_TYPE_SINE, "sine", "sine" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGl_RIPPLE_WAVE_TYPE_SAWTOOTH, "sawtooth", "sawtooth" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { 0, NULL, NULL }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- etype = g_enum_register_static ("GeglRippleWaveType", values);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return etype;
</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;'>+-GType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gegl_warp_behavior_get_type (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static GType etype = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (etype == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static const GEnumValue values[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGL_WARP_BEHAVIOR_MOVE, "move", "move" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGL_WARP_BEHAVIOR_GROW, "grow", "grow" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGL_WARP_BEHAVIOR_SHRINK, "shrink", "shrink" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGL_WARP_BEHAVIOR_SWIRL_CW, "swirl-cw", "swirl-cw" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGL_WARP_BEHAVIOR_SWIRL_CCW, "swirl-ccw", "swirl-ccw" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGL_WARP_BEHAVIOR_ERASE, "erase", "erase" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { GEGL_WARP_BEHAVIOR_SMOOTH, "smooth", "smooth" },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { 0, NULL, NULL }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- etype = g_enum_register_static ("GeglWarpBehavior", values);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return etype;
</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><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>