Accepting request 458728 from home:Zaitor
New try, one less patch dropped. Never believe in reports in bugs... OBS-URL: https://build.opensuse.org/request/show/458728 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=223
This commit is contained in:
Git OBS Bridge
parent
4f44ba6f37
commit
d2750c8530
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d59b58356cba1165ef69a98f43e50777fded768860a9b118807c5a47274092a2
|
||||
size 3533296
|
||||
3
mutter-3.22.3.tar.xz
Normal file
3
mutter-3.22.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:537eda8e5fdd4a70602da913b885ad745a7510678c24006b91ceba83ccab209a
|
||||
size 3533212
|
||||
@ -1,74 +0,0 @@
|
||||
commit 5c46094d67f2e5cdafe6edcfd8c0d5894a2dafc6
|
||||
Author: Rui Matos <tiagomatos@gmail.com>
|
||||
Date: Mon Nov 14 17:33:11 2016 +0100
|
||||
|
||||
meta-input-settings-x11: Don't try setting unavailable scroll methods
|
||||
|
||||
Since doing so causes BadValue X errors.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=771744
|
||||
|
||||
diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c
|
||||
index 332997b..eccc68a 100644
|
||||
--- a/src/backends/x11/meta-input-settings-x11.c
|
||||
+++ b/src/backends/x11/meta-input-settings-x11.c
|
||||
@@ -222,19 +222,27 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings,
|
||||
gboolean edge_scroll_enabled)
|
||||
{
|
||||
guchar values[SCROLL_METHOD_NUM_FIELDS] = { 0 }; /* 2fg, edge, button. The last value is unused */
|
||||
- guchar *current;
|
||||
+ guchar *current = NULL;
|
||||
+ guchar *available = NULL;
|
||||
+
|
||||
+ available = get_property (device, "libinput Scroll Methods Available",
|
||||
+ XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
|
||||
+ if (!available || !available[SCROLL_METHOD_FIELD_EDGE])
|
||||
+ goto out;
|
||||
|
||||
current = get_property (device, "libinput Scroll Method Enabled",
|
||||
XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
|
||||
if (!current)
|
||||
- return;
|
||||
+ goto out;
|
||||
|
||||
memcpy (values, current, SCROLL_METHOD_NUM_FIELDS);
|
||||
|
||||
values[SCROLL_METHOD_FIELD_EDGE] = !!edge_scroll_enabled;
|
||||
change_property (device, "libinput Scroll Method Enabled",
|
||||
XA_INTEGER, 8, &values, SCROLL_METHOD_NUM_FIELDS);
|
||||
+ out:
|
||||
meta_XFree (current);
|
||||
+ meta_XFree (available);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -243,19 +251,27 @@ meta_input_settings_x11_set_two_finger_scroll (MetaInputSettings *set
|
||||
gboolean two_finger_scroll_enabled)
|
||||
{
|
||||
guchar values[SCROLL_METHOD_NUM_FIELDS] = { 0 }; /* 2fg, edge, button. The last value is unused */
|
||||
- guchar *current;
|
||||
+ guchar *current = NULL;
|
||||
+ guchar *available = NULL;
|
||||
+
|
||||
+ available = get_property (device, "libinput Scroll Methods Available",
|
||||
+ XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
|
||||
+ if (!available || !available[SCROLL_METHOD_FIELD_2FG])
|
||||
+ goto out;
|
||||
|
||||
current = get_property (device, "libinput Scroll Method Enabled",
|
||||
XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS);
|
||||
if (!current)
|
||||
- return;
|
||||
+ goto out;
|
||||
|
||||
memcpy (values, current, SCROLL_METHOD_NUM_FIELDS);
|
||||
|
||||
values[SCROLL_METHOD_FIELD_2FG] = !!two_finger_scroll_enabled;
|
||||
change_property (device, "libinput Scroll Method Enabled",
|
||||
XA_INTEGER, 8, &values, SCROLL_METHOD_NUM_FIELDS);
|
||||
+ out:
|
||||
meta_XFree (current);
|
||||
+ meta_XFree (available);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 16 23:02:12 UTC 2017 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.22.3:
|
||||
+ Fix switching between two finger- and edge scrolling on wayland
|
||||
(bgo#771744).
|
||||
+ Fix frequent freezes in multihead setups on wayland
|
||||
(bgo#774557).
|
||||
+ Preserve root window mask on XSelectionRequest (bgo#776128).
|
||||
+ Fix window menu placement with HiDPI (bgo#776055).
|
||||
+ Fix HiDPI detection on vertical monitor layouts (bgo#777687).
|
||||
+ Fix erroneous key event repeats (bgo#774989).
|
||||
+ Fix "ghost" cursors in multi-monitor setups (bgo#771056).
|
||||
+ Use eglGetPlatformDisplay (bgo#772422).
|
||||
+ Fix erratic raise_or_lower behavior (bgo#705200).
|
||||
+ Extend tablet device checks (bgo#773779).
|
||||
+ Set right scale for tablet tool cursors on HiDPI (bgo#778474).
|
||||
+ Allow edge-scrolling without 2fg-scroll capable devices
|
||||
(bgo#778554).
|
||||
+ Misc. bug fixes: bgo#771297, bgo#774135, bgo#775986,
|
||||
bgo#777691, bgo#777470, bgo#778262, bgo#776919.
|
||||
+ Updated translations.
|
||||
- Drop mutter-x11-meta.patch: Fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 1 14:09:51 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package mutter
|
||||
#
|
||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -25,7 +25,7 @@
|
||||
%global __provides_exclude_from ^%{_libdir}/mutter/.*.typelib$
|
||||
|
||||
Name: mutter
|
||||
Version: 3.22.2
|
||||
Version: 3.22.3
|
||||
Release: 0
|
||||
Summary: Window and compositing manager based on Clutter
|
||||
License: GPL-2.0+
|
||||
@ -40,8 +40,6 @@ Patch2: relax-some-constraints-on-CSD-windows-in-sle-classic.patch
|
||||
Patch3: mutter-bsc984738-grab-display.patch
|
||||
# PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor@opensuse.org -- Fix slow startup notification on wayland
|
||||
Patch6: mutter-fix-startup.patch
|
||||
# PATCH-FIX-UPSTREAM mutter-x11-meta.patch bgo#775337 bgo#771744 boo#1011356 dimstar@opensuse.org -- meta-input-settings-x11: Don't try setting unavailable scroll methods
|
||||
Patch7: mutter-x11-meta.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gobject-introspection-devel >= 0.9.5
|
||||
BuildRequires: libSM-devel
|
||||
@ -141,7 +139,6 @@ translation-update-upstream
|
||||
%patch3 -p1
|
||||
%endif
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user