summaryrefslogtreecommitdiff
path: root/x11-libs/gtk+/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs/gtk+/files')
-rw-r--r--x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch50
-rw-r--r--x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch82
2 files changed, 0 insertions, 132 deletions
diff --git a/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch b/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch
deleted file mode 100644
index e096e920..00000000
--- a/x11-libs/gtk+/files/3.24.40-gdkscreen-x11-fixes.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 6880ac90a0211095cfea753316e002bd668a4e92 Mon Sep 17 00:00:00 2001
-From: Michael Wyraz <mw@brick4u.de>
-Date: Fri, 19 Jan 2024 19:15:52 +0100
-Subject: [PATCH 1/2] don't free monitor->name twice (fixes #6345)
-
----
- gdk/x11/gdkscreen-x11.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index f54bf51d04..4ac3167b30 100644
---- a/gdk/x11/gdkscreen-x11.c
-+++ b/gdk/x11/gdkscreen-x11.c
-@@ -922,7 +922,6 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
- g_object_ref (monitor);
- g_ptr_array_remove (x11_display->monitors, monitor);
- gdk_display_monitor_removed (display, GDK_MONITOR (monitor));
-- free (monitor->name);
- g_object_unref (monitor);
- *changed = TRUE;
- }
---
-2.43.0
-
-
-From ba58b3a23df4213e17a80816c7687a59e104769d Mon Sep 17 00:00:00 2001
-From: Michael Wyraz <mw@brick4u.de>
-Date: Fri, 19 Jan 2024 22:20:02 +0100
-Subject: [PATCH 2/2] Fix for #6342
-
----
- gdk/x11/gdkscreen-x11.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
-index 4ac3167b30..6207b5f443 100644
---- a/gdk/x11/gdkscreen-x11.c
-+++ b/gdk/x11/gdkscreen-x11.c
-@@ -851,7 +851,7 @@ init_randr13 (GdkScreen *screen, gboolean *changed)
- monitor = g_object_new (gdk_x11_monitor_get_type (),
- "display", display,
- NULL);
-- monitor->name = g_steal_pointer (&name);
-+ monitor->name = g_strdup (name);
- monitor->output = output;
- monitor->add = TRUE;
- g_ptr_array_add (x11_display->monitors, monitor);
---
-2.43.0
-
diff --git a/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch b/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch
deleted file mode 100644
index aadbd7be..00000000
--- a/x11-libs/gtk+/files/3.24.40-test-casts-gcc14.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 76bc2a57136fd6cf0374fa3f86a7ba646b779803 Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-Date: Fri, 19 Jan 2024 10:41:33 +0000
-Subject: [PATCH 1/2] tests: Add GdkEvent 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 05a12b1c5f8eecc621a7135eb313d6bfe6ccdc3b Mon Sep 17 00:00:00 2001
-From: David King <amigadave@amigadave.com>
-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..88d8a849ca 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 (G_OBJECT_CLASS (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 (G_OBJECT (settings), pspec->name, value);
- }
-
- g_free (pspecs);
---
-2.43.0
-