epiphany: update to 3.26.1

4 files changed, 62 insertions, 199 deletions

diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD
index 5205706cc..88aa79a53 100644
--- a/libre/epiphany/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -3,31 +3,32 @@
 # Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
 # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 
 pkgname=epiphany
-pkgver=3.24.3
+pkgver=3.26.1
 pkgrel=1.parabola1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
 url="https://wiki.gnome.org/Apps/Web"
 arch=(i686 x86_64 armv7h)
 license=(GPL)
 depends=(webkit2gtk gcr gnome-desktop icu)
-makedepends=(intltool itstool docbook-xml startup-notification lsb-release
-             gobject-introspection yelp-tools autoconf-archive appstream-glib git)
+makedepends=(itstool docbook-xml startup-notification lsb-release
+             gobject-introspection yelp-tools appstream-glib git meson)
 groups=(gnome)
 replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
-_commit=43489a7d54b89a45709fadd6a90d0e99cf0dc45d  # tags/3.24.3^0
+_commit=70755404799e4393bf5605c9debec6877acf0177  # tags/3.26.1
 source=("git+https://git.gnome.org/browse/epiphany#commit=$_commit"
         "git+https://git.gnome.org/browse/libgd"
         "git+https://git.gnome.org/browse/gvdb"
         pluginsdir.diff
-        privacy.patch)
+        libre.patch)
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
-            '3bbd4b36e697a3a9165e0b71d5af566fe96a8f1237d854b9dee9a7e0b9fef8e3'
-            '4cfef33af39c2292f5a5378154adb94be5937dc065b881b168b5df99557474f1')
+            '0e4db79fe22a4ed447aa926eecd09fc660cf2f5aac2d42aa9adaacad45416faf'
+            '8cee8e5f896ce12832d50e7ab97ef16165d70d135018742e0f5bc15507d4e708')
 
 pkgver() {
   cd $pkgname
@@ -35,30 +36,25 @@ pkgver() {
 }
 
 prepare() {
+  mkdir build
   cd $pkgname
   patch -Np1 -i ../pluginsdir.diff
-  patch -Np1 -i ../privacy.patch
+  patch -Np1 -i ../libre.patch
 
   git submodule init
   git config --local submodule.libgd.url "$srcdir/libgd"
   git config --local submodule.gvdb.url "$srcdir/gvdb"
   git submodule update
 
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/$pkgname --enable-compile-warnings=yes
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
+  cd build
+  arch-meson ../$pkgname -Ddistributor_name="Parabola GNU/Linux-libre"
+  ninja
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  cd build
+  DESTDIR="$pkgdir" ninja install
 }
diff --git a/libre/epiphany/libre.patch b/libre/epiphany/libre.patch
new file mode 100644
index 000000000..90769b489
--- /dev/null
+++ b/libre/epiphany/libre.patch
@@ -0,0 +1,37 @@
+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 @@
+ 			<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>
+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")
+ 
+ #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())
+ 
diff --git a/libre/epiphany/pluginsdir.diff b/libre/epiphany/pluginsdir.diff
index 64c091d45..f2b0bb03f 100644
--- a/libre/epiphany/pluginsdir.diff
+++ b/libre/epiphany/pluginsdir.diff
@@ -8,13 +8,13 @@
    g_object_unref (manager);
  }
  
---- a/embed/Makefile.am.orig	2017-04-08 12:22:50.192861523 +0000
-+++ b/embed/Makefile.am	2017-04-08 12:23:13.926290709 +0000
-@@ -61,6 +61,7 @@
- 	-I$(top_srcdir)/lib/widgets		\
- 	-I$(top_srcdir)/libgd			\
- 	-DPKGDATADIR=\"$(pkgdatadir)\"		\
-+	-DEPHY_PLUGINS_DIR=\""$(libdir)/epiphany/plugins"\" \
- 	-DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\"	\
- 	$(GDK_CFLAGS)				\
- 	$(GIO_CFLAGS)				\
+--- a/meson.build	2017-09-18 11:49:28.745287692 +0000
++++ b/meson.build	2017-09-18 11:52:53.432417200 +0000
+@@ -25,6 +25,7 @@
+ conf.set_quoted('BUILD_ROOT', meson.build_root())
+ conf.set_quoted('DISTRIBUTOR_NAME', get_option('distributor_name'))
+ conf.set_quoted('EPHY_WEB_EXTENSIONS_DIR', webextensionsdir)
++conf.set_quoted('EPHY_PLUGINS_DIR', join_paths(pkglibdir, 'plugins'))
+ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
+ conf.set_quoted('ISO_CODES_PREFIX', iso_codes_prefix)
+ conf.set_quoted('LOCALEDIR', localedir)
diff --git a/libre/epiphany/privacy.patch b/libre/epiphany/privacy.patch
deleted file mode 100644
index 313b7aa76..000000000
--- a/libre/epiphany/privacy.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-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 @@
- 			<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>
-diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c
-index de1d5d0..81d4606 100644
---- a/embed/ephy-embed-utils.c
-+++ b/embed/ephy-embed-utils.c
-@@ -247,7 +247,7 @@ ephy_embed_utils_normalize_address (const char *address)
- 
-     /* Auto-prepend http:// to anything that is not
-      * one according to soup, because it probably will be
--     * something like "google.com". Special case localhost(:port)
-+     * something like "duckduckgo.com/html". Special case localhost(:port)
-      * and IP(:port), because SoupURI, correctly, thinks it is a
-      * URI with scheme being localhost/IP and, optionally, path
-      * being the port. Ideally we should check if we have a
-diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
-index 8c490f6..5ba6270 100644
---- a/embed/ephy-web-view.c
-+++ b/embed/ephy-web-view.c
-@@ -537,7 +537,7 @@ ephy_web_view_create_form_auth_save_confirmation_info_bar (EphyWebView *web_view
- 
-   label = gtk_label_new (NULL);
-   /* Translators: The %s the hostname where this is happening.
--   * Example: mail.google.com.
-+   * Example: mail.com.
-    */
-   message = g_markup_printf_escaped (_("Do you want to save your password for “%s”?"), origin);
-   gtk_label_set_markup (GTK_LABEL (label), message);
-diff --git a/lib/ephy-form-auth-data.c b/lib/ephy-form-auth-data.c
-index ff407ac..6c36eb5 100644
---- a/lib/ephy-form-auth-data.c
-+++ b/lib/ephy-form-auth-data.c
-@@ -115,13 +115,13 @@ ephy_form_auth_data_store (const char         *uri,
-   if (username != NULL) {
-     /* Translators: The first %s is the username and the second one is the
-      * security origin where this is happening. Example: gnome@gmail.com and
--     * https://mail.google.com.
-+     * https://mail.com.
-      */
-     label = g_strdup_printf (_("Password for %s in a form in %s"),
-                              username, origin);
-   } else {
-     /* Translators: The first %s is the security origin where this is happening.
--     * Example: https://mail.google.com.
-+     * Example: https://mail.com.
-      */
-     label = g_strdup_printf (_("Password in a form in %s"), origin);
-   }
-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")
- 
- #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ())
- 
-diff --git a/lib/ephy-uri-helpers.c b/lib/ephy-uri-helpers.c
-index be3ef44..a9c4839 100644
---- a/lib/ephy-uri-helpers.c
-+++ b/lib/ephy-uri-helpers.c
-@@ -146,32 +146,12 @@ is_garbage (const char *name,
-     const char *field;
-     const char *host;
-   } const fields[] = {
--    /* analytics.google.com */
-     { "utm_source", NULL },
-     { "utm_medium", NULL },
-     { "utm_term", NULL },
-     { "utm_content", NULL },
-     { "utm_campaign", NULL },
--    { "utm_reader", NULL },
--    /* metrika.yandex.ru */
--    { "yclid", NULL },
--    /* youtube.com */
--    { "feature", "youtube.com" },
--    /* facebook.com */
--    { "fb_action_ids", NULL },
--    { "fb_action_types", NULL },
--    { "fb_ref", NULL },
--    { "fb_source", NULL },
--    { "action_object_map", NULL },
--    { "action_type_map", NULL },
--    { "action_ref_map", NULL },
--    { "ref", "facebook.com" },
--    { "fref", "facebook.com" },
--    { "hc_location", "facebook.com" },
--    /* imdb.com */
--    { "ref_", "imdb.com" },
--    /* addons.mozilla.org */
--    { "src", "addons.mozilla.org" }
-+    { "utm_reader", NULL }
-   };
-   guint i;
- 
-diff --git a/src/window-commands.c b/src/window-commands.c
-index cd5fc70..a718c17 100644
---- a/src/window-commands.c
-+++ b/src/window-commands.c
-@@ -1155,11 +1155,7 @@ typedef struct {
- } SiteInfo;
- 
- static SiteInfo sites[] = {
--  { "www.facebook.com", "Facebook" },
--  { "twitter.com", "Twitter" },
--  { "gmail.com", "GMail" },
--  { "plus.google.com", "Google+" },
--  { "youtube.com", "YouTube" },
-+  { "www.gnu.org/software/social", "GNUSocial" },
- };
- 
- static char *
-diff --git a/tests/ephy-string-test.c b/tests/ephy-string-test.c
-index 4ac879e..1ef74d5 100644
---- a/tests/ephy-string-test.c
-+++ b/tests/ephy-string-test.c
-@@ -30,10 +30,10 @@ typedef struct {
- } HostnameTest;
- 
- static const HostnameTest hostname_tests[] = {
--  { "http://www.google.com", "www.google.com" },
--  { "http://www.google.com/this/is/a/path", "www.google.com" },
--  { "www.google.com", "www.google.com" },
--  { "google.com", "google.com" },
-+  { "https://duckduckgo.com/html", "www.duckduckgo.com/html" },
-+  { "https://duckduckgo.com/html/this/is/a/path", "www.duckduckgo.com/html" },
-+  { "www.duckduckgo.com/html", "www.duckduckgo.com/html" },
-+  { "duckduckgo.com/html", "duckduckgo.com/html" },
-   { "file:///tmp/", NULL },
-   { "about:blank", NULL },
-   { "ephy-about:applications", NULL },
-diff --git a/tests/ephy-uri-helpers-test.c b/tests/ephy-uri-helpers-test.c
-index f536ab9..19ca779 100644
---- a/tests/ephy-uri-helpers-test.c
-+++ b/tests/ephy-uri-helpers-test.c
-@@ -44,8 +44,6 @@ test_ephy_uri_helpers_remove_tracking (void)
-     { "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b",
-       "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b" },
-     /* https://bugzilla.gnome.org/show_bug.cgi?id=730464 */
--    { "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j",
--      "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j" },
-     { "http://www.test.com/?utm_source=feedburner&view=lno&_reqid=1234", "http://www.test.com/?view=lno&_reqid=1234" },
-     { "http://www.test.com/?some&valid&query", "http://www.test.com/?some&valid&query" },
-     { "http://www.test.com/?utm_source=feedburner&some&valid&query", "http://www.test.com/?some&valid&query" },