epiphany: Update to 3.35.2

Updated to gtk 3 / GNOME 3 version / recentish webkit.

This is one minor version away from the latest version, but nevertheless
a large improvement - we need a small webkit-gtk bump (ping leot :)).

4 files changed, 33 insertions, 44 deletions

diff --git a/www/epiphany/patches/patch-aa b/www/epiphany/patches/patch-aa
deleted file mode 100644
index 0ccef550a18..00000000000
--- a/www/epiphany/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2011/03/12 13:04:15 drochner Exp $
-
-Don't check existence of root certificates at build time
-to avoid a hard dependency.
-
---- configure.orig	2010-09-15 16:27:21.000000000 +0000
-+++ configure
-@@ -14652,9 +14652,9 @@ else
- 
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ca_file" >&5
- $as_echo "$with_ca_file" >&6; }
--    if ! test -f "$with_ca_file"; then
--        as_fn_error $? "No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable" "$LINENO" 5
--    fi
-+#    if ! test -f "$with_ca_file"; then
-+#        as_fn_error $? "No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable" "$LINENO" 5
-+#    fi
-     GTLS_SYSTEM_CA_FILE="$with_ca_file"
- 
- 
diff --git a/www/epiphany/patches/patch-embed_downloader-view.c b/www/epiphany/patches/patch-embed_downloader-view.c
deleted file mode 100644
index 73126700bad..00000000000
--- a/www/epiphany/patches/patch-embed_downloader-view.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-embed_downloader-view.c,v 1.1 2013/08/13 01:03:02 obache Exp $
-
-* libnotify-0.7 API change
-
---- embed/downloader-view.c.orig	2010-09-09 20:33:19.000000000 +0000
-+++ embed/downloader-view.c
-@@ -337,7 +337,7 @@ show_notification (DownloaderView *dv, c
- 	g_object_ref (dv);
- 
- 	notification = notify_notification_new (title, msg,
--						GTK_STOCK_INFO, NULL);
-+						GTK_STOCK_INFO);
- 
- 	g_signal_connect_after (notification, "closed",
- 				G_CALLBACK (notification_closed_cb), dv);
-@@ -346,8 +346,6 @@ show_notification (DownloaderView *dv, c
- 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
- 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- 
--	notify_notification_attach_to_status_icon (notification, status_icon);
--
- 	/* There are some visual glitches when the notification is shown and
- 	 * the GtkStatusIcon is still not visible. To avoid that, we delay the
- 	 * popup a bit. */
diff --git a/www/epiphany/patches/patch-lib_contrib_gnome-languages.c b/www/epiphany/patches/patch-lib_contrib_gnome-languages.c
new file mode 100644
index 00000000000..34b7ce69603
--- /dev/null
+++ b/www/epiphany/patches/patch-lib_contrib_gnome-languages.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_contrib_gnome-languages.c,v 1.1 2020/01/21 15:02:08 nia Exp $
+
+NetBSD does not have uselocale yet.
+
+--- lib/contrib/gnome-languages.c.orig	2019-11-22 21:24:16.000000000 +0000
++++ lib/contrib/gnome-languages.c
+@@ -51,6 +51,10 @@
+ #include "default-input-sources.h"
+ #endif
+ 
++#ifdef __NetBSD__
++#define uselocale(v) (NULL)
++#endif
++
+ typedef struct _GnomeLocale {
+         char *id;
+         char *name;
diff --git a/www/epiphany/patches/patch-lib_ephy-flatpak-utils.c b/www/epiphany/patches/patch-lib_ephy-flatpak-utils.c
new file mode 100644
index 00000000000..2f96c07d19f
--- /dev/null
+++ b/www/epiphany/patches/patch-lib_ephy-flatpak-utils.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_ephy-flatpak-utils.c,v 1.1 2020/01/21 15:02:08 nia Exp $
+
+Add missing stub for !linux.
+
+--- lib/ephy-flatpak-utils.c.orig	2019-11-22 21:24:16.000000000 +0000
++++ lib/ephy-flatpak-utils.c
+@@ -285,4 +285,9 @@ ephy_open_file_via_flatpak_portal_finish
+   g_assert_not_reached ();
+ }
+ 
++void
++ephy_flatpak_utils_set_is_web_process_extension (void)
++{
++}
++
+ #endif /* __linux__ */