diff --git a/debian/patches/Fix-for-6342.patch b/debian/patches/Fix-for-6342.patch deleted file mode 100644 index 5561716fb5..0000000000 --- a/debian/patches/Fix-for-6342.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Michael Wyraz -Date: Fri, 19 Jan 2024 22:20:02 +0100 -Subject: Fix for #6342 - -(cherry picked from commit ba58b3a23df4213e17a80816c7687a59e104769d) - -Origin: gtk-3-24 branch, after 3.24.40 ---- - 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 4ac3167..6207b5f 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); diff --git a/debian/patches/don-t-free-monitor-name-twice-fixes-6345.patch b/debian/patches/don-t-free-monitor-name-twice-fixes-6345.patch deleted file mode 100644 index 679b9e020b..0000000000 --- a/debian/patches/don-t-free-monitor-name-twice-fixes-6345.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Michael Wyraz -Date: Fri, 19 Jan 2024 19:15:52 +0100 -Subject: don't free monitor->name twice (fixes #6345) - -(cherry picked from commit 6880ac90a0211095cfea753316e002bd668a4e92) - -Origin: gtk-3-24 branch, after 3.24.40 ---- - 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 f54bf51..4ac3167 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; - } diff --git a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch index 0d9d5c8508..6e805bbcc0 100644 --- a/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch +++ b/debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch @@ -16,7 +16,7 @@ Applied-upstream: no, upstream want reftests to be a strict pass/fail with ident 3 files changed, 37 insertions(+), 5 deletions(-) diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 1a51a97..5b3d21a 100644 +index 88d8a84..814dc67 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -266,6 +266,9 @@ test_ui_file (GFile *file) diff --git a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch index dd94f08a5c..b1788123df 100644 --- a/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch +++ b/debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch @@ -26,7 +26,7 @@ Applied-upstream: no, upstream want reftests to be a strict pass/fail with ident 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index 5b3d21a..e526bc8 100644 +index 814dc67..b772cd5 100644 --- a/testsuite/reftests/gtk-reftest.c +++ b/testsuite/reftests/gtk-reftest.c @@ -260,6 +260,12 @@ save_image (cairo_surface_t *surface, diff --git a/debian/patches/series b/debian/patches/series index 35446222aa..75e2a23964 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,3 @@ 060_ignore-random-icons.patch reftest_compare_surfaces-Report-how-much-the-images-diffe.patch reftests-Allow-minor-differences-to-be-tolerated.patch -don-t-free-monitor-name-twice-fixes-6345.patch -Fix-for-6342.patch