[clutter-gtk/f17] Fix wheel scrolling in Totem

Bastien Nocera hadess at fedoraproject.org
Wed Jul 11 20:31:51 UTC 2012


commit 7d64904b74900a7e4010de54340d8bc7a1ee7ec1
Author: Bastien Nocera <hadess at hadess.net>
Date:   Wed Jul 11 21:31:44 2012 +0100

    Fix wheel scrolling in Totem

 0001-embed-Add-GDK_SCROLL_MASK.patch |   25 +++++++++++++++++++++++++
 clutter-gtk-fixdso.patch             |   11 -----------
 clutter-gtk.spec                     |    9 ++++++---
 3 files changed, 31 insertions(+), 14 deletions(-)
---
diff --git a/0001-embed-Add-GDK_SCROLL_MASK.patch b/0001-embed-Add-GDK_SCROLL_MASK.patch
new file mode 100644
index 0000000..ac1c1b5
--- /dev/null
+++ b/0001-embed-Add-GDK_SCROLL_MASK.patch
@@ -0,0 +1,25 @@
+From 73b8a28bbefdfc7f2b568f024f9f8a3638978e31 Mon Sep 17 00:00:00 2001
+From: Emmanuele Bassi <ebassi at gnome.org>
+Date: Mon, 9 Apr 2012 16:58:21 +0100
+Subject: [PATCH] embed: Add GDK_SCROLL_MASK
+
+Now that the mask is needed to get scrolling events.
+---
+ clutter-gtk/gtk-clutter-embed.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
+index ea4658e..4c887f4 100644
+--- a/clutter-gtk/gtk-clutter-embed.c
++++ b/clutter-gtk/gtk-clutter-embed.c
+@@ -269,6 +269,7 @@ gtk_clutter_embed_realize (GtkWidget *widget)
+    */
+   attributes.event_mask = gtk_widget_get_events (widget)
+                         | GDK_EXPOSURE_MASK
++                        | GDK_SCROLL_MASK
+                         | GDK_BUTTON_PRESS_MASK
+                         | GDK_BUTTON_RELEASE_MASK
+                         | GDK_KEY_PRESS_MASK
+-- 
+1.7.10.2
+
diff --git a/clutter-gtk.spec b/clutter-gtk.spec
index ab927ed..147b32a 100644
--- a/clutter-gtk.spec
+++ b/clutter-gtk.spec
@@ -2,14 +2,14 @@
 
 Name:           clutter-gtk
 Version:        1.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A basic GTK clutter widget
 
 Group:          Development/Languages
 License:        LGPLv2+
 URL:            http://www.clutter-project.org
 Source0:        http://www.clutter-project.org/sources/%{name}/1.2/%{name}-%{version}.tar.xz
-Patch0:         clutter-gtk-fixdso.patch
+Patch0:         0001-embed-Add-GDK_SCROLL_MASK.patch
 
 BuildRequires:  gtk3-devel >= 3.0.0
 BuildRequires:  clutter-devel >= 1.9
@@ -33,7 +33,7 @@ clutter-gtk.
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .smooth-scroll
 
 %build
 %configure
@@ -64,6 +64,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %{_datadir}/gtk-doc/html/clutter-gtk-1.0
 
 %changelog
+* Wed Jul 11 2012 Bastien Nocera <bnocera at redhat.com> 1.2.0-2
+- Fix wheel scrolling in Totem
+
 * Fri Mar 23 2012 Matthias Clasen <mclasen at redhat.com> - 1.2.0-1
 - Update to 1.2.0
 


More information about the scm-commits mailing list