From 292a1759fe3b55d54ad61604f31b567b473f6e5a64fb804630c477fbaded4cb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 18 Apr 2015 16:43:54 +0000 Subject: [PATCH] Accepting request 297688 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/297688 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=171 --- mutter-3.16.0.tar.xz | 3 -- mutter-3.16.1.1.tar.xz | 3 ++ mutter-nvidia-repaint-on-resume.patch | 70 --------------------------- mutter.changes | 25 ++++++++++ mutter.spec | 5 +- 5 files changed, 30 insertions(+), 76 deletions(-) delete mode 100644 mutter-3.16.0.tar.xz create mode 100644 mutter-3.16.1.1.tar.xz delete mode 100644 mutter-nvidia-repaint-on-resume.patch diff --git a/mutter-3.16.0.tar.xz b/mutter-3.16.0.tar.xz deleted file mode 100644 index d99a4fe..0000000 --- a/mutter-3.16.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2c052cee7edd1ef34d501c4203ec9bc5f15a52a157d1595f3bc5268ca840695 -size 1548808 diff --git a/mutter-3.16.1.1.tar.xz b/mutter-3.16.1.1.tar.xz new file mode 100644 index 0000000..8474235 --- /dev/null +++ b/mutter-3.16.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:795084f6b642ab45e9f73b82b185949a110f2149bc0bce9f70ff30c8ab4c051c +size 1550072 diff --git a/mutter-nvidia-repaint-on-resume.patch b/mutter-nvidia-repaint-on-resume.patch deleted file mode 100644 index 16b3890..0000000 --- a/mutter-nvidia-repaint-on-resume.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6b3be51ca862b7c878a03c7ee730f3e3abaa2daa Mon Sep 17 00:00:00 2001 -From: Rui Matos -Date: Thu, 19 Mar 2015 14:58:25 +0100 -Subject: meta-background: Add a function to refresh all background instances - -We need to reload the FBOs under some circumstances, this adds a way -to easily do so. - -https://bugzilla.gnome.org/show_bug.cgi?id=739178 - -diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c -index 0370f55..75fbc28 100644 ---- a/src/compositor/meta-background.c -+++ b/src/compositor/meta-background.c -@@ -71,6 +71,8 @@ enum - - G_DEFINE_TYPE (MetaBackground, meta_background, G_TYPE_OBJECT) - -+static GSList *all_backgrounds = NULL; -+ - static void - free_fbos (MetaBackground *self) - { -@@ -291,6 +293,8 @@ meta_background_dispose (GObject *object) - static void - meta_background_finalize (GObject *object) - { -+ all_backgrounds = g_slist_remove (all_backgrounds, object); -+ - G_OBJECT_CLASS (meta_background_parent_class)->finalize (object); - } - -@@ -333,6 +337,7 @@ meta_background_init (MetaBackground *self) - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - META_TYPE_BACKGROUND, - MetaBackgroundPrivate); -+ all_backgrounds = g_slist_prepend (all_backgrounds, self); - } - - static void -@@ -899,3 +904,12 @@ meta_background_set_blend (MetaBackground *self, - free_wallpaper_texture (self); - mark_changed (self); - } -+ -+void -+meta_background_refresh_all (void) -+{ -+ GSList *l; -+ -+ for (l = all_backgrounds; l; l = l->next) -+ mark_changed (l->data); -+} -diff --git a/src/meta/meta-background.h b/src/meta/meta-background.h -index 38706dc..aa7c707 100644 ---- a/src/meta/meta-background.h -+++ b/src/meta/meta-background.h -@@ -57,6 +57,8 @@ struct _MetaBackground - MetaBackgroundPrivate *priv; - }; - -+void meta_background_refresh_all (void); -+ - GType meta_background_get_type (void); - - MetaBackground *meta_background_new (MetaScreen *screen); --- -cgit v0.10.2 - - diff --git a/mutter.changes b/mutter.changes index 893b7c2..c9357a2 100644 --- a/mutter.changes +++ b/mutter.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Wed Apr 15 15:22:38 UTC 2015 - zaitor@opensuse.org + +- Update to version 3.16.1.1: + + Prevent a crash when switching VTs or adding input devices + (bgo#747886). + +------------------------------------------------------------------- +Wed Apr 15 06:20:25 UTC 2015 - dimstar@opensuse.org + +- Update to version 3.16.1: + + Add function to refresh all background instances (bgo#739178). + + Fix swapped scroll methods on wayland (bgo#746870). + + Manually activate stage to fix accessibility on wayland + (bgo#746670). + + Center pointer on primary monitor on startup (bgo#746896). + + wayland: Reword synchronized state application semantics + (bgo#743617). + + Ensure input settings are applied on startup (bgo#747434). + + Misc. bug fixes: bgo#744932, bgo#746509, bgo#746692, + bgo#746510, bo#746545, bgo#747263. + + Updated translations. +- Add pkgconfig(xrender) BuildRequires: new verified dependency. +- Drop mutter-nvidia-repaint-on-resume.patch: fixed upstream. + ------------------------------------------------------------------- Thu Mar 26 16:58:43 UTC 2015 - dimstar@opensuse.org diff --git a/mutter.spec b/mutter.spec index b41ceb8..4812053 100644 --- a/mutter.spec +++ b/mutter.spec @@ -23,15 +23,13 @@ %endif Name: mutter -Version: 3.16.0 +Version: 3.16.1.1 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/mutter/3.16/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM mutter-nvidia-repaint-on-resume.patch boo#9141409 bgo#739178 dimstar@opensuse.org -- meta-background: Add a function to refresh all background instances -Patch0: mutter-nvidia-repaint-on-resume.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: intltool @@ -67,6 +65,7 @@ BuildRequires: pkgconfig(xkbcommon) >= 0.4.3 BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xkeyboard-config) +BuildRequires: pkgconfig(xrender) %if %{with wayland} BuildRequires: pkgconfig(clutter-egl-1.0) BuildRequires: pkgconfig(clutter-wayland-1.0)