From 7b641c5b0ff260a30b1f528da7da30cac27e9c7ebcd325df8f40e89729c75651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 12 Nov 2015 16:19:44 +0000 Subject: [PATCH 1/3] Accepting request 344067 from home:Zaitor New upstream, note: gdm needs to go with this one in staging and reviewing OBS-URL: https://build.opensuse.org/request/show/344067 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=241 --- gnome-shell-3.18.1.tar.xz | 3 --- gnome-shell-3.18.2.tar.xz | 3 +++ gnome-shell-Fix-nb-translation.patch | 26 -------------------------- gnome-shell.changes | 16 ++++++++++++++++ gnome-shell.spec | 5 +---- 5 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 gnome-shell-3.18.1.tar.xz create mode 100644 gnome-shell-3.18.2.tar.xz delete mode 100644 gnome-shell-Fix-nb-translation.patch diff --git a/gnome-shell-3.18.1.tar.xz b/gnome-shell-3.18.1.tar.xz deleted file mode 100644 index a77c050..0000000 --- a/gnome-shell-3.18.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14a15215b3e29a25b94f69c58a6565e3a8cb2259b1ca242b906af78172bf3845 -size 1586756 diff --git a/gnome-shell-3.18.2.tar.xz b/gnome-shell-3.18.2.tar.xz new file mode 100644 index 0000000..f6a46f6 --- /dev/null +++ b/gnome-shell-3.18.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bf94b8ae8dd6e2ef696aeb87342ff99ae327df14aa73c8f9ec94beb69913892 +size 1589896 diff --git a/gnome-shell-Fix-nb-translation.patch b/gnome-shell-Fix-nb-translation.patch deleted file mode 100644 index bb748d7..0000000 --- a/gnome-shell-Fix-nb-translation.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- gnome-shell-3.17.90-orig/po/nb.po 2015-08-20 12:53:33.000000000 +0200 -+++ gnome-shell-3.17.90/po/nb.po 2015-08-20 20:03:17.852434150 +0200 -@@ -1536,19 +1536,19 @@ - - #: ../js/ui/windowMenu.js:105 - msgid "Move to Workspace Left" --msgstr "Gå til arbeidsområdet til venstre" -+msgstr "Flytt til arbeidsområdet til venstre" - - #: ../js/ui/windowMenu.js:110 - msgid "Move to Workspace Right" --msgstr "Gå til arbeidsområdet til høyre" -+msgstr "Flytt til arbeidsområdet til høyre" - - #: ../js/ui/windowMenu.js:115 - msgid "Move to Workspace Up" --msgstr "Gå til arbeidsområdet over" -+msgstr "Flytt til arbeidsområdet over" - - #: ../js/ui/windowMenu.js:120 - msgid "Move to Workspace Down" --msgstr "Gå til arbeidsområdet under" -+msgstr "Flytt til arbeidsområdet under" - - #: ../js/ui/windowMenu.js:136 - msgid "Move to Monitor Up" diff --git a/gnome-shell.changes b/gnome-shell.changes index f5d08e1..86d8a18 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Nov 12 16:05:25 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.18.2: + + Fix fullscreen animation glitches (bgo#756697, bgo#756714). + + Fix window menu being closed immediately in top orientation + (bgo#756605). + + Respect text-scaling factor under wayland (bgo#756447). + + Fix login screen getting stuck after authentification + (bgo#754814). + + Fix overview being toggled while still animating (bgo#756925). + + Improve robustness of browser plugin (bgo#737932, bgo#757940). + + Misc. bug fixes (bgo#756983, bgo#757150, bgo#757779). + + Updated translations. +- Drop gnome-shell-Fix-nb-translation.patch: Fixed upstream. + ------------------------------------------------------------------- Wed Nov 4 11:56:22 UTC 2015 - dimstar@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index c994f6c..e8c2dc4 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -17,7 +17,7 @@ Name: gnome-shell -Version: 3.18.1 +Version: 3.18.2 Release: 0 Summary: GNOME Shell License: GPL-2.0+ @@ -26,8 +26,6 @@ Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.18/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch -# PATCH-FIX-UPSTREAM gnome-shell-Fix-nb-translation.patch bgo#740906 zaitor@opensuse.org -- Fix Norwegian translation -Patch2: gnome-shell-Fix-nb-translation.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ BuildRequires: intltool @@ -155,7 +153,6 @@ into GNOME Shell calendar. %setup -q %patch1 -p1 translation-update-upstream -%patch2 -p1 %build export BROWSER_PLUGIN_DIR=%{_libdir}/browser-plugins From 4e6b3692cdf413b0e4da9e4efdd17738af74c4279552d715564a7b9c72da2197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 14 Nov 2015 12:44:44 +0000 Subject: [PATCH 2/3] Accepting request 344379 from home:Zaitor Lets not have firefox crash on extensions.gnome.org :-) OBS-URL: https://build.opensuse.org/request/show/344379 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=242 --- gnome-shell-revert-browser-plugin.patch | 42 +++++++++++++++++++++++++ gnome-shell.changes | 7 +++++ gnome-shell.spec | 3 ++ 3 files changed, 52 insertions(+) create mode 100644 gnome-shell-revert-browser-plugin.patch diff --git a/gnome-shell-revert-browser-plugin.patch b/gnome-shell-revert-browser-plugin.patch new file mode 100644 index 0000000..7343225 --- /dev/null +++ b/gnome-shell-revert-browser-plugin.patch @@ -0,0 +1,42 @@ +From 88c1fa8a3e9f34bda512999618c7fe54b182af36 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos +Date: Wed, 11 Nov 2015 12:30:24 +0100 +Subject: browser-plugin: Set windowless mode and don't claim to need XEmbed + +NPAPI plugins are windowed by default, so we need to set +NPPVpluginWindowBool value to FALSE on startup. This way the browser +will not create a GtkSocket for a GtkPlug that we are not going to +create. It doesn't make sense to claim that we need XEmbed either. + +https://bugzilla.gnome.org/show_bug.cgi?id=757940 +--- + browser-plugin/browser-plugin.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/browser-plugin/browser-plugin.c b/browser-plugin/browser-plugin.c +index e8b5cf6..290b224 100644 +--- a/browser-plugin/browser-plugin.c ++++ b/browser-plugin/browser-plugin.c +@@ -218,6 +218,9 @@ NPP_New(NPMIMEType mimetype, + data = g_slice_new (PluginData); + instance->pdata = data; + ++ /* set windowless mode */ ++ funcs.setvalue(instance, NPPVpluginWindowBool, NULL); ++ + data->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_NONE, + NULL, /* interface info */ +@@ -1048,10 +1051,6 @@ NPP_GetValue(NPP instance, + *(NPObject**)value = funcs.createobject (instance, &plugin_class); + break; + +- case NPPVpluginNeedsXEmbed: +- *(bool *)value = TRUE; +- break; +- + default: + ; + } +-- +cgit v0.11.2 diff --git a/gnome-shell.changes b/gnome-shell.changes index 86d8a18..7859079 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 14 11:02:44 UTC 2015 - zaitor@opensuse.org + +- Add gnome-shell-revert-browser-plugin.patch: Revert upstream + commit that makes the browser plugin crash in openSUSE + (bgo#757940, bgo#758035). + ------------------------------------------------------------------- Thu Nov 12 16:05:25 UTC 2015 - zaitor@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index e8c2dc4..b1436e8 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -26,6 +26,8 @@ Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.18/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch +# PATCH-FIX-UPSTREAM gnome-shell-revert-browser-plugin.patch bgo#757940 bgo#758035 zaitor@opensuse.org -- Revert browser-plugin: link with -Wl,-z,nodelete, it makes the plugin crash in openSUSE. +Patch2: gnome-shell-revert-browser-plugin.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ BuildRequires: intltool @@ -152,6 +154,7 @@ into GNOME Shell calendar. %prep %setup -q %patch1 -p1 +%patch2 -p1 -R translation-update-upstream %build From e0aa7764dc06ea9f4d85814da12a21c9e47eb84b811b5bbf611c11420e2d1d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 18 Nov 2015 18:28:49 +0000 Subject: [PATCH 3/3] Accepting request 344974 from home:Zaitor New stable rel, I guess this can wait until what we have in staging is checked in.... OBS-URL: https://build.opensuse.org/request/show/344974 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=243 --- gnome-shell-3.18.2.tar.xz | 3 -- gnome-shell-3.18.3.tar.xz | 3 ++ gnome-shell-revert-browser-plugin.patch | 42 ------------------------- gnome-shell.changes | 7 +++++ gnome-shell.spec | 5 +-- 5 files changed, 11 insertions(+), 49 deletions(-) delete mode 100644 gnome-shell-3.18.2.tar.xz create mode 100644 gnome-shell-3.18.3.tar.xz delete mode 100644 gnome-shell-revert-browser-plugin.patch diff --git a/gnome-shell-3.18.2.tar.xz b/gnome-shell-3.18.2.tar.xz deleted file mode 100644 index f6a46f6..0000000 --- a/gnome-shell-3.18.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7bf94b8ae8dd6e2ef696aeb87342ff99ae327df14aa73c8f9ec94beb69913892 -size 1589896 diff --git a/gnome-shell-3.18.3.tar.xz b/gnome-shell-3.18.3.tar.xz new file mode 100644 index 0000000..47d46db --- /dev/null +++ b/gnome-shell-3.18.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8517baf8606f970ebf38222411eb7563cab2ae5efbfb088954ce23705b67519b +size 1590348 diff --git a/gnome-shell-revert-browser-plugin.patch b/gnome-shell-revert-browser-plugin.patch deleted file mode 100644 index 7343225..0000000 --- a/gnome-shell-revert-browser-plugin.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 88c1fa8a3e9f34bda512999618c7fe54b182af36 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos -Date: Wed, 11 Nov 2015 12:30:24 +0100 -Subject: browser-plugin: Set windowless mode and don't claim to need XEmbed - -NPAPI plugins are windowed by default, so we need to set -NPPVpluginWindowBool value to FALSE on startup. This way the browser -will not create a GtkSocket for a GtkPlug that we are not going to -create. It doesn't make sense to claim that we need XEmbed either. - -https://bugzilla.gnome.org/show_bug.cgi?id=757940 ---- - browser-plugin/browser-plugin.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/browser-plugin/browser-plugin.c b/browser-plugin/browser-plugin.c -index e8b5cf6..290b224 100644 ---- a/browser-plugin/browser-plugin.c -+++ b/browser-plugin/browser-plugin.c -@@ -218,6 +218,9 @@ NPP_New(NPMIMEType mimetype, - data = g_slice_new (PluginData); - instance->pdata = data; - -+ /* set windowless mode */ -+ funcs.setvalue(instance, NPPVpluginWindowBool, NULL); -+ - data->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, - G_DBUS_PROXY_FLAGS_NONE, - NULL, /* interface info */ -@@ -1048,10 +1051,6 @@ NPP_GetValue(NPP instance, - *(NPObject**)value = funcs.createobject (instance, &plugin_class); - break; - -- case NPPVpluginNeedsXEmbed: -- *(bool *)value = TRUE; -- break; -- - default: - ; - } --- -cgit v0.11.2 diff --git a/gnome-shell.changes b/gnome-shell.changes index 7859079..4f5df36 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 17 22:27:14 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.18.3: + + Fix browser plugin crash in Firefox (bgo#737932, bgo#757940). +- Drop gnome-shell-revert-browser-plugin.patch: Fixed upstream. + ------------------------------------------------------------------- Sat Nov 14 11:02:44 UTC 2015 - zaitor@opensuse.org diff --git a/gnome-shell.spec b/gnome-shell.spec index b1436e8..5c316b4 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -17,7 +17,7 @@ Name: gnome-shell -Version: 3.18.2 +Version: 3.18.3 Release: 0 Summary: GNOME Shell License: GPL-2.0+ @@ -26,8 +26,6 @@ Url: http://live.gnome.org/GnomeShell Source: http://download.gnome.org/sources/gnome-shell/3.18/%{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Patch1: gnome-shell-private-connection.patch -# PATCH-FIX-UPSTREAM gnome-shell-revert-browser-plugin.patch bgo#757940 bgo#758035 zaitor@opensuse.org -- Revert browser-plugin: link with -Wl,-z,nodelete, it makes the plugin crash in openSUSE. -Patch2: gnome-shell-revert-browser-plugin.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc-c++ BuildRequires: intltool @@ -154,7 +152,6 @@ into GNOME Shell calendar. %prep %setup -q %patch1 -p1 -%patch2 -p1 -R translation-update-upstream %build