diff --git a/0001-Added-in-touch-support-to-the-kinetic-scrolling-call.patch b/0001-Added-in-touch-support-to-the-kinetic-scrolling-call.patch deleted file mode 100644 index fa935c2..0000000 --- a/0001-Added-in-touch-support-to-the-kinetic-scrolling-call.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 75c8c5a68bb385357f5c0e9167846050d7259cc6 Mon Sep 17 00:00:00 2001 -From: Reyad Attiyat -Date: Wed, 2 Apr 2014 17:39:34 -0500 -Subject: [PATCH] Added in touch support to the kinetic scrolling callbacks - ---- - champlain/champlain-kinetic-scroll-view.c | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/champlain/champlain-kinetic-scroll-view.c b/champlain/champlain-kinetic-scroll-view.c -index b027f6a..20867ff 100644 ---- a/champlain/champlain-kinetic-scroll-view.c -+++ b/champlain/champlain-kinetic-scroll-view.c -@@ -258,9 +258,10 @@ motion_event_cb (ClutterActor *stage, - ClutterActor *actor = CLUTTER_ACTOR (scroll); - gfloat x, y; - -- if (event->type != CLUTTER_MOTION || !(event->modifier_state & CLUTTER_BUTTON1_MASK)) -+ if ((event->type != CLUTTER_MOTION || !(event->modifier_state & CLUTTER_BUTTON1_MASK)) && -+ event->type != CLUTTER_TOUCH_UPDATE) - return FALSE; -- -+ - if (clutter_actor_transform_stage_point (actor, - event->x, - event->y, -@@ -389,8 +390,10 @@ button_release_event_cb (ClutterActor *stage, - ClutterActor *actor = CLUTTER_ACTOR (scroll); - gboolean decelerating = FALSE; - -+ - if ((event->type != CLUTTER_MOTION || event->modifier_state & CLUTTER_BUTTON1_MASK) && -- (event->type != CLUTTER_BUTTON_RELEASE || event->button != 1)) -+ (event->type != CLUTTER_BUTTON_RELEASE || event->button != 1) && -+ event->type != CLUTTER_TOUCH_END) - return FALSE; - - g_signal_handlers_disconnect_by_func (stage, -@@ -586,8 +589,8 @@ button_press_event_cb (ClutterActor *actor, - ClutterButtonEvent *bevent = (ClutterButtonEvent *) event; - ClutterActor *stage = clutter_actor_get_stage (actor); - -- if ((event->type == CLUTTER_BUTTON_PRESS) && -- (bevent->button == 1) && -+ if ((((event->type == CLUTTER_BUTTON_PRESS) && (bevent->button == 1)) || -+ event->type == CLUTTER_TOUCH_BEGIN) && - stage) - { - ChamplainKineticScrollViewMotion *motion; -@@ -637,6 +640,8 @@ champlain_kinetic_scroll_view_init (ChamplainKineticScrollView *self) - clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE); - g_signal_connect (self, "button-press-event", - G_CALLBACK (button_press_event_cb), self); -+ g_signal_connect (self, "touch-event", -+ G_CALLBACK (button_press_event_cb), self); - } - - --- -1.9.0 - diff --git a/libchamplain.spec b/libchamplain.spec index e0553a9..2ab7fbc 100644 --- a/libchamplain.spec +++ b/libchamplain.spec @@ -2,17 +2,13 @@ Summary: Map view for Clutter Name: libchamplain -Version: 0.12.7 -Release: 4%{?dist} +Version: 0.12.8 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://projects.gnome.org/libchamplain/ Source0: http://download.gnome.org/sources/libchamplain/0.12/%{name}-%{version}.tar.xz -# Backport of upstream https://git.gnome.org/browse/libchamplain/commit/?id=75c8c5a68bb385357f5c0e9167846050d7259cc6 -# Should make drag scrolling work with touch input -Patch0: 0001-Added-in-touch-support-to-the-kinetic-scrolling-call.patch - Requires: gobject-introspection BuildRequires: chrpath @@ -78,7 +74,6 @@ This package contains demos for development using %{name}. %prep %setup -q -%patch0 -p1 -b .touch_scroll %build %configure --disable-debug --disable-silent-rules --disable-static \ @@ -148,6 +143,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/%{name}-gtk-*.so.* %doc demos/*.osm %changelog +* Wed Jul 02 2014 Kalev Lember - 0.12.8-1 +- Update to 0.12.8 +- Drop upstreamed patches + * Sat Jun 07 2014 Fedora Release Engineering - 0.12.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 6c56a34..6a6a796 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5165d0148e75adc79d0b6ca10b7f546 libchamplain-0.12.7.tar.xz +d2ea69c21ccdd9b7c2d335a02b7fad47 libchamplain-0.12.8.tar.xz