From 66b57b38421993598bfb5c9da085edc93bc035ce3e9ef3678f226ce958063ffd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 28 Dec 2018 10:29:23 +0000 Subject: [PATCH] Accepting request 661682 from GNOME:Next Add upstream bug fix patches OBS-URL: https://build.opensuse.org/request/show/661682 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=305 --- epiphany-Fix-remote-inspector-support.patch | 33 +++++++++++++++++++ epiphany-Fix-saving-web-app-icons.patch | 26 +++++++++++++++ epiphany-Tags-with-empty-labels.patch | 25 ++++++++++++++ ...oding-dialog-add-some-column-spacing.patch | 28 ++++++++++++++++ epiphany-web-view-Handle-NULL-URIs.patch | 28 ++++++++++++++++ ...ny-window-Set-correct-current-height.patch | 31 +++++++++++++++++ epiphany.changes | 17 ++++++++++ epiphany.spec | 12 +++++++ 8 files changed, 200 insertions(+) create mode 100644 epiphany-Fix-remote-inspector-support.patch create mode 100644 epiphany-Fix-saving-web-app-icons.patch create mode 100644 epiphany-Tags-with-empty-labels.patch create mode 100644 epiphany-encoding-dialog-add-some-column-spacing.patch create mode 100644 epiphany-web-view-Handle-NULL-URIs.patch create mode 100644 epiphany-window-Set-correct-current-height.patch diff --git a/epiphany-Fix-remote-inspector-support.patch b/epiphany-Fix-remote-inspector-support.patch new file mode 100644 index 0000000..4d74297 --- /dev/null +++ b/epiphany-Fix-remote-inspector-support.patch @@ -0,0 +1,33 @@ +From 58d5eb7ec0b37e7e9964e4fe8a8da27e7e5b2070 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lo=C3=AFc=20Yhuel?= +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 + diff --git a/epiphany-Fix-saving-web-app-icons.patch b/epiphany-Fix-saving-web-app-icons.patch new file mode 100644 index 0000000..da4f4ca --- /dev/null +++ b/epiphany-Fix-saving-web-app-icons.patch @@ -0,0 +1,26 @@ +From 26d9b288244e5d5e715bcf860b0a200989ecc02d Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +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 + diff --git a/epiphany-Tags-with-empty-labels.patch b/epiphany-Tags-with-empty-labels.patch new file mode 100644 index 0000000..f071e6a --- /dev/null +++ b/epiphany-Tags-with-empty-labels.patch @@ -0,0 +1,25 @@ +From 77fab98a0ad4a33a8bfdb137afdda15973bea375 Mon Sep 17 00:00:00 2001 +From: Aral Balkan +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 + diff --git a/epiphany-encoding-dialog-add-some-column-spacing.patch b/epiphany-encoding-dialog-add-some-column-spacing.patch new file mode 100644 index 0000000..0a2ec0b --- /dev/null +++ b/epiphany-encoding-dialog-add-some-column-spacing.patch @@ -0,0 +1,28 @@ +From 86ac30111bc2031cd9738800c3322cd9fa8aca45 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +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 @@ + True + True + horizontal ++ 6 + + + True +-- +2.18.1 + diff --git a/epiphany-web-view-Handle-NULL-URIs.patch b/epiphany-web-view-Handle-NULL-URIs.patch new file mode 100644 index 0000000..7838c37 --- /dev/null +++ b/epiphany-web-view-Handle-NULL-URIs.patch @@ -0,0 +1,28 @@ +From 9da12c4843143124d2f57e968b5034e30048834b Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +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 + diff --git a/epiphany-window-Set-correct-current-height.patch b/epiphany-window-Set-correct-current-height.patch new file mode 100644 index 0000000..05c32e2 --- /dev/null +++ b/epiphany-window-Set-correct-current-height.patch @@ -0,0 +1,31 @@ +From db22b3e699cfa595746fc4c707de3db1fec1c969 Mon Sep 17 00:00:00 2001 +From: Jonathan Kang +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 + diff --git a/epiphany.changes b/epiphany.changes index 04b9494..ecb8e33 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Dec 27 23:22:15 UTC 2018 - bjorn.lie@gmail.com + +- Add upstream bug fix patches from stable branch: + + epiphany-window-Set-correct-current-height.patch: window: set + correct current height. + + epiphany-encoding-dialog-add-some-column-spacing.patch: + encoding-dialog: add some column spacing to grid. + + epiphany-web-view-Handle-NULL-URIs.patch: web-view: Handle NULL + URIs in ephy_web_view_set_address(). + + epiphany-Tags-with-empty-labels.patch: Tags with empty labels + are no longer allowed in bookmarks. + + epiphany-Fix-saving-web-app-icons.patch: Fix saving web app + icons when changed. + + epiphany-Fix-remote-inspector-support.patch: Fix remote + inspector support. + ------------------------------------------------------------------- Tue Oct 23 11:38:39 UTC 2018 - bjorn.lie@gmail.com diff --git a/epiphany.spec b/epiphany.spec index 6236c6e..722f292 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -25,6 +25,18 @@ Group: Productivity/Networking/Web/Browsers 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 BuildRequires: fdupes BuildRequires: meson