<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/f9195cb126e64724373b10c59aa01774a3e7dc28">https://github.com/macports/macports-ports/commit/f9195cb126e64724373b10c59aa01774a3e7dc28</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 f9195cb126e gegl: add upstream build fixes for GIR and vala bindings
</span>f9195cb126e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f9195cb126e64724373b10c59aa01774a3e7dc28
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Oct 27 16:11:20 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gegl: add upstream build fixes for GIR and vala bindings
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Allows build to succeed when using +vala variant.
</span><span style='display:block; white-space:pre;color:#404040;'> No change in installed content for the default build.
</span>---
graphics/gegl/Portfile | 5 ++++
graphics/gegl/files/patch-explicit-vapi-deps.diff | 34 ++++++++++++++++++++++
.../patch-export_package-for-gir-generation.diff | 24 +++++++++++++++
graphics/gegl/files/patch-vapi-metadata-dirs.diff | 25 ++++++++++++++++
4 files changed, 88 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 d206f72e61a..96e2d38d433 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;'>@@ -64,6 +64,11 @@ depends_lib port:babl \
</span> # https://trac.macports.org/ticket/58524
patchfiles-append patch-gegl-32bit-host-statistics.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# various upstream gir/vala fixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-export_package-for-gir-generation.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-explicit-vapi-deps.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-vapi-metadata-dirs.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
# https://trac.macports.org/ticket/35148
if {${os.major} < 10} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/patch-explicit-vapi-deps.diff b/graphics/gegl/files/patch-explicit-vapi-deps.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a0231254360
</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/patch-explicit-vapi-deps.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 45dc1808778513e467ad73db90c427c4711994a4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel@collabora.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 14 Aug 2020 16:47:34 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] gegl: Explicit the vapi dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This makes sure that projects using gegl are also including glib-2.0, gobject-2.0 and babl-0.1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gegl/gegl.deps.in | 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gegl/meson.build | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete mode 100644 gegl/gegl.deps.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gegl/gegl.deps.in b/gegl/gegl.deps.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+deleted file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e69de29bb..000000000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gegl/meson.build b/gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c92110349..4eee76810 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,6 +137,11 @@ if get_option('introspection')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ metadata_dirs: '.',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources: gegl_gir[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ packages: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'glib-2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'gobject-2.0',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 'babl-0.1'
</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;'>+ endif
</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;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/patch-export_package-for-gir-generation.diff b/graphics/gegl/files/patch-export_package-for-gir-generation.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..db88d202d7b
</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/patch-export_package-for-gir-generation.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 26acf187810ad49a00dfb5c5d2226c860fb9e1dd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Rico Tzschichholz <ricotz@ubuntu.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 14 Aug 2020 17:35:36 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] meson: Pass export_package for GIR generation
</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;'>+ gegl/meson.build | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gegl/meson.build b/gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 514f62107..c92110349 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -122,6 +122,7 @@ if get_option('introspection')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symbol_prefix: 'gegl',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ header: 'gegl.h',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ includes: [ 'GLib-2.0', 'GObject-2.0', 'Babl-0.1' ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ export_packages: 'gegl-' + api_version,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</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;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl/files/patch-vapi-metadata-dirs.diff b/graphics/gegl/files/patch-vapi-metadata-dirs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..095512844cc
</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/patch-vapi-metadata-dirs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6cb1e4d5278f9a17e4a221fb1ed43f6e4c2a7b44 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Niels De Graef <nielsdegraef@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 13 Oct 2020 15:37:08 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] meson: Correctly add the VAPI metadata
</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;'>+ gegl/meson.build | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gegl/meson.build b/gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4eee76810..42d29d65c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gegl/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,7 +134,7 @@ if get_option('introspection')
</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;'>+ gnome.generate_vapi(api_name,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- metadata_dirs: '.',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ metadata_dirs: meson.current_source_dir(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sources: gegl_gir[0],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ packages: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>