<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/54d1900729392a18435c04bbdf94c87cb708d482">https://github.com/macports/macports-ports/commit/54d1900729392a18435c04bbdf94c87cb708d482</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 54d19007293 epiphany: fix build with meson 0.60+, dependencies, rebuild
</span>54d19007293 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 54d1900729392a18435c04bbdf94c87cb708d482
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Aug 29 17:15:11 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> epiphany: fix build with meson 0.60+, dependencies, rebuild
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * explicitly add gettext dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * update python3 build scripts to use python310
</span>---
gnome/epiphany/Portfile | 11 +++++++----
gnome/epiphany/files/fix-i18n-issue-meson-0.60.patch | 18 ++++++++++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/Portfile b/gnome/epiphany/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa832040d9d..9338ab45653 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/epiphany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup meson 1.0
</span>
name epiphany
version 3.36.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description A GNOME Web browser.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +28,13 @@ checksums rmd160 a18c01eb4221258a213b141fa4d413f61235ca97 \
</span> depends_build-append \
port:pkgconfig \
port:appstream-glib \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext \
</span> port:itstool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python310
</span>
depends_lib-append port:desktop-file-utils \
port:gcr \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gettext-runtime \
</span> port:gsettings-desktop-schemas \
path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
port:icu \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,10 +63,11 @@ configure.cppflags-append -DBUILDING_GTK__
</span> # see https://gitlab.gnome.org/GNOME/epiphany/-/commit/929f8f4d9e89c7751e6a6f15c1915349a2851c97
patchfiles patch-post-install-python.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revert-getrandom-929f8f4d.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revert-getrandom-929f8f4d.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fix-i18n-issue-meson-0.60.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PYTHON3@@|${prefix}/bin/python3.9|g" post_install.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON3@@|${prefix}/bin/python3.10|g" post_install.py
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/fix-i18n-issue-meson-0.60.patch b/gnome/epiphany/files/fix-i18n-issue-meson-0.60.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..317c1aba57c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/epiphany/files/fix-i18n-issue-meson-0.60.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- data/meson.build.orig 2022-08-29 16:47:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ data/meson.build 2022-08-29 16:49:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,7 +16,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop_conf = configuration_data()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop_conf.set('icon', application_id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ desktop = i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'desktop',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: files('org.gnome.Epiphany.desktop.in.in'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output: 'org.gnome.Epiphany.desktop.in',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +31,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata_conf = configuration_data()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata_conf.set('appid', application_id)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ appdata = i18n.merge_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'appdata',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: configure_file(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ input: files('org.gnome.Epiphany.appdata.xml.in.in'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output: 'org.gnome.Epiphany.appdata.xml.in',
</span></pre><pre style='margin:0'>
</pre>