From 2eab2c4e426ab22034ca18f57bb328785e4091a4c03dbedcd74abfd7b57ebef5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Jan 2018 15:31:04 +0000 Subject: [PATCH] Accepting request 564433 from home:Zaitor Resub, use upstreams committed patch instead of my plain diff. OBS-URL: https://build.opensuse.org/request/show/564433 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=276 --- epiphany-fix-download-of-blob-URIs.patch | 29 ++++++++++++++++++++++++ epiphany-search-provider-fix.patch | 27 ++++++++++++++++++++++ epiphany.changes | 13 +++++++++++ epiphany.spec | 9 +++++++- 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 epiphany-fix-download-of-blob-URIs.patch create mode 100644 epiphany-search-provider-fix.patch diff --git a/epiphany-fix-download-of-blob-URIs.patch b/epiphany-fix-download-of-blob-URIs.patch new file mode 100644 index 0000000..f39fa06 --- /dev/null +++ b/epiphany-fix-download-of-blob-URIs.patch @@ -0,0 +1,29 @@ +From 75c43671086d9f0d8c25bbf881cd2a74cd62da3d Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sat, 6 Jan 2018 18:54:00 -0600 +Subject: Fix download of blob URIs + +Epiphany doesn't recognize blob as a web scheme, causing it to try +opening it in an external URI handler in its policy decision callback... +doesn't work. + +https://bugzilla.gnome.org/show_bug.cgi?id=788576 +--- + embed/ephy-embed-utils.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c +index db69135..cc7abf9 100644 +--- a/embed/ephy-embed-utils.c ++++ b/embed/ephy-embed-utils.c +@@ -126,6 +126,7 @@ ephy_embed_utils_address_has_web_scheme (const char *address) + g_ascii_strncasecmp (address, "file", colonpos) && + g_ascii_strncasecmp (address, "javascript", colonpos) && + g_ascii_strncasecmp (address, "data", colonpos) && ++ g_ascii_strncasecmp (address, "blob", colonpos) && + g_ascii_strncasecmp (address, "about", colonpos) && + g_ascii_strncasecmp (address, "ephy-about", colonpos) && + g_ascii_strncasecmp (address, "gopher", colonpos) && +-- +cgit v0.12 + diff --git a/epiphany-search-provider-fix.patch b/epiphany-search-provider-fix.patch new file mode 100644 index 0000000..d1a6efc --- /dev/null +++ b/epiphany-search-provider-fix.patch @@ -0,0 +1,27 @@ +From cbd969232cd189e732e67ff5de8180fdbe781243 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Sat, 13 Jan 2018 15:27:25 -0600 +Subject: Try to fix the search provider +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Thanks to Bjørn Lie for noticing the problem. +--- + data/org.gnome.Epiphany.search-provider.ini | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/org.gnome.Epiphany.search-provider.ini b/data/org.gnome.Epiphany.search-provider.ini +index 3260c89..f71beb6 100644 +--- a/data/org.gnome.Epiphany.search-provider.ini ++++ b/data/org.gnome.Epiphany.search-provider.ini +@@ -1,5 +1,5 @@ + [Shell Search Provider] + DesktopId=org.gnome.Epiphany.desktop +-BusName=org.gnome.EpiphanySearchProvider +-ObjectPath=/org/gnome/EpiphanySearchProvider ++BusName=org.gnome.Epiphany.SearchProvider ++ObjectPath=/org/gnome/Epiphany/SearchProvider + Version=2 +-- +cgit v0.12 diff --git a/epiphany.changes b/epiphany.changes index d763963..08cbe69 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Jan 13 19:11:07 UTC 2018 - zaitor@opensuse.org + +- Add epiphany-search-provider-fix.patch: Fix typos in + serviceprovider, make it actually work (bgo#792502). +- Add epiphany-fix-download-of-blob-URIs.patch: Fix download of + blob URIs. Epiphany doesn't recognize blob as a web scheme, + causing it to try opening it in an external URI handler in it's + policy decision callback (bgo#788576). +- Pass explicit developer_mode=false, https_everywhere=false and + unit_tests=false options to meson, ensure we build the features + we want. + ------------------------------------------------------------------- Mon Jan 1 20:08:44 UTC 2018 - zaitor@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 86e4f24..52ee2e8 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,10 @@ Source0: http://download.gnome.org/sources/epiphany/3.26/%{name}-%{versio Source99: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM epiphany-application-mode-fix-desktopfile.patch bgo#790781 zaitor@opensuse.org -- application mode: use strstr() to get base name of the desktop file Patch0: epiphany-application-mode-fix-desktopfile.patch +# PATCH-FIX-UPSTREAM epiphany-fix-download-of-blob-URIs.patch bgo#788576 zaitor@opensuse.org -- Fix download of blob URIs +Patch1: epiphany-fix-download-of-blob-URIs.patch +# PATCH-FIX-UPSTREAM epiphany-search-provider-fix.patch bgo#792502 zaitor@opensuse.org -- Fix typo in serviceprovider +Patch2: epiphany-search-provider-fix.patch BuildRequires: fdupes BuildRequires: meson @@ -107,7 +111,10 @@ translation-update-upstream %build %{meson} \ + -Ddeveloper_mode=false \ -Ddistributor_name=openSUSE \ + -Dhttps_everywhere=false \ + -Dunit_tests=false \ %{nil} %{meson_build}