Accepting request 576359 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/576359
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=147
This commit is contained in:
Dominique Leuenberger 2018-02-14 09:52:08 +00:00 committed by Git OBS Bridge
commit 55827874e3
7 changed files with 20 additions and 98 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b2f1c48e6f50793ff205d9215add5596ab5c7ebf4cef76907868fcd5a029221
size 4418232

3
epiphany-3.26.6.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01b16aa55d312ae0f17d3136f90d8c68ac748715f119412fb1917023c6f630a8
size 4419064

View File

@ -1,32 +0,0 @@
From 967eec8db71ea9777765d1ffd8acf4196f9c37cb Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathan121537@gmail.com>
Date: Fri, 29 Dec 2017 10:57:49 +0800
Subject: application mode: use strstr() to get base name of the desktop file
If the name of the web application include 'app', for expample
'WhatsApp', it might cause users unable to open the web application
any more.
Fix that by using strstr() to get the base name of that desktop
file instead of g_strrstr().
https://bugzilla.gnome.org/show_bug.cgi?id=790781
---
lib/ephy-web-app-utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ephy-web-app-utils.c b/lib/ephy-web-app-utils.c
index 4e3b471..d3afff4 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -350,7 +350,7 @@ ephy_web_application_setup_from_profile_directory (const char *profile_directory
g_return_if_fail (profile_directory != NULL);
- app_name = g_strrstr (profile_directory, EPHY_WEB_APP_PREFIX);
+ app_name = strstr (profile_directory, EPHY_WEB_APP_PREFIX);
if (!app_name) {
g_warning ("Profile directory %s does not begin with required web app prefix %s", profile_directory, EPHY_WEB_APP_PREFIX);
exit (1);
--
cgit v0.12

View File

@ -1,29 +0,0 @@
From 75c43671086d9f0d8c25bbf881cd2a74cd62da3d Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
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

View File

@ -1,27 +0,0 @@
From cbd969232cd189e732e67ff5de8180fdbe781243 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
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

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Tue Feb 13 16:50:50 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.26.6:
+ Fix download of blob URIs (bgo#788576).
+ Fix WhatsApp web app (bgo#790781).
+ Fix profile migrator deleting bookmarks if run multiple times
(bgo#792683).
+ Add touch support for address bar icons (bgo#792876).
+ Fix placement of select element with multiple monitors
(bgo#792940).
+ Hopefully fix the search provider.
- Drop epiphany-application-mode-fix-desktopfile.patch,
epiphany-fix-download-of-blob-URIs.patch and
epiphany-search-provider-fix.patch: Fixed upstream.
-------------------------------------------------------------------
Sat Jan 13 19:11:07 UTC 2018 - zaitor@opensuse.org

View File

@ -17,7 +17,7 @@
Name: epiphany
Version: 3.26.5.1
Version: 3.26.6
Release: 0
Summary: GNOME Web Browser
License: GPL-3.0+
@ -25,12 +25,6 @@ Group: Productivity/Networking/Web/Browsers
Url: http://www.gnome.org/projects/epiphany/
Source0: http://download.gnome.org/sources/epiphany/3.26/%{name}-%{version}.tar.xz
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