fmuellner pushed to mutter (f22). "Update to 3.16.2"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu May 14 13:40:55 UTC 2015


From cee87b84bf01070b3c509c6d80bccd5987276924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
Date: Thu, 14 May 2015 15:40:31 +0200
Subject: Update to 3.16.2


diff --git a/.gitignore b/.gitignore
index 3eaaaa1..e7a3d32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,4 @@ mutter-2.31.5.tar.bz2
 /mutter-3.16.0.tar.xz
 /mutter-3.16.1.tar.xz
 /mutter-3.16.1.1.tar.xz
+/mutter-3.16.2.tar.xz
diff --git a/backend-x11-Fix-set_scroll_button.patch b/backend-x11-Fix-set_scroll_button.patch
deleted file mode 100644
index 7ee021d..0000000
--- a/backend-x11-Fix-set_scroll_button.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c99da71e96513b65744bfa75e3bae71afe42f3a7 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy at redhat.com>
-Date: Wed, 15 Apr 2015 17:55:38 +0200
-Subject: backends/x11: Fix set_scroll_button
-
-There is copy&pasted code in set_scroll_button, which is apparently
-wrong, because it is trying to set scroll method instead of the scroll
-button...
-
-https://bugzilla.gnome.org/show_bug.cgi?id=747967
-
-diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
-index b1060a9..d0a3440 100644
---- a/src/backends/x11/meta-input-settings-x11.c
-+++ b/src/backends/x11/meta-input-settings-x11.c
-@@ -180,7 +180,7 @@ meta_input_settings_x11_set_scroll_button (MetaInputSettings  *settings,
-                                            ClutterInputDevice *device,
-                                            guint               button)
- {
--  change_property (device, "libinput Scroll Method Enabled",
-+  change_property (device, "libinput Button Scrolling Button",
-                    XA_INTEGER, 32, &button, 1);
- }
- 
--- 
-cgit v0.10.2
-
diff --git a/mutter.spec b/mutter.spec
index 2d4515e..329c4bc 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -2,8 +2,8 @@
 %global gsettings_desktop_schemas_version 3.15.92
 
 Name:          mutter
-Version:       3.16.1.1
-Release:       4%{?dist}
+Version:       3.16.2
+Release:       1%{?dist}
 Summary:       Window and compositing manager based on Clutter
 
 Group:         User Interface/Desktops
@@ -14,7 +14,6 @@ Source0:       http://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1200901
 Patch0:        0001-Force-cursor-update-after-applying-configuration.patch
-Patch1:        backend-x11-Fix-set_scroll_button.patch
 
 BuildRequires: clutter-devel >= %{clutter_version}
 BuildRequires: pango-devel
@@ -99,7 +98,6 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q
 %patch0 -p1 -b .fix-cursor
-%patch1 -p1 -b .libinput-fix
 
 %build
 autoreconf -f -i
@@ -170,6 +168,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/mutter/tests
 
 %changelog
+* Thu May 14 2015 Florian Müllner <fmuellner at redhat.com> - 3.16.2-1
+- Update to 3.16.2
+
 * Mon May 11 2015 Ray Strode <rstrode at redhat.com> 3.17.1-2
 - workaround qxl cursor visibility wonkiness
   Related: #1200901
diff --git a/sources b/sources
index 8c12f09..b4a8961 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a3a93b5171ffcf9aa0ffe336da61e2c3  mutter-3.16.1.1.tar.xz
+35213076a00b8da56dc55202bf99f608  mutter-3.16.2.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mutter.git/commit/?h=f22&id=cee87b84bf01070b3c509c6d80bccd5987276924


More information about the scm-commits mailing list