Accepting request 358103 from home:Zaitor

Found this patched gtk2 in my home that I'd forgotten to sub

OBS-URL: https://build.opensuse.org/request/show/358103
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=236
This commit is contained in:
Dominique Leuenberger 2016-02-12 12:49:58 +00:00 committed by Git OBS Bridge
parent 234505b2be
commit 563a7b2400
3 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From 679d2a45afb5496b4b4e1b3901a972a9e5c57663 Mon Sep 17 00:00:00 2001
From: Hans Breuer <hans@breuer.org>
Date: Fri, 7 Nov 2014 16:44:17 +0100
Subject: Bug 722815 - Deliver GdkModifierType during 'drag-motion'
This bug was also found by clang:
gdkwindow-quartz.c:1956:11: warning: implicit conversion from enumeration type 'GdkEventMask' to
different enumeration type 'GdkModifierType' [-Wenum-conversion]
*mask = _gdk_quartz_events_get_current_event_mask ();
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
---
gdk/quartz/gdkwindow-quartz.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 7b43257..7cd7789 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1953,7 +1953,8 @@ gdk_window_quartz_get_pointer_helper (GdkWindow *window,
toplevel = GDK_WINDOW_OBJECT (gdk_window_get_effective_toplevel (window));
- *mask = _gdk_quartz_events_get_current_event_mask ();
+ *mask = _gdk_quartz_events_get_current_keyboard_modifiers ()
+ | _gdk_quartz_events_get_current_mouse_modifiers ();
/* Get the y coordinate, needs to be flipped. */
if (window == _gdk_root)
--
cgit v0.11.2

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 15 09:35:50 UTC 2016 - zaitor@opensuse.org
- Add gtk2-Deliver-GdkModifierType-during-drag-motion.patch:
Deliver GdkModifierType during 'drag-motion' (bgo#722815). Patch
from upstream git.
-------------------------------------------------------------------
Mon Dec 28 15:54:03 UTC 2015 - zaitor@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package gtk2
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 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
@ -61,6 +61,8 @@ Patch57: gtk2-bgo743166-remember-printing-authentication.patch
Patch58: gtk2-bgo737777-fix-printing-authentication-crash.patch
# PATCH-FIX-UPSTREAM gtk2-randr-1.5-monitor-support.patch bgo#759912 zaitor@opensuse.org -- Adds support for using the newly introduced monitor objects in the XRandR protocol.
Patch59: gtk2-randr-1.5-monitor-support.patch
# PATCH-FIX-UPSTREAM gtk2-Deliver-GdkModifierType-during-drag-motion.patch bgo#722815 zaitor@opensuse.org -- Deliver GdkModifierType during 'drag-motion'
Patch60: gtk2-Deliver-GdkModifierType-during-drag-motion.patch
BuildRequires: atk-devel
BuildRequires: cairo-devel
BuildRequires: cups-devel
@ -342,6 +344,7 @@ cp -a %{SOURCE2} .
%patch57 -p1
%patch58 -p1
%patch59 -p1
%patch60 -p1
gnome-patch-translation-update
%build