<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/d75f0e1119ec8cfb8edbadc888dbb3ee15d09a93">https://github.com/macports/macports-ports/commit/d75f0e1119ec8cfb8edbadc888dbb3ee15d09a93</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 d75f0e1 epiphany: update to version 3.22.7
</span>d75f0e1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d75f0e1119ec8cfb8edbadc888dbb3ee15d09a93
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Nov 7 14:49:11 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> epiphany: update to version 3.22.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply upstream post-release patches.
</span>---
gnome/epiphany/Portfile | 9 ++--
.../files/patch-fix-crash-when-download-fails.diff | 56 ++++++++++++++++++++++
.../patch-fix-null-or-empty-string-check.diff | 27 +++++++++++
3 files changed, 89 insertions(+), 3 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 7d52c7b..d1d298f 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name epiphany
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.22.7
</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;'>@@ -19,8 +19,8 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 4a76e74d32e99a1a68d59218fbb9156cda40c817 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 de7ea87dc450702bde620033f9e2ce807859727d007396d86b09f2b82397fcc2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a7bbeb9d6b6a4b87eedbc048ea605d7b3ba9314b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a15b7ec19644eec8d40ce11286bbca28ac188202b47e2b9fc593ab0974e9c784
</span>
depends_build port:pkgconfig \
port:intltool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,6 +96,9 @@ platform darwin {
</span> port:yelp-tools
depends_lib-append path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-fix-null-or-empty-string-check.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-crash-when-download-fails.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/patch-fix-crash-when-download-fails.diff b/gnome/epiphany/files/patch-fix-crash-when-download-fails.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5263bbb
</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/patch-fix-crash-when-download-fails.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 2019b026decfdae8829b198eaf17762ff6a5cf13 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Michael Catanzaro <mcatanzaro@igalia.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 2 Jul 2017 12:07:18 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: downloads-manager: Fix crash when download fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It's wrong to acquire the session inhibitor when destination is created,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+because the download could fail before that point, causing the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+inhibitotr to be released before it has been acquired and triggering our
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+assertions to ensure this does not happen.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Instead, acquire the inhibitor immediately when creating the download.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://bugzilla.gnome.org/show_bug.cgi?id=778653
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ embed/ephy-downloads-manager.c | 11 ++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/embed/ephy-downloads-manager.c b/embed/ephy-downloads-manager.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a2c13c4..d61e168 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- embed/ephy-downloads-manager.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ embed/ephy-downloads-manager.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -155,12 +155,6 @@ download_estimated_progress_changed_cb (EphyDownloadsManager *manager)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_signal_emit (manager, signals[ESTIMATED_PROGRESS_CHANGED], 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 void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-download_created_destination_cb (EphyDownloadsManager *manager)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ephy_downloads_manager_acquire_session_inhibitor (manager);
</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;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ephy_downloads_manager_add_download (EphyDownloadsManager *manager,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EphyDownload *download)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,6 +167,8 @@ ephy_downloads_manager_add_download (EphyDownloadsManager *manager,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (g_list_find (manager->downloads, download))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ephy_downloads_manager_acquire_session_inhibitor (manager);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manager->downloads = g_list_prepend (manager->downloads, g_object_ref (download));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_signal_connect (download, "completed",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_CALLBACK (download_completed_cb),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,9 +181,6 @@ ephy_downloads_manager_add_download (EphyDownloadsManager *manager,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_signal_connect_swapped (wk_download, "notify::estimated-progress",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_CALLBACK (download_estimated_progress_changed_cb),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manager);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_signal_connect_swapped (wk_download, "created-destination",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- G_CALLBACK (download_created_destination_cb),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- manager);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_signal_emit (manager, signals[DOWNLOAD_ADDED], 0, download);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_signal_emit (manager, signals[ESTIMATED_PROGRESS_CHANGED], 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;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/patch-fix-null-or-empty-string-check.diff b/gnome/epiphany/files/patch-fix-null-or-empty-string-check.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..94450ff
</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/patch-fix-null-or-empty-string-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 656126c930dfb7c5eefd2fc1962fab178be86618 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Christian Hergert <chergert@redhat.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 6 Apr 2017 16:22:00 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: web-extension: fix NULL or empty string check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We need to compare against the character, not the pointer which
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is done immediately to the left of this comparison.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ embed/web-extension/ephy-web-extension.c | 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/embed/web-extension/ephy-web-extension.c b/embed/web-extension/ephy-web-extension.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 003f9ba..70971ef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- embed/web-extension/ephy-web-extension.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ embed/web-extension/ephy-web-extension.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1200,7 +1200,7 @@ handle_method_call (GDBusConnection *connection,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!web_page)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (base_uri == NULL || base_uri == '\0') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (base_uri == NULL || *base_uri == '\0') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Base URI cannot be NULL or empty");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>