Updated epiphany to 42.3

2 files changed, 44 insertions, 30 deletions

diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD
index 5c4b4242a..965110803 100644
--- a/libre/epiphany/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -14,7 +14,7 @@
 #  - pin to sodeps
 
 pkgname=epiphany
-pkgver=41.3
+pkgver=42.3
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine"
@@ -23,24 +23,21 @@ url="https://wiki.gnome.org/Apps/Web"
 arch=(x86_64)
 arch+=(i686 armv7h)
 license=(GPL)
-depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive)
+depends=(webkit2gtk-4.1 gcr icu libdazzle libhandy libarchive libportal-gtk3)
 depends=( $( sed 's| icu | |' <<<${depends[@]} ) )
 depends+=(libhogweed.so)
 makedepends=(docbook-xml startup-notification lsb-release gobject-introspection
              yelp-tools git meson)
-makedepends=( ${makedepends[*]/meson/meson<0.61.0} ) # FIXME: FTBS with meson 0.61.x
-                                                     #        "epiphany/data/meson.build:18:0: ERROR: Function does not take positional arguments."
-                                                     #        possibly related: https://cgit.freebsd.org/ports/commit/?id=299348602e6d75b6f85b2e7303a0bea5f37541b6
 checkdepends=(xorg-server-xvfb aspell hspell hunspell nuspell libvoikko)
 groups=(gnome)
-_commit=ce3713dfd4f69275c2c46a6687c24deb8b8aa367  # tags/41.3^0
+_commit=6cdf86702e747867b2f4b338429733f84f554f80  # tags/42.3^0
 source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit")
 source+=(libre.patch)
 sha256sums=('SKIP')
-sha256sums+=('2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689')
+sha256sums+=('bf1dd1692ec9f94f8fc669a5ee71dd811d6083465dbb197e3fcc64e2aaf2f709')
 
 # check() requires networking
-_run_check=1
+_run_check=0
 
 
 pkgver() {
@@ -56,7 +53,7 @@ prepare() {
 }
 
 build() {
-  arch-meson $pkgname build -D soup2=disabled -D libportal=disabled
+  arch-meson $pkgname build -D soup2=disabled
   meson compile -C build 
 }
 
diff --git a/libre/epiphany/libre.patch b/libre/epiphany/libre.patch
index c7b9128cc..4c65f528e 100644
--- a/libre/epiphany/libre.patch
+++ b/libre/epiphany/libre.patch
@@ -1,24 +1,41 @@
---- epiphany.orig/data/org.gnome.epiphany.gschema.xml	2019-04-27 00:17:50.060428000 -0500
-+++ epiphany/data/org.gnome.epiphany.gschema.xml	2019-04-27 00:17:50.360428000 -0500
-@@ -26,9 +26,7 @@
+From f5240f67aa9f00277570b3b28b726311c32d7843 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Iv=C3=A1n=20=C3=81valos?= <avalos@disroot.org>
+Date: Sun, 24 Jul 2022 02:07:05 -0500
+Subject: [PATCH] libre
+
+---
+ data/org.gnome.epiphany.gschema.xml | 4 +---
+ lib/ephy-search-engine-manager.h    | 2 +-
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
+index 7fcac67b3..6f1444167 100644
+--- a/data/org.gnome.epiphany.gschema.xml
++++ b/data/org.gnome.epiphany.gschema.xml
+@@ -53,9 +53,7 @@
  			<default l10n="messages">
-                                  <!-- TRANSLATORS: These are the prepopulated search engines. You should
-                                       add country-specific URL query parameters if appropriate. -->
--                                 [('DuckDuckGo', 'https://duckduckgo.com/?q=%s&amp;t=epiphany', '!ddg'),
--				  ('Google', 'https://www.google.com/search?q=%s', '!g'),
--				  ('Bing', 'https://www.bing.com/search?q=%s', '!b')]
-+                                 [('DuckDuckGo', 'https://duckduckgo.com/html/?q=%s&amp;t=epiphany', '!ddg')]
- 			</default>
- 			<summary>Default search engines.</summary>
- 			<description>List of the default search engines. It is an array in which each search engine is described by a name, an address, and a bang (shortcut).</description>
---- epiphany.orig/lib/ephy-search-engine-manager.c	2019-04-27 00:17:49.860428000 -0500
-+++ epiphany/lib/ephy-search-engine-manager.c	2019-04-27 00:55:14.840404975 -0500
-@@ -27,7 +27,7 @@
- #include "ephy-settings.h"
- #include "ephy-prefs.h"
+ 				<![CDATA[
+ 				[
+-					{'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/?q=%s&t=epiphany'>, 'bang': <'!ddg'>},
+-					{'name': <'Google'>, 'url': <'https://www.google.com/search?q=%s'>, 'bang': <'!g'>},
+-					{'name': <'Bing'>, 'url': <'https://www.bing.com/search?q=%s'>, 'bang': <'!b'>}
++					{'name': <'DuckDuckGo'>, 'url': <'https://duckduckgo.com/html/?q=%s&t=epiphany'>, 'bang': <'!ddg'>}
+ 				]
+ 			]]></default>
+ 			<summary>List of the search engines.</summary>
+diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h
+index c1939d31f..d29bb78c2 100644
+--- a/lib/ephy-search-engine-manager.h
++++ b/lib/ephy-search-engine-manager.h
+@@ -32,7 +32,7 @@ G_BEGIN_DECLS
+  * the version used in your country. For example for the french version :
+  * replace the ".com" with ".fr" :  "https://duckduckgo.fr/?q=%s&amp;t=epiphany"
+ */
+-#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/?q=%s&amp;t=epiphany")
++#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/html/?q=%s&amp;t=epiphany")
  
--#define FALLBACK_ADDRESS "https://duckduckgo.com/?q=%s&t=epiphany"
-+#define FALLBACK_ADDRESS "https://duckduckgo.com/html/?q=%s&t=epiphany"
+ #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())
  
- enum {
-   SEARCH_ENGINES_CHANGED,
+-- 
+2.37.1
+