diff --git a/.gitignore b/.gitignore index 8ed18f0..9f85eac 100644 --- a/.gitignore +++ b/.gitignore @@ -209,3 +209,4 @@ gtk+-2.90.5.tar.bz2 /gtk+-3.24.38.tar.xz /gtk+-3.24.39.tar.xz /gtk+-3.24.40.tar.xz +/gtk+-3.24.41.tar.xz diff --git a/gtk-3.24.40-cast-fixes.patch b/gtk-3.24.40-cast-fixes.patch deleted file mode 100644 index ac8aeb8..0000000 --- a/gtk-3.24.40-cast-fixes.patch +++ /dev/null @@ -1,82 +0,0 @@ -From e0d9dd8ba96bfc86d71bf3cd2d56521f4be561a3 Mon Sep 17 00:00:00 2001 -From: David King -Date: Fri, 19 Jan 2024 10:41:33 +0000 -Subject: [PATCH 1/2] tests: Fix GdkEventButton casts in testinput - ---- - tests/testinput.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/testinput.c b/tests/testinput.c -index b68552a428..3d4d7f6f87 100644 ---- a/tests/testinput.c -+++ b/tests/testinput.c -@@ -194,7 +194,7 @@ button_press_event (GtkWidget *widget, GdkEventButton *event) - - print_axes (event->device, event->axes); - gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure); -- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)), -+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)), - event->x, event->y, pressure); - - motion_time = event->time; -@@ -239,10 +239,10 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event) - gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_X, &x); - gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_Y, &y); - gdk_device_get_axis (event->device, events[i]->axes, GDK_AXIS_PRESSURE, &pressure); -- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)), -+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)), - x, y, pressure); - -- print_axes (gdk_event_get_source_device (event), events[i]->axes); -+ print_axes (gdk_event_get_source_device ((GdkEvent *)event), events[i]->axes); - } - gdk_device_free_history (events, n_events); - } -@@ -252,7 +252,7 @@ motion_notify_event (GtkWidget *widget, GdkEventMotion *event) - - gdk_event_get_axis ((GdkEvent *)event, GDK_AXIS_PRESSURE, &pressure); - -- draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device (event)), -+ draw_brush (widget, gdk_device_get_source (gdk_event_get_source_device ((GdkEvent *)event)), - event->x, event->y, pressure); - } - motion_time = event->time; --- -2.43.0 - - -From 9a979bf5f040d44fbbdcac1195d660ef2b8a04fd Mon Sep 17 00:00:00 2001 -From: David King -Date: Fri, 19 Jan 2024 11:04:37 +0000 -Subject: [PATCH 2/2] testsuite: Fix casts in reftests - ---- - testsuite/reftests/gtk-reftest.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 1a51a9756b..b6a144ff0d 100644 ---- a/testsuite/reftests/gtk-reftest.c -+++ b/testsuite/reftests/gtk-reftest.c -@@ -381,7 +381,7 @@ enforce_default_settings (void) - - klass = g_type_class_ref (G_OBJECT_TYPE (settings)); - -- pspecs = g_object_class_list_properties (klass, &n_pspecs); -+ pspecs = g_object_class_list_properties ((GObjectClass *)klass, &n_pspecs); - for (i = 0; i < n_pspecs; i++) - { - GParamSpec *pspec = pspecs[i]; -@@ -394,7 +394,7 @@ enforce_default_settings (void) - continue; - - value = g_param_spec_get_default_value (pspec); -- g_object_set_property (settings, pspec->name, value); -+ g_object_set_property ((GObject *)settings, pspec->name, value); - } - - g_free (pspecs); --- -2.43.0 - diff --git a/gtk3.spec b/gtk3.spec index 6e1f779..7c096c9 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -19,15 +19,13 @@ %global __provides_exclude_from ^%{_libdir}/gtk-3.0 Name: gtk3 -Version: 3.24.40 +Version: 3.24.41 Release: 1%{?dist} Summary: GTK+ graphical user interface library License: LGPL-2.0-or-later URL: https://gtk.org Source0: https://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6782 -Patch: gtk-3.24.40-cast-fixes.patch BuildRequires: pkgconfig(atk) >= %{atk_version} BuildRequires: pkgconfig(atk-bridge-2.0) @@ -52,7 +50,6 @@ BuildRequires: pkgconfig(wayland-protocols) >= %{wayland_protocols_version} BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrandr) >= %{xrandr_version} BuildRequires: pkgconfig(xrender) -BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xinerama) @@ -307,6 +304,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || : %{_datadir}/installed-tests/ %changelog +* Wed Jan 24 2024 David King - 3.24.41-1 +- Update to 3.24.41 + * Fri Jan 19 2024 David King - 3.24.40-1 - Update to 3.24.40 diff --git a/sources b/sources index 6549def..4bdd82f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gtk+-3.24.40.tar.xz) = 21fac23b6375c2e545128e60d4e39f7ee9516a824e4a1834a318af5f2a9f125a8a8572a83bf94b4c179a16c66b6a913e74574ccf2e810301f1a593006a1980c7 +SHA512 (gtk+-3.24.41.tar.xz) = aaf061d846fac592e71089feace302bdef1bb64bb2ad6ff30d51d90000da9084cad2fa5bf88cb75adcd789c911d94231ae60a2ca7cf97a2f5720687369a3da98