diff --git a/.gitignore b/.gitignore index cf9ba35..a317da3 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ mutter-2.31.5.tar.bz2 /mutter-3.21.92.tar.xz /mutter-3.22.0.tar.xz /mutter-3.22.1.tar.xz +/mutter-3.23.1.tar.xz diff --git a/0001-clutter-stage-Fix-framebuffer-capture-origin-offset-.patch b/0001-clutter-stage-Fix-framebuffer-capture-origin-offset-.patch deleted file mode 100644 index 4b88314..0000000 --- a/0001-clutter-stage-Fix-framebuffer-capture-origin-offset-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5ec5e294226ef8ef47af1b56b4c0c349aea7d607 Mon Sep 17 00:00:00 2001 -From: Rui Matos -Date: Wed, 21 Sep 2016 15:06:08 +0200 -Subject: [PATCH] clutter/stage: Fix framebuffer capture origin offset (again) - -Commit 5fbb4793017b1891f0de4720a9793e8cfc1c8483 was wrong too. What we -really want to do here is getting view relative coordinates given the -view's and the rectangle's global coordinates so we need to subtract -the view's origin from the rectangle's. - -https://bugzilla.gnome.org/show_bug.cgi?id=771502 ---- - clutter/clutter/clutter-stage.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/clutter/clutter/clutter-stage.c b/clutter/clutter/clutter-stage.c -index 1d2c0bc..21968b9 100644 ---- a/clutter/clutter/clutter-stage.c -+++ b/clutter/clutter/clutter-stage.c -@@ -4712,8 +4712,8 @@ capture_view (ClutterStage *stage, - clutter_stage_view_get_layout (view, &view_layout); - - cogl_framebuffer_read_pixels_into_bitmap (framebuffer, -- view_layout.x + rect->x, -- view_layout.y + rect->y, -+ rect->x - view_layout.x, -+ rect->y - view_layout.y, - COGL_READ_PIXELS_COLOR_BUFFER, - bitmap); - --- -2.7.4 - diff --git a/mutter.spec b/mutter.spec index 11cae6d..564b14a 100644 --- a/mutter.spec +++ b/mutter.spec @@ -4,19 +4,17 @@ %global libinput_version 1.4 Name: mutter -Version: 3.22.1 -Release: 3%{?dist} +Version: 3.23.1 +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ #VCS: git:git://git.gnome.org/mutter URL: http://www.gnome.org -Source0: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/3.23/%{name}-%{version}.tar.xz # https://bugzilla.gnome.org/show_bug.cgi?id=772422 Patch0: 0001-Use-eglGetPlatformDisplay.patch -# Backported from upstream -Patch1: 0001-clutter-stage-Fix-framebuffer-capture-origin-offset-.patch BuildRequires: chrpath BuildRequires: pango-devel @@ -109,7 +107,6 @@ the functionality of the installed %{name} package. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build autoreconf -f -i @@ -184,6 +181,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/mutter/tests %changelog +* Sun Oct 30 2016 Florian Müllner - 3.23.1-1 +- Update to 3.23.1 + * Tue Oct 18 2016 Kalev Lember - 3.22.1-3 - Backport a fix to make gnome-screenshot --area work diff --git a/sources b/sources index 8736df6..19f63a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb17f4d451a40ebfa962af92f1aaf5d2 mutter-3.22.1.tar.xz +651432f2c41107595ddc685ef8c17d63 mutter-3.23.1.tar.xz