pool/epiphany
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 557145 from home:Zaitor

Browse Source 
- Update to version 3.26.4:
  + Fix sync failure warnings appearing multiple times
    (bgo#790094).
  + Fix tab sync and device name on accounts.firefox.com
    (bgo#790370).
  + Make default sync device name translatable (bgo#790905).
  + Several additional misc. improvements to sync support
    (including bgo#790819).
  + Flatpak: custom stylesheets are now supported.
  + Flatpak: view page source is now supported.
- Add epiphany-session-rework-the-safety-check.patch: session:
  Rework the safety check.

OBS-URL: https://build.opensuse.org/request/show/557145
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=271
This commit is contained in:
Dominique Leuenberger 2017-12-14 20:59:17 +00:00 committed by Git OBS Bridge
parent 719ac22f53
commit 2c149c657f
5 changed files with 88 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epiphany-3.26.3.tar.xz
View File

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea
size 4418620

65
epiphany-session-rework-the-safety-check.patch Normal file
View File

@ -0,0 +1,65 @@
From 370b87f27fa9ad8be201d33f4eb6cf5ec39e3f56 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Thu, 14 Dec 2017 11:05:33 -0600
Subject: session: Rework the safety check
Tanty and I both lost our Epiphany sessions yesterday... we need to
tighten up our URI sanity check. http:/// is a valid SoupURI, but it
should never be saved in the session.
---
src/ephy-session.c | 38 +++++++++++++++++++++++---------------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/ephy-session.c b/src/ephy-session.c
index b07346f..64f135a 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -822,22 +822,30 @@ save_session_in_thread_finished_cb (GObject *source_object,
static gboolean
session_seems_sane (GList *windows)
{
- GList *w;
- GList *t;
+ for (GList *w = windows; w != NULL; w = w->next) {
+ for (GList *t = ((SessionWindow *)w->data)->tabs; t != NULL; t = t->next) {
+ const char *url = ((SessionTab *)t->data)->url;
+ SoupURI *uri;
+ gboolean sane = FALSE;
+
+ /* Blank URLs can occur in some situations. Just ignore these, as they
+ * are harmless and not an indicator of a corrupted session. */
+ if (strcmp (url, "") == 0)
+ continue;
+
+ uri = soup_uri_new (url);
+ if (uri) {
+ if (uri->host != NULL ||
+ uri->scheme == SOUP_URI_SCHEME_DATA ||
+ uri->scheme == SOUP_URI_SCHEME_FILE)
+ sane = TRUE;
+ soup_uri_free (uri);
+ }
- for (w = windows; w != NULL; w = w->next) {
- for (t = ((SessionWindow *)w->data)->tabs; t != NULL; t = t->next) {
- const char *url = ((SessionTab *)t->data)->url;
- SoupURI *uri = soup_uri_new (url);
- if (uri) {
- soup_uri_free (uri);
- }
- /* Blank URLs can occur in some situations. Don't save them, but also
- * do not torpedo the entire session as it's not a bug. */
- else if (strcmp (url, "") != 0) {
- g_critical ("Refusing to save session due to invalid URL %s", url);
- return FALSE;
- }
+ if (!sane) {
+ g_critical ("Refusing to save session due to invalid URL %s", url);
+ return FALSE;
+ }
}
}
--
cgit v0.12

16
epiphany.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Dec 14 17:15:32 UTC 2017 - zaitor@opensuse.org
- Update to version 3.26.4:
+ Fix sync failure warnings appearing multiple times
(bgo#790094).
+ Fix tab sync and device name on accounts.firefox.com
(bgo#790370).
+ Make default sync device name translatable (bgo#790905).
+ Several additional misc. improvements to sync support
(including bgo#790819).
+ Flatpak: custom stylesheets are now supported.
+ Flatpak: view page source is now supported.
- Add epiphany-session-rework-the-safety-check.patch: session:
Rework the safety check.
-------------------------------------------------------------------
Sun Nov 26 15:58:32 UTC 2017 - zaitor@opensuse.org

6
epiphany.spec
View File

@ -17,7 +17,7 @@
Name: epiphany
Version: 3.26.3
Version: 3.26.4
Release: 0
Summary: GNOME Web Browser
License: GPL-3.0+
@ -25,6 +25,8 @@ 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-session-rework-the-safety-check.patch zaitor@opensuse.org -- session: Rework the safety check
Patch0: epiphany-session-rework-the-safety-check.patch
BuildRequires: fdupes
BuildRequires: meson
BuildRequires: pkgconfig
@ -97,7 +99,7 @@ search results from Web (epiphany)
%lang_package
%prep
%autosetup
%autosetup -p1
%if ! 0%{?is_opensuse}
translation-update-upstream
%endif