[packages/clutter-gesture] Rel 4

[arekm]

commit 58afc0924363f73bc8dba1489cccd5a0265e6b37
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed May 20 21:08:19 2026 +0200

    Rel 4

 clutter-gesture-modernize.patch | 77 +++++++++++++++++++++++++++++++++++++++++
 clutter-gesture.spec            |  4 ++-
 2 files changed, 80 insertions(+), 1 deletion(-)
---
diff --git a/clutter-gesture.spec b/clutter-gesture.spec
index abcc2a6..466fed1 100644
--- a/clutter-gesture.spec
+++ b/clutter-gesture.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_without	static_libs	# don't build static libraries
 
-%define	rel		3
+%define	rel		4
 %define	snap	20100106
 Summary:	Clutter Gesture library
 Summary(pl.UTF-8):	Biblioteka gestów Clutter
@@ -15,6 +15,7 @@ Group:		Libraries
 Source0:	%{name}.tar.xz
 # Source0-md5:	7f3b287e4213f5be4e2f0054e1112e6b
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-modernize.patch
 URL:		http://www.moblin.org/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
@@ -65,6 +66,7 @@ Statyczna biblioteka Clutter Gesture.
 %prep
 %setup -q -n %{name}
 %patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{__libtoolize}
diff --git a/clutter-gesture-modernize.patch b/clutter-gesture-modernize.patch
new file mode 100644
index 0000000..885fc4e
--- /dev/null
+++ b/clutter-gesture-modernize.patch
@@ -0,0 +1,77 @@
+Modernize clutter-gesture for current GLib (2.58+) and GCC.
+- Replace deprecated g_type_class_add_private / G_TYPE_INSTANCE_GET_PRIVATE
+  with G_DEFINE_TYPE_WITH_PRIVATE and clutter_gesture_get_instance_private.
+  G_DEFINE_TYPE_WITH_PRIVATE expands G_ADD_PRIVATE which references
+  sizeof(ClutterGesturePrivate), so it must follow the struct definition.
+- Drop deprecated g_thread_supported/g_thread_init and switch g_mutex_new
+  to statically-initialized GMutex (see Debian patches 07/08).
+- Fix misleading-indentation in clutter_gesture_set_hold_{timeout,radius}
+  that GCC flags as -Werror=misleading-indentation (Debian patch 09).
+--- clutter-gesture/clutter-gesture/clutter-gesture.c.orig
++++ clutter-gesture/clutter-gesture/clutter-gesture.c
+@@ -36,8 +36,6 @@
+ #include "marshal.h"
+ #include "engine.h"
+ 
+-G_DEFINE_TYPE (ClutterGesture, clutter_gesture, G_TYPE_OBJECT);
+-
+ #define CLUTTER_GESTURE_GET_PRIVATE(obj)          \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), CLUTTER_TYPE_GESTURE, ClutterGesturePrivate))
+ 
+@@ -73,6 +71,8 @@
+   GSList *actors;  /* interesting list of actores */
+ };
+ 
++G_DEFINE_TYPE_WITH_PRIVATE (ClutterGesture, clutter_gesture, G_TYPE_OBJECT);
++
+ static gboolean
+ recognize_cb (ClutterActor *target_actor,
+               event_type_t  event_type,
+@@ -86,6 +86,7 @@
+ 
+ 
+ static GMutex *lock = NULL;
++static GMutex lock_s;
+ static GSList *root_actors = NULL;
+ 
+ static gboolean
+@@ -298,11 +299,8 @@
+   object_class->set_property = clutter_gesture_set_property;
+   object_class->get_property = clutter_gesture_get_property;
+ 
+-  if (!g_thread_supported ())
+-    g_thread_init(NULL);
+-  lock = g_mutex_new();
+-
+-  g_type_class_add_private (klass, sizeof (ClutterGesturePrivate));
++  g_mutex_init (&lock_s);
++  lock = &lock_s;
+ 
+   gesture_signals[GEST_SLIDE] = 
+   g_signal_new ("gesture-slide-event",
+@@ -418,7 +416,7 @@
+ static void
+ clutter_gesture_init (ClutterGesture *gesture)
+ {
+-  gesture->priv = G_TYPE_INSTANCE_GET_PRIVATE (gesture, CLUTTER_TYPE_GESTURE, ClutterGesturePrivate);
++  gesture->priv = clutter_gesture_get_instance_private (gesture);
+ }
+ 
+ static gboolean
+@@ -716,7 +714,7 @@
+   if (set_hold_timeout (priv->gesture_handle, actor, interval) == 0)
+     return TRUE;
+ 
+-    return FALSE;
++  return FALSE;
+ }
+ 
+ gboolean
+@@ -744,6 +742,6 @@
+   if (set_hold_radius (priv->gesture_handle, actor, radius) == 0)
+     return TRUE;
+ 
+-    return FALSE;
++  return FALSE;
+ }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clutter-gesture.git/commitdiff/58afc0924363f73bc8dba1489cccd5a0265e6b37