<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/da2357586d7b6117666c3aa540a382265a080e52">https://github.com/macports/macports-ports/commit/da2357586d7b6117666c3aa540a382265a080e52</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 da2357586d7 epiphany: update to version 3.36.4
</span>da2357586d7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit da2357586d7b6117666c3aa540a382265a080e52
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Nov 23 01:03:57 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> epiphany: update to version 3.36.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * use compiler.c_standard
</span><span style='display:block; white-space:pre;color:#404040;'> * use python39 for custom meson scripts
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies to use libhandy-0.0
</span><span style='display:block; white-space:pre;color:#404040;'> * revert use of getrandom() not supported by macOS
</span>---
gnome/epiphany/Portfile | 30 ++++++------
...rvice-stop-using-gnome_desktop_thumbnail_.patch | 32 -------------
gnome/epiphany/files/autogen.sh | 38 ---------------
gnome/epiphany/files/autogen.sh-3.8.2 | 24 ----------
gnome/epiphany/files/patch-configure.ac.diff | 20 --------
.../files/patch-fix-crash-when-download-fails.diff | 56 ----------------------
.../patch-fix-null-or-empty-string-check.diff | 27 -----------
.../epiphany/files/revert-getrandom-929f8f4d.patch | 47 ++++++++++++++++++
8 files changed, 62 insertions(+), 212 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 093a331dc6d..c0c36332dc4 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;'>@@ -2,11 +2,10 @@
</span>
PortSystem 1.0
PortGroup meson 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span>
name epiphany
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.32.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.36.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</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;'>@@ -22,18 +21,15 @@ master_sites gnome:sources/${name}/${branch}/
</span>
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 3.34.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Dependency gio-2.0 found: NO found '2.58.3' but need: '>= 2.61.2'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5e01941d4e4490a8dc2460f09e63850cc4f81794 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8832d3c1cf30b974d4638c185a42daccde7ebb21ebf805ee77dc4c2ca4aad7f9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5469624
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a18c01eb4221258a213b141fa4d413f61235ca97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5824436
</span>
depends_build-append \
port:pkgconfig \
port:appstream-glib \
port:itstool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python39
</span>
depends_lib-append port:desktop-file-utils \
port:gcr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +38,7 @@ depends_lib-append port:desktop-file-utils \
</span> port:icu \
port:iso-codes \
port:libdazzle \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libhandy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libhandy-0.0 \
</span> port:libsoup \
port:libsecret \
port:libnotify \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,8 +49,7 @@ depends_lib-append port:desktop-file-utils \
</span> depends_run port:adwaita-icon-theme \
port:gnome-keyring
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# error: invalid value 'gnu11' in '-std=gnu11'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 212}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span>
# fix the way the JSC_API_AVAILABLE macro works in WebKitAvailablity.h
# fixes JSValueRef.h:54:18: error: missing ',' between enumerators
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,9 +57,14 @@ compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 212}
</span> configure.cppflags-append -DBUILDING_GTK__
# specify a python3 version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-post-install-python.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# revert use of getrandom() not supported by macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://gitlab.gnome.org/GNOME/epiphany/-/commit/929f8f4d9e89c7751e6a6f15c1915349a2851c97
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-post-install-python.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revert-getrandom-929f8f4d.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PYTHON3@@|${prefix}/bin/python3.7|g" post_install.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PYTHON3@@|${prefix}/bin/python3.9|g" post_install.py
</span> }
post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/0001-snapshot-service-stop-using-gnome_desktop_thumbnail_.patch b/gnome/epiphany/files/0001-snapshot-service-stop-using-gnome_desktop_thumbnail_.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ccdb02e03cb..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/files/0001-snapshot-service-stop-using-gnome_desktop_thumbnail_.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 573bc6e262559ea07d4482163c1684dedc01219f Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Michael Catanzaro <mcatanzaro@gnome.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 12 Dec 2016 20:47:50 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] snapshot-service: stop using
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnome_desktop_thumbnail_scale_down_pixbuf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See bugs #775991 and #80925.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/ephy-snapshot-service.c | 7 ++++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git lib/ephy-snapshot-service.c lib/ephy-snapshot-service.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index acbdb59f1..43777a592 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/ephy-snapshot-service.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/ephy-snapshot-service.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,9 +135,10 @@ ephy_snapshot_service_prepare_snapshot (cairo_surface_t *surface,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- snapshot = gdk_pixbuf_get_from_surface (surface, x_offset, 0, new_width, new_height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- scaled = gnome_desktop_thumbnail_scale_down_pixbuf (snapshot,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EPHY_THUMBNAIL_WIDTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EPHY_THUMBNAIL_HEIGHT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ scaled = gdk_pixbuf_scale_simple (snapshot,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EPHY_THUMBNAIL_WIDTH,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EPHY_THUMBNAIL_HEIGHT,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDK_INTERP_BILINEAR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_object_unref (snapshot);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.16.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/autogen.sh b/gnome/epiphany/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ee6c0e09b25..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,38 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=`dirname "$0"`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$srcdir" || srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-olddir=`pwd`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f configure.ac) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** ERROR: Directory "\`$srcdir\'" does not look like the top-level project directory ***"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_NAME=`autoconf --trace 'AC_INIT:$1' configure.ac`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** WARNING: I am going to run \`configure' with no arguments." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** If you wish to pass any to it, please specify them on the" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "*** \`$0\' command line." >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "" >&2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aclocal --install || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-intltoolize --force --copy --automake || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf --verbose --force --install -Wno-portability || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $olddir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ "$NOCONFIGURE" = "" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $srcdir/configure "$@" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "$1" = "--help" ]; then exit 0 else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Now type \`make\' to compile $PKG_NAME" || exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Skipping configure process."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/autogen.sh-3.8.2 b/gnome/epiphany/files/autogen.sh-3.8.2
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 002c1c83021..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/files/autogen.sh-3.8.2
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-srcdir=`dirname $0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -z "$srcdir" && srcdir=.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PKG_NAME="epiphany"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(test -f $srcdir/src/ephy-window.c) || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " top-level $PKG_NAME directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-which gnome-autogen.sh || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "You need to install gnome-common from GNOME git and make"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "sure the gnome-autogen.sh script is in your \$PATH."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_AUTOMAKE_VERSION=1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_LIBTOOL_VERSION=2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-REQUIRED_INTLTOOL_VERSION=0.40.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-. gnome-autogen.sh
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/patch-configure.ac.diff b/gnome/epiphany/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63974055c85..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2015-03-25 08:15:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2015-03-25 08:16:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$enable_maintainer_mode" = "yes"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enable_debug=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DEPRECATION_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGSEAL_ENABLE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLIB_REQUIRED=2.35.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -90,7 +90,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AVAHI_REQUIRED=0.6.22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set to 'no' to build with the WebKit1 backend
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--with_webkit2=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+with_webkit2=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$with_webkit2" != xno; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WEBKIT_GTK_PC_NAME=webkit2gtk-3.0
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5263bbb4f9e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/files/patch-fix-crash-when-download-fails.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2019b026decfdae8829b198eaf17762ff6a5cf13 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Michael Catanzaro <mcatanzaro@igalia.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 2 Jul 2017 12:07:18 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: downloads-manager: Fix crash when download fails
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It's wrong to acquire the session inhibitor when destination is created,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-because the download could fail before that point, causing the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-inhibitotr to be released before it has been acquired and triggering our
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-assertions to ensure this does not happen.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Instead, acquire the inhibitor immediately when creating the download.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugzilla.gnome.org/show_bug.cgi?id=778653
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- embed/ephy-downloads-manager.c | 11 ++---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/embed/ephy-downloads-manager.c b/embed/ephy-downloads-manager.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a2c13c4..d61e168 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- embed/ephy-downloads-manager.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ embed/ephy-downloads-manager.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -155,12 +155,6 @@ download_estimated_progress_changed_cb (EphyDownloadsManager *manager)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_signal_emit (manager, signals[ESTIMATED_PROGRESS_CHANGED], 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--download_created_destination_cb (EphyDownloadsManager *manager)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ephy_downloads_manager_acquire_session_inhibitor (manager);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ephy_downloads_manager_add_download (EphyDownloadsManager *manager,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EphyDownload *download)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,6 +167,8 @@ ephy_downloads_manager_add_download (EphyDownloadsManager *manager,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (g_list_find (manager->downloads, download))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ephy_downloads_manager_acquire_session_inhibitor (manager);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- manager->downloads = g_list_prepend (manager->downloads, g_object_ref (download));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_signal_connect (download, "completed",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_CALLBACK (download_completed_cb),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,9 +181,6 @@ ephy_downloads_manager_add_download (EphyDownloadsManager *manager,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_signal_connect_swapped (wk_download, "notify::estimated-progress",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_CALLBACK (download_estimated_progress_changed_cb),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- manager);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- g_signal_connect_swapped (wk_download, "created-destination",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- G_CALLBACK (download_created_destination_cb),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- manager);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_signal_emit (manager, signals[DOWNLOAD_ADDED], 0, download);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_signal_emit (manager, signals[ESTIMATED_PROGRESS_CHANGED], 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 94450ffb65a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/epiphany/files/patch-fix-null-or-empty-string-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 656126c930dfb7c5eefd2fc1962fab178be86618 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Christian Hergert <chergert@redhat.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 6 Apr 2017 16:22:00 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: web-extension: fix NULL or empty string check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-We need to compare against the character, not the pointer which
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-is done immediately to the left of this comparison.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- embed/web-extension/ephy-web-extension.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 003f9ba..70971ef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- embed/web-extension/ephy-web-extension.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ embed/web-extension/ephy-web-extension.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1200,7 +1200,7 @@ handle_method_call (GDBusConnection *connection,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!web_page)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (base_uri == NULL || base_uri == '\0') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (base_uri == NULL || *base_uri == '\0') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Base URI cannot be NULL or empty");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cgit v0.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/epiphany/files/revert-getrandom-929f8f4d.patch b/gnome/epiphany/files/revert-getrandom-929f8f4d.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3fe7855331d
</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/revert-getrandom-929f8f4d.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/ephy-sync-utils.c.orig 2022-01-15 12:10:56.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ephy-sync-utils.c 2022-01-15 12:18:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,14 +23,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "ephy-settings.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <glib/gi18n.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <json-glib/json-glib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <libsoup/soup.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <sys/random.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char hex_digits[] = "0123456789abcdef";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,24 +165,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * This is mainly required by Nettle's RSA support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * From Nettle's documentation: random_ctx and random is a randomness generator.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * random(random_ctx, length, dst) should generate length random octets and store them at dst.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * We don't use random_ctx.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * We don't really use random_ctx, since we have /dev/urandom available.
</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_sync_utils_generate_random_bytes (void *random_ctx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsize num_bytes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ guint8 *out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gssize ret;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FILE *fp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_assert (num_bytes > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_assert (out);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- do {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ret = getrandom (out, num_bytes, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- } while (ret < (gssize)num_bytes && errno == EINTR);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (ret != (gssize)num_bytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_error ("Failed to generate randomness: %s", g_strerror (errno));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp = fopen ("/dev/urandom", "r");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fread (out, sizeof (guint8), num_bytes, fp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fclose (fp);
</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;'>+ char *
</span></pre><pre style='margin:0'>
</pre>