Update to 3.15.1
This commit is contained in:
parent
9c4a5fe5e5
commit
58b0fd02e0
1
.gitignore
vendored
1
.gitignore
vendored
@ -79,3 +79,4 @@ mutter-2.31.5.tar.bz2
|
|||||||
/mutter-3.13.92.tar.xz
|
/mutter-3.13.92.tar.xz
|
||||||
/mutter-3.14.0.tar.xz
|
/mutter-3.14.0.tar.xz
|
||||||
/mutter-3.14.1.tar.xz
|
/mutter-3.14.1.tar.xz
|
||||||
|
/mutter-3.15.1.tar.xz
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
From bb79a20fac05b1412eb4225e780d3dbcf45ebb6d Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
|
|
||||||
Date: Tue, 14 Oct 2014 22:19:57 -0700
|
|
||||||
Subject: [PATCH] display: Fix accidental inversion from 2f9c601
|
|
||||||
|
|
||||||
Commit 2f9c601 accidentally changed the logic here, changing the grab
|
|
||||||
behavior when not using raise-on-click. Fix this.
|
|
||||||
|
|
||||||
Spotted-by: Adam Goode <adam@spicenitz.org>
|
|
||||||
---
|
|
||||||
src/core/display.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/core/display.c b/src/core/display.c
|
|
||||||
index 4669593..185452b 100644
|
|
||||||
--- a/src/core/display.c
|
|
||||||
+++ b/src/core/display.c
|
|
||||||
@@ -1965,7 +1965,7 @@ meta_display_end_grab_op (MetaDisplay *display,
|
|
||||||
* beginning of the grab_op.
|
|
||||||
*/
|
|
||||||
if (!meta_prefs_get_raise_on_click () &&
|
|
||||||
- display->grab_threshold_movement_reached)
|
|
||||||
+ !display->grab_threshold_movement_reached)
|
|
||||||
meta_window_raise (display->grab_window);
|
|
||||||
|
|
||||||
meta_window_grab_op_ended (grab_window, grab_op);
|
|
||||||
--
|
|
||||||
2.1.0
|
|
||||||
|
|
12
mutter.spec
12
mutter.spec
@ -1,17 +1,15 @@
|
|||||||
%global clutter_version 1.19.6-3
|
%global clutter_version 1.19.6-3
|
||||||
|
|
||||||
Name: mutter
|
Name: mutter
|
||||||
Version: 3.14.1
|
Version: 3.15.1
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Window and compositing manager based on Clutter
|
Summary: Window and compositing manager based on Clutter
|
||||||
|
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
#VCS: git:git://git.gnome.org/mutter
|
#VCS: git:git://git.gnome.org/mutter
|
||||||
URL: http://www.gnome.org
|
URL: http://www.gnome.org
|
||||||
Source0: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/%{name}/3.15/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
Patch0: 0001-display-Fix-accidental-inversion-from-2f9c601.patch
|
|
||||||
|
|
||||||
BuildRequires: clutter-devel >= %{clutter_version}
|
BuildRequires: clutter-devel >= %{clutter_version}
|
||||||
BuildRequires: pango-devel
|
BuildRequires: pango-devel
|
||||||
@ -77,7 +75,6 @@ utilities for testing Metacity/Mutter themes.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .fix-raise-on-click-regression
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
|
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
|
||||||
@ -142,6 +139,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
|||||||
%exclude %{_datadir}/gtk-doc
|
%exclude %{_datadir}/gtk-doc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 30 2014 Florian Müllner <fmuellner@redhat.com> - 3.15.1-1
|
||||||
|
- Update to 3.15.1
|
||||||
|
|
||||||
* Tue Oct 21 2014 Florian Müllner <fmuellner@redhat.com> - 3.14.1-2
|
* Tue Oct 21 2014 Florian Müllner <fmuellner@redhat.com> - 3.14.1-2
|
||||||
- Fix regression in handling raise-on-click option (rhbz#1151918)
|
- Fix regression in handling raise-on-click option (rhbz#1151918)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user