From 2c149c657f4ad81539c8ca3aaaec62ca97746371f0b0b6243bbd304e1928ddda Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 14 Dec 2017 20:59:17 +0000 Subject: [PATCH 1/4] Accepting request 557145 from home:Zaitor - 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 --- epiphany-3.26.3.tar.xz | 3 - epiphany-3.26.4.tar.xz | 3 + ...hany-session-rework-the-safety-check.patch | 65 +++++++++++++++++++ epiphany.changes | 16 +++++ epiphany.spec | 6 +- 5 files changed, 88 insertions(+), 5 deletions(-) delete mode 100644 epiphany-3.26.3.tar.xz create mode 100644 epiphany-3.26.4.tar.xz create mode 100644 epiphany-session-rework-the-safety-check.patch diff --git a/epiphany-3.26.3.tar.xz b/epiphany-3.26.3.tar.xz deleted file mode 100644 index 393c125..0000000 --- a/epiphany-3.26.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb50042496e704621db3d0213581b0f914c639e160522751f64c5e5f6e6040b5 -size 4410412 diff --git a/epiphany-3.26.4.tar.xz b/epiphany-3.26.4.tar.xz new file mode 100644 index 0000000..10b1d5b --- /dev/null +++ b/epiphany-3.26.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea +size 4418620 diff --git a/epiphany-session-rework-the-safety-check.patch b/epiphany-session-rework-the-safety-check.patch new file mode 100644 index 0000000..c360289 --- /dev/null +++ b/epiphany-session-rework-the-safety-check.patch @@ -0,0 +1,65 @@ +From 370b87f27fa9ad8be201d33f4eb6cf5ec39e3f56 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +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 + diff --git a/epiphany.changes b/epiphany.changes index e47b923..14785dc 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -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 diff --git a/epiphany.spec b/epiphany.spec index 2cc0b68..8c06451 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -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 From e062d532a5fa11c31969f059b9c8d11d2385d2b44bfaccfc1545fefc0aa67e09 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 20 Dec 2017 15:49:47 +0000 Subject: [PATCH 2/4] Accepting request 558218 from home:Zaitor New stable rel OBS-URL: https://build.opensuse.org/request/show/558218 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=272 --- epiphany-3.26.4.tar.xz | 3 - epiphany-3.26.5.tar.xz | 3 + ...hany-session-rework-the-safety-check.patch | 65 ------------------- epiphany.changes | 10 +++ epiphany.spec | 4 +- 5 files changed, 14 insertions(+), 71 deletions(-) delete mode 100644 epiphany-3.26.4.tar.xz create mode 100644 epiphany-3.26.5.tar.xz delete mode 100644 epiphany-session-rework-the-safety-check.patch diff --git a/epiphany-3.26.4.tar.xz b/epiphany-3.26.4.tar.xz deleted file mode 100644 index 10b1d5b..0000000 --- a/epiphany-3.26.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:390d50f975f8ab9228016eb60bf4b8ea9a39be0b31467e2d6c27ae75fa1e84ea -size 4418620 diff --git a/epiphany-3.26.5.tar.xz b/epiphany-3.26.5.tar.xz new file mode 100644 index 0000000..4cf3dac --- /dev/null +++ b/epiphany-3.26.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73f2315939988c03b3b641772c2f095494e379511537661173d4bc8b480f9e82 +size 4419668 diff --git a/epiphany-session-rework-the-safety-check.patch b/epiphany-session-rework-the-safety-check.patch deleted file mode 100644 index c360289..0000000 --- a/epiphany-session-rework-the-safety-check.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 370b87f27fa9ad8be201d33f4eb6cf5ec39e3f56 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -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 - diff --git a/epiphany.changes b/epiphany.changes index 14785dc..4c129d0 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 18 16:28:08 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.26.5: + + Fix error in sync migration when migrating from 3.26.2 or + earlier. + + Improved logic to avoid corrupting session state. +- Drop epiphany-session-rework-the-safety-check.patch: Fixed + upstream. + ------------------------------------------------------------------- Thu Dec 14 17:15:32 UTC 2017 - zaitor@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 8c06451..ec3d229 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -17,7 +17,7 @@ Name: epiphany -Version: 3.26.4 +Version: 3.26.5 Release: 0 Summary: GNOME Web Browser License: GPL-3.0+ @@ -25,8 +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-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 From 52442fc19ac23b8ef1e4c05a125611b0e0750ac6cdb080f7bb02d9a6aa64e28c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 27 Dec 2017 08:35:59 +0000 Subject: [PATCH 3/4] Accepting request 559586 from home:Zaitor New stable OBS-URL: https://build.opensuse.org/request/show/559586 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=273 --- epiphany-3.26.5.1.tar.xz | 3 +++ epiphany-3.26.5.tar.xz | 3 --- epiphany.changes | 7 +++++++ epiphany.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 epiphany-3.26.5.1.tar.xz delete mode 100644 epiphany-3.26.5.tar.xz diff --git a/epiphany-3.26.5.1.tar.xz b/epiphany-3.26.5.1.tar.xz new file mode 100644 index 0000000..73cd7c9 --- /dev/null +++ b/epiphany-3.26.5.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b2f1c48e6f50793ff205d9215add5596ab5c7ebf4cef76907868fcd5a029221 +size 4418232 diff --git a/epiphany-3.26.5.tar.xz b/epiphany-3.26.5.tar.xz deleted file mode 100644 index 4cf3dac..0000000 --- a/epiphany-3.26.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73f2315939988c03b3b641772c2f095494e379511537661173d4bc8b480f9e82 -size 4419668 diff --git a/epiphany.changes b/epiphany.changes index 4c129d0..c353aa7 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Dec 23 12:03:00 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.26.5.1: + + Correct logic to avoid corrupting session state. + + Updated translations. + ------------------------------------------------------------------- Mon Dec 18 16:28:08 UTC 2017 - zaitor@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index ec3d229..f40e204 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -17,7 +17,7 @@ Name: epiphany -Version: 3.26.5 +Version: 3.26.5.1 Release: 0 Summary: GNOME Web Browser License: GPL-3.0+ From 04f9dcd23627e23a35560de6f606a008b5dd98b1863de92bb3dadd8b7aaf5010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sun, 7 Jan 2018 21:36:23 +0000 Subject: [PATCH 4/4] Accepting request 561714 from home:Zaitor - Add epiphany-application-mode-fix-desktopfile.patch: application mode: use strstr() to get base name of the desktop file (bgo#790781). OBS-URL: https://build.opensuse.org/request/show/561714 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=274 --- ...any-application-mode-fix-desktopfile.patch | 32 +++++++++++++++++++ epiphany.changes | 7 ++++ epiphany.spec | 3 ++ 3 files changed, 42 insertions(+) create mode 100644 epiphany-application-mode-fix-desktopfile.patch diff --git a/epiphany-application-mode-fix-desktopfile.patch b/epiphany-application-mode-fix-desktopfile.patch new file mode 100644 index 0000000..b926e94 --- /dev/null +++ b/epiphany-application-mode-fix-desktopfile.patch @@ -0,0 +1,32 @@ +From 967eec8db71ea9777765d1ffd8acf4196f9c37cb Mon Sep 17 00:00:00 2001 +From: Jonathan Kang +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 diff --git a/epiphany.changes b/epiphany.changes index c353aa7..d763963 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jan 1 20:08:44 UTC 2018 - zaitor@opensuse.org + +- Add epiphany-application-mode-fix-desktopfile.patch: application + mode: use strstr() to get base name of the desktop file + (bgo#790781). + ------------------------------------------------------------------- Sat Dec 23 12:03:00 UTC 2017 - zaitor@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index f40e204..86e4f24 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -25,6 +25,9 @@ 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 + BuildRequires: fdupes BuildRequires: meson BuildRequires: pkgconfig