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

Accepting request 672898 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/672898
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=161
This commit is contained in:
Dominique Leuenberger 2019-02-11 20:24:43 +00:00 committed by Git OBS Bridge
commit f49eb43466
11 changed files with 24 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epiphany-3.30.2.tar.xz
View File

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

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

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

33
epiphany-Fix-remote-inspector-support.patch
View File

@ -1,33 +0,0 @@
From 58d5eb7ec0b37e7e9964e4fe8a8da27e7e5b2070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Yhuel?= <loic.yhuel@softathome.com>
Date: Thu, 20 Dec 2018 12:39:29 +0000
Subject: [PATCH] Fix remote inspector support
Commit 11293728 broke inspector:// URLs : the scheme isn't known by
g_app_info_get_default_for_uri_scheme, so it triggers a search.
Fixes #600
(cherry picked from commit e3cc0433404caec9e909232ef159fc4ff3fbb146)
---
embed/ephy-web-view.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index bd4a6c1b8..8f8ca5c8e 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -40,7 +40,8 @@ G_DECLARE_FINAL_TYPE (EphyWebView, ephy_web_view, EPHY, WEB_VIEW, WebKitWebView)
"^https?://[^/\\.[:space:]]+.*$|" \
"^about:.*$|" \
"^data:.*$|" \
- "^file:.*$" \
+ "^file:.*$|" \
+ "^inspector://.*$" \
")"
#define EPHY_WEB_VIEW_DOMAIN_REGEX "^localhost(\\.[^[:space:]]+)?(:\\d+)?(:[0-9]+)?(/.*)?$|" \
--
2.18.1

26
epiphany-Fix-saving-web-app-icons.patch
View File

@ -1,26 +0,0 @@
From 26d9b288244e5d5e715bcf860b0a200989ecc02d Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Sun, 16 Dec 2018 14:40:27 -0600
Subject: [PATCH] Fix saving web app icons when changed
From 64a3330ced0ac6fe34b57d09a525e31cb30c350e
---
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 422519424..94abf9bda 100644
--- a/lib/ephy-web-app-utils.c
+++ b/lib/ephy-web-app-utils.c
@@ -726,7 +726,7 @@ ephy_web_application_save (EphyWebApplication *app)
g_free (name);
icon = g_key_file_get_string (key, "Desktop Entry", "Icon", NULL);
- if (g_strcmp0 (name, app->icon_url) != 0) {
+ if (g_strcmp0 (icon, app->icon_url) != 0) {
changed = TRUE;
g_key_file_set_string (key, "Desktop Entry", "Icon", app->icon_url);
}
--
2.18.1

25
epiphany-Tags-with-empty-labels.patch
View File

@ -1,25 +0,0 @@
From 77fab98a0ad4a33a8bfdb137afdda15973bea375 Mon Sep 17 00:00:00 2001
From: Aral Balkan <aral@aralbalkan.com>
Date: Thu, 29 Nov 2018 22:30:46 +0000
Subject: [PATCH] Tags with empty labels are no longer allowed in bookmarks
---
src/bookmarks/ephy-bookmark-properties-grid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bookmarks/ephy-bookmark-properties-grid.c b/src/bookmarks/ephy-bookmark-properties-grid.c
index 3bdd7013e..0706b33f9 100644
--- a/src/bookmarks/ephy-bookmark-properties-grid.c
+++ b/src/bookmarks/ephy-bookmark-properties-grid.c
@@ -265,7 +265,7 @@ ephy_bookmark_properties_grid_buffer_text_changed_cb (EphyBookmarkPropertiesGrid
group = gtk_widget_get_action_group (GTK_WIDGET (self), "grid");
action = g_action_map_lookup_action (G_ACTION_MAP (group), "add-tag");
text = gtk_entry_buffer_get_text (buffer);
- if (ephy_bookmarks_manager_tag_exists (self->manager, text))
+ if (ephy_bookmarks_manager_tag_exists (self->manager, text) || g_strcmp0 (text, "") == 0)
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE);
else
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), TRUE);
--
2.18.1

67
epiphany-bookmark-ensure-tags-sequence-is-created.patch
View File

@ -1,67 +0,0 @@
From d571984e24c0a24fd1d09da4341f79eea7286723 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Mon, 7 Jan 2019 19:38:22 +0000
Subject: [PATCH] bookmark: ensure tags sequence is always created
Somehow we are getting EphyBookmarks objects deserialized without
initializing the tags property. I'm not sure how this happens. It even
happens for JSON corresponding to bookmarks that definitely have tags
set. Anyway, ephy_bookmark_get_tags() is used as if the result is not
nullable, so let's guarantee this and return an empty list instead in
this case.
This is a speculative fix for #612. It should fix the reported crash,
but it's possible it will only uncover a subsequent crash.
(cherry picked from commit 672cffa5ec652a5d5f7d98d0e0664408d58dcf8c)
---
src/bookmarks/ephy-bookmark.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/bookmarks/ephy-bookmark.c b/src/bookmarks/ephy-bookmark.c
index 43619a4ef..514a54aec 100644
--- a/src/bookmarks/ephy-bookmark.c
+++ b/src/bookmarks/ephy-bookmark.c
@@ -99,9 +99,10 @@ ephy_bookmark_set_property (GObject *object,
ephy_bookmark_set_url (self, g_value_get_string (value));
break;
case PROP_TAGS:
- if (self->tags != NULL)
- g_sequence_free (self->tags);
+ g_sequence_free (self->tags);
self->tags = g_value_get_pointer (value);
+ if (!self->tags)
+ self->tags = g_sequence_new (g_free);
break;
case PROP_TYPE:
g_free (self->type);
@@ -176,8 +177,7 @@ ephy_bookmark_finalize (GObject *object)
g_free (self->title);
g_free (self->id);
- if (self->tags)
- g_sequence_free (self->tags);
+ g_sequence_free (self->tags);
G_OBJECT_CLASS (ephy_bookmark_parent_class)->finalize (object);
}
@@ -279,6 +279,7 @@ ephy_bookmark_class_init (EphyBookmarkClass *klass)
static void
ephy_bookmark_init (EphyBookmark *self)
{
+ self->tags = g_sequence_new (g_free);
}
EphyBookmark *
@@ -456,6 +457,7 @@ GSequence *
ephy_bookmark_get_tags (EphyBookmark *self)
{
g_assert (EPHY_IS_BOOKMARK (self));
+ g_assert (self->tags);
return self->tags;
}
--
2.18.1

28
epiphany-encoding-dialog-add-some-column-spacing.patch
View File

@ -1,28 +0,0 @@
From 86ac30111bc2031cd9738800c3322cd9fa8aca45 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Tue, 13 Nov 2018 17:14:03 -0600
Subject: [PATCH] encoding-dialog: add some column spacing to grid
This avoids the label from pushing up against the toggle button if the
translation is long.
Fixes #576
---
src/resources/gtk/encoding-dialog.ui | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/resources/gtk/encoding-dialog.ui b/src/resources/gtk/encoding-dialog.ui
index 9d158df81..a46ce5bc5 100644
--- a/src/resources/gtk/encoding-dialog.ui
+++ b/src/resources/gtk/encoding-dialog.ui
@@ -21,6 +21,7 @@
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="orientation">horizontal</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
--
2.18.1

28
epiphany-web-view-Handle-NULL-URIs.patch
View File

@ -1,28 +0,0 @@
From 9da12c4843143124d2f57e968b5034e30048834b Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@igalia.com>
Date: Tue, 27 Nov 2018 14:27:49 -0600
Subject: [PATCH] web-view: Handle NULL URIs in ephy_web_view_set_address()
This is possible if the web view has not loaded anything yet.
Fixes #590
---
embed/ephy-web-view.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 835cd6e0b..84fa0a49a 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1095,7 +1095,7 @@ ephy_web_view_set_address (EphyWebView *view,
view->address = g_strdup (address);
g_free (view->display_address);
- view->display_address = ephy_uri_decode (view->address);
+ view->display_address = view->address != NULL ? ephy_uri_decode (view->address) : NULL;
_ephy_web_view_set_is_blank (view, ephy_embed_utils_url_is_empty (address));
--
2.18.1

31
epiphany-window-Set-correct-current-height.patch
View File

@ -1,31 +0,0 @@
From db22b3e699cfa595746fc4c707de3db1fec1c969 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathankang@gnome.org>
Date: Mon, 5 Nov 2018 13:08:03 +0000
Subject: [PATCH] window: set correct current height
Fixes 9c3b0a6f
https://gitlab.gnome.org/GNOME/epiphany/issues/571
(cherry picked from commit 408d2118cceb4cade781087cc27bfc0d4b930c6e)
---
src/ephy-window.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ephy-window.c b/src/ephy-window.c
index d0c0f3d04..a5bfda433 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -2808,7 +2808,7 @@ ephy_window_configure_event (GtkWidget *widget,
&window->current_x,
&window->current_y);
window->current_width = width;
- window->current_width = height;
+ window->current_height = height;
}
return result;
--
2.18.1

20
epiphany.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Feb 7 17:26:36 UTC 2019 - bjorn.lie@gmail.com
- Update to version 3.30.3:
+ Fix height of new windows.
+ Add missing space to encoding dialog.
+ Disallow bookmarks tags with empty names.
+ Fix crash loading unexpected URLs.
+ Fix remote inspector.
+ Fix crash syncing bookmarks with Firefox Sync.
+ Fix saving changes to web app icons.
- Drop upstream fixed patches:
+ epiphany-bookmark-ensure-tags-sequence-is-created.patch.
+ epiphany-Fix-saving-web-app-icons.patch.
+ epiphany-window-Set-correct-current-height.patch.
+ epiphany-encoding-dialog-add-some-column-spacing.patch.
+ epiphany-Tags-with-empty-labels.patch.
+ epiphany-Fix-remote-inspector-support.patch.
+ epiphany-web-view-Handle-NULL-URIs.patch.
-------------------------------------------------------------------
Fri Jan 25 18:59:27 UTC 2019 - bjorn.lie@gmail.com

17
epiphany.spec
View File

@ -17,7 +17,7 @@
Name: epiphany
Version: 3.30.2
Version: 3.30.3
Release: 0
Summary: GNOME Web Browser
License: GPL-3.0-or-later
@ -26,21 +26,6 @@ URL: https://wiki.gnome.org/Apps/Web
Source0: https://download.gnome.org/sources/epiphany/3.30/%{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM epiphany-window-Set-correct-current-height.patch -- window: set correct current height
Patch0: epiphany-window-Set-correct-current-height.patch
# PATCH-FIX-UPSTREAM epiphany-encoding-dialog-add-some-column-spacing.patch -- encoding-dialog: add some column spacing to grid
Patch1: epiphany-encoding-dialog-add-some-column-spacing.patch
# PATCH-FIX-UPSTREAM epiphany-web-view-Handle-NULL-URIs.patch -- web-view: Handle NULL URIs in ephy_web_view_set_address()
Patch2: epiphany-web-view-Handle-NULL-URIs.patch
# PATCH-FIX-UPSTREAM epiphany-Tags-with-empty-labels.patch -- Tags with empty labels are no longer allowed in bookmarks
Patch3: epiphany-Tags-with-empty-labels.patch
# PATCH-FIX-UPSTREAM epiphany-Fix-saving-web-app-icons.patch -- Fix saving web app icons when changed
Patch4: epiphany-Fix-saving-web-app-icons.patch
# PATCH-FIX-UPSTREAM epiphany-Fix-remote-inspector-support.patch -- Fix remote inspector support
Patch5: epiphany-Fix-remote-inspector-support.patch
# PATCH-FIX-UPSTREAM epiphany-bookmark-ensure-tags-sequence-is-created.patch -- Fix bookmark tags creation.
Patch6: epiphany-bookmark-ensure-tags-sequence-is-created.patch
BuildRequires: fdupes
BuildRequires: meson
BuildRequires: pkgconfig