Accepting request 458738 from GNOME:Factory
1 OBS-URL: https://build.opensuse.org/request/show/458738 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=124
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f3cec723ec
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d80f4eb662ada325165b066112e924f4c16044f153c274c886d7f99b9ddc559b
|
||||
size 1949420
|
||||
3
gnome-shell-3.22.3.tar.xz
Normal file
3
gnome-shell-3.22.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d1e6bd80ddd1fef92d80b518d4dbeffa296e8f003402551b8c37c42744b7d42f
|
||||
size 1952576
|
||||
@ -1,93 +0,0 @@
|
||||
From 92630f67c61816be21b8e1fa618c11915dbbee51 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Mon, 21 Nov 2016 18:09:42 +0100
|
||||
Subject: [PATCH 1/2] animations: Guard against empty animations
|
||||
|
||||
Our animation code not only relies on the animation being loaded
|
||||
(which we handle), but also on having at least one frame - otherwise
|
||||
the computation of the next frame index will turn up NaN through
|
||||
division by zero. Guard against this case by treating empty animations
|
||||
as not loaded.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=774805
|
||||
---
|
||||
js/ui/animation.js | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/ui/animation.js b/js/ui/animation.js
|
||||
index 23ec934..1ae9ba0 100644
|
||||
--- a/js/ui/animation.js
|
||||
+++ b/js/ui/animation.js
|
||||
@@ -67,7 +67,7 @@ const Animation = new Lang.Class({
|
||||
},
|
||||
|
||||
_animationsLoaded: function() {
|
||||
- this._isLoaded = true;
|
||||
+ this._isLoaded = this._animations.get_n_children() > 0;
|
||||
|
||||
if (this._isPlaying)
|
||||
this.play();
|
||||
--
|
||||
2.9.2
|
||||
|
||||
|
||||
From 516568a226ca908c6170f8b568d36ab5ec63d1e1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Tue, 22 Nov 2016 18:12:35 +0100
|
||||
Subject: [PATCH 2/2] texture-cache: Warn when loading sliced image fails
|
||||
|
||||
Sliced images are loaded into a group actor with one child actor
|
||||
per slice. In case loading the image fails, we currently quietly
|
||||
return the empty group actor, which makes diagnosing problems
|
||||
unnecessarily hard - just be a bit more verbose on failure.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=774805
|
||||
---
|
||||
src/st/st-texture-cache.c | 16 ++++++++++++----
|
||||
1 file changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
|
||||
index 1c718ac..281241a 100644
|
||||
--- a/src/st/st-texture-cache.c
|
||||
+++ b/src/st/st-texture-cache.c
|
||||
@@ -1088,6 +1088,7 @@ load_sliced_image (GTask *result,
|
||||
GdkPixbuf *pix;
|
||||
gint width, height, y, x;
|
||||
GdkPixbufLoader *loader;
|
||||
+ GError *error = NULL;
|
||||
gchar *buffer = NULL;
|
||||
gsize length;
|
||||
|
||||
@@ -1099,11 +1100,17 @@ load_sliced_image (GTask *result,
|
||||
loader = gdk_pixbuf_loader_new ();
|
||||
g_signal_connect (loader, "size-prepared", G_CALLBACK (on_loader_size_prepared), data);
|
||||
|
||||
- if (!g_file_load_contents (data->gfile, NULL, &buffer, &length, NULL, NULL))
|
||||
- goto out;
|
||||
+ if (!g_file_load_contents (data->gfile, NULL, &buffer, &length, NULL, &error))
|
||||
+ {
|
||||
+ g_warning ("Failed to open sliced image: %s", error->message);
|
||||
+ goto out;
|
||||
+ }
|
||||
|
||||
- if (!gdk_pixbuf_loader_write (loader, (const guchar *) buffer, length, NULL))
|
||||
- goto out;
|
||||
+ if (!gdk_pixbuf_loader_write (loader, (const guchar *) buffer, length, &error))
|
||||
+ {
|
||||
+ g_warning ("Failed to load image: %s", error->message);
|
||||
+ goto out;
|
||||
+ }
|
||||
|
||||
if (!gdk_pixbuf_loader_close (loader, NULL))
|
||||
goto out;
|
||||
@@ -1128,6 +1135,7 @@ load_sliced_image (GTask *result,
|
||||
* though the subpixbufs will hold a reference. */
|
||||
g_object_unref (loader);
|
||||
g_free (buffer);
|
||||
+ g_clear_pointer (&error, g_error_free);
|
||||
g_task_return_pointer (result, res, free_glist_unref_gobjects);
|
||||
}
|
||||
|
||||
--
|
||||
2.9.2
|
||||
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 17 10:44:27 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.22.3:
|
||||
+ Work around portal failures by using a URL without HTPPS
|
||||
redirect (bgo#769940).
|
||||
+ Fix replacing of GNotifications (bgo#775149).
|
||||
+ Reload apps on .desktop file content changes (bgo#773636).
|
||||
+ Fix subsurfaces not showing up in previews (bgo#756715).
|
||||
+ Fix theme node transitions (bgo#778145).
|
||||
+ Don't allow type ahead at the login screen (bgo#766139).
|
||||
+ Misc. bug fixes: bgo#774643, bgo#774805, bgo#775507,
|
||||
bgo#776130, bgo#759793, bgo#745626.
|
||||
+ Updated translations.
|
||||
- Drop gnome-shell-bgo774805-guard-against-animations-that-dont-load.patch:
|
||||
Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 4 08:22:53 CST 2017 - federico@suse.com
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
%global __requires_exclude typelib\\(Meta\\)
|
||||
|
||||
Name: gnome-shell
|
||||
Version: 3.22.2
|
||||
Version: 3.22.3
|
||||
Release: 0
|
||||
Summary: GNOME Shell
|
||||
License: GPL-2.0+
|
||||
@ -56,8 +56,6 @@ Patch10: gnome-shell-970480-authprompt-wrapping-message.patch
|
||||
Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
|
||||
# PATCH-FEATURE-SLE gnome-shell-sle-theme.patch dliang@suse.com -- Use sle theme avatar
|
||||
Patch12: gnome-shell-sle-theme.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-shell-bgo774805-guard-against-animations-that-dont-load.patch bgo#774805 federico@suse.com -- Make the auth dialog work even if an animation can't be loaded
|
||||
Patch13: gnome-shell-bgo774805-guard-against-animations-that-dont-load.patch
|
||||
## NOTE: Keep SLE Classic pathes at bottom.
|
||||
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
|
||||
Patch1000: gs-sle-classic-ext.patch
|
||||
@ -92,7 +90,7 @@ BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||
BuildRequires: pkgconfig(libcroco-0.6) >= 0.6.8
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= 3.5.3
|
||||
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.5.3
|
||||
BuildRequires: pkgconfig(libmutter) >= 3.22.1
|
||||
BuildRequires: pkgconfig(libmutter) >= 3.22.3
|
||||
BuildRequires: pkgconfig(libnm-glib)
|
||||
BuildRequires: pkgconfig(libnm-gtk) >= 0.9.8
|
||||
BuildRequires: pkgconfig(libnm-util) >= 0.9.8
|
||||
@ -205,7 +203,6 @@ into GNOME Shell calendar.
|
||||
%patch12 -p1
|
||||
%endif
|
||||
%endif
|
||||
%patch13 -p1
|
||||
%if !0%{?is_opensuse}
|
||||
%patch1000 -p1
|
||||
translation-update-upstream
|
||||
@ -289,8 +286,11 @@ rm -rf %{buildroot}
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/gnome-shell-extension-tool
|
||||
%{_bindir}/gnome-shell-perf-tool
|
||||
%doc %{_datadir}/gtk-doc/html/st/
|
||||
%doc %{_datadir}/gtk-doc/html/shell/
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
%dir %{_datadir}/gtk-doc/html/st
|
||||
%dir %{_datadir}/gtk-doc/html/shell
|
||||
%{_datadir}/gtk-doc/html/st/
|
||||
%{_datadir}/gtk-doc/html/shell/
|
||||
|
||||
%files browser-plugin
|
||||
%defattr(-,root,root)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user