Accepting request 832974 from home:iznogood:branches:GNOME:Factory

- Update to version 3.36.6+2:
  + kms/crtc:
    - Always consider gamma state valid.
    - Read initial gamma state.
  + Fix stale cursor positions in remote desktop sessions.
  + Limit mipmap levels when rendering background.
  + Improve support for Hangul input method.
  + Fixed crashes.
  + Plugged memory leaks.
  + Misc. bug fixes and cleanups.
- Drop patch fixed upstream:
  + mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch

OBS-URL: https://build.opensuse.org/request/show/832974
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=361

_service

@@ -2,7 +2,7 @@
   <service name="obs_scm" mode="disabled">
     <param name="scm">git</param>
     <param name="url">https://gitlab.gnome.org/GNOME/mutter.git</param>
-    <param name="revision">3.36.5</param>
+    <param name="revision">gnome-3-36</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>

mutter-3.36.5.obscpio

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:155369ba61ea643e881859eba4e78245afbdb1b7cd24c3c34f51a8011f5b99f7
-size 24282125

mutter-3.36.6+2.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b872cff27f4b4cc6fba0529b08057a6817bd7d2e67098024d520b0f21cac0d36
+size 24292877

mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch

@@ -1,33 +0,0 @@
-From dfe33897db0989635e4a789290dd2a73da39ca5c Mon Sep 17 00:00:00 2001
-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Tue, 9 Jun 2020 18:25:59 +0800
-Subject: [PATCH] meson_options: Use libGLESv2.so.2 for COGL_DRIVER=gles2, not
- libGLESv2.so
-
-The former is present on any system that supports OpenGL|ES 2. The latter
-is just provided in developer packages. Since we access the library via
-`g_module_open` it's safe to just rely on `libGLESv2.so.2`.
-
-Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/1282
-
-https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1298
----
- meson_options.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson_options.txt b/meson_options.txt
-index 75a1961e4..655ef433f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -12,7 +12,7 @@ option('opengl_libname',
- 
- option('gles2_libname',
-   type: 'string',
--  value: 'libGLESv2.so',
-+  value: 'libGLESv2.so.2',
-   description: 'GLESv2 library file name'
- )
- 
--- 
-2.26.2
-

mutter.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Sep  8 12:03:37 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.36.6+2:
+  + kms/crtc:
+    - Always consider gamma state valid.
+    - Read initial gamma state.
+  + Fix stale cursor positions in remote desktop sessions.
+  + Limit mipmap levels when rendering background.
+  + Improve support for Hangul input method.
+  + Fixed crashes.
+  + Plugged memory leaks.
+  + Misc. bug fixes and cleanups.
+- Drop patch fixed upstream:
+  + mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch
+
 -------------------------------------------------------------------
 Thu Aug 20 15:34:43 UTC 2020 - Frederic Crozat <fcrozat@suse.com>
 

mutter.obsinfo

@@ -1,5 +1,5 @@
 name: mutter
-version: 3.36.5
-mtime: 1597174901
-commit: 7d061a06dec02278bef1054e502cae8837c39f2f
+version: 3.36.6+2
+mtime: 1599554315
+commit: 95ed477f85ca6643ccb6b5e2a1f27c09aa278b0e
 

mutter.spec

@@ -23,7 +23,7 @@
 %define api_minor 0
 %define libmutter libmutter-%{api_major}-%{api_minor}
 Name:           mutter
-Version:        3.36.5
+Version:        3.36.6+2
 Release:        0
 Summary:        Window and compositing manager based on Clutter
 License:        GPL-2.0-or-later
@@ -35,8 +35,6 @@ Source:         %{name}-%{version}.tar.xz
 Patch3:         mutter-Lower-HIDPI_LIMIT-to-144.patch
 # PATCH-FIX-UPSTREAM mutter-disable-cvt-s390x.patch bsc#1158128 fcrozat@suse.com -- Do not search for cvt on s390x, it doesn't exist there
 Patch4:         mutter-disable-cvt-s390x.patch
-# PATCH-FIX-UPSTREAM mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch boo#1175559 glgo#GNOME/mutter!1282 fcrozat@suse.com -- Fix loading libGLESv2.so.2 
-Patch5:         mutter-meson_options-Use-libGLESv2.so.2-for-COGL_DRIVER-gle.patch
 
 ## SLE-only patches start at 1000
 # PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
@@ -158,7 +156,6 @@ applications that want to make use of the mutter library.
 %setup -q
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 # SLE-only patches and translations.
 translation-update-upstream po mutter