summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/epiphany/PKGBUILD16
-rw-r--r--libre/epiphany/libre.patch37
2 files changed, 20 insertions, 33 deletions
diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD
index 3c7e1088e..a8cb9ff6d 100644
--- a/libre/epiphany/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -10,25 +10,25 @@
# - switched default searchengine to duckduckgo
pkgname=epiphany
-pkgver=3.30.3
-pkgrel=1
-pkgrel+=.par2
+pkgver=3.32.1.2
+pkgrel=2
+pkgrel+=.par1
pkgdesc="A GNOME web browser based on the WebKit rendering engine"
-pkgdesc=+", with DuckDuckGo HTML support"
+pkgdesc+=", with DuckDuckGo HTML support"
url="https://wiki.gnome.org/Apps/Web"
arch=(x86_64)
arch+=(i686 armv7h)
license=(GPL)
-depends=(webkit2gtk gcr icu libdazzle)
+depends=(webkit2gtk gcr icu libdazzle libhandy)
makedepends=(docbook-xml startup-notification lsb-release gobject-introspection yelp-tools
appstream-glib git meson)
checkdepends=(xorg-server-xvfb)
groups=(gnome)
-_commit=0777a3db37a3c8520740448bf50f620a94a8e551 # tags/3.30.3^0
+_commit=f6e84e5424ffc6acf9a76dad24c95a771dfb857b # tags/3.32.1.2^0
source=("git+https://gitlab.gnome.org/GNOME/epiphany.git#commit=$_commit"
libre.patch)
sha256sums=('SKIP'
- '8cee8e5f896ce12832d50e7ab97ef16165d70d135018742e0f5bc15507d4e708')
+ '2ef991ade98fbe9a3a6cd80220d3348e69007abff5141bea42bbdf1c72836689')
pkgver() {
cd $pkgname
@@ -48,7 +48,7 @@ build() {
check() {
# ERROR:../epiphany/tests/ephy-web-app-utils-test.c:109:test_web_app_lifetime: assertion failed (g_list_length (apps) == 1): (0 == 1)
- xvfb-run meson test -C build || :
+ xvfb-run meson test -C build --print-errorlogs || :
}
package() {
diff --git a/libre/epiphany/libre.patch b/libre/epiphany/libre.patch
index 90769b489..c7b9128cc 100644
--- a/libre/epiphany/libre.patch
+++ b/libre/epiphany/libre.patch
@@ -1,17 +1,6 @@
-diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
-index 6540572..e60a082 100644
---- a/data/org.gnome.epiphany.gschema.xml
-+++ b/data/org.gnome.epiphany.gschema.xml
-@@ -16,7 +16,7 @@
- <description>Address of the user’s home page.</description>
- </key>
- <key type="s" name="keyword-search-url">
-- <default>'https://duckduckgo.com/?q=%s&amp;t=epiphany'</default>
-+ <default>'https://duckduckgo.com/html/?q=%s&amp;t=epiphany'</default>
- <summary>URL Search</summary>
- <description>DEPRECATED: This key is deprecated and ignored. Use /org/gnome/epiphany/search-engines instead.</description>
- </key>
-@@ -29,9 +29,7 @@
+--- 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 @@
<default l10n="messages">
<!-- TRANSLATORS: These are the prepopulated search engines. You should
add country-specific URL query parameters if appropriate. -->
@@ -22,16 +11,14 @@ index 6540572..e60a082 100644
</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>
-diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h
-index 2e92396..c53684e 100644
---- a/lib/ephy-search-engine-manager.h
-+++ b/lib/ephy-search-engine-manager.h
-@@ -30,7 +30,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")
+--- 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"
- #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())
+-#define FALLBACK_ADDRESS "https://duckduckgo.com/?q=%s&t=epiphany"
++#define FALLBACK_ADDRESS "https://duckduckgo.com/html/?q=%s&t=epiphany"
+ enum {
+ SEARCH_ENGINES_CHANGED,