callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop patches that were included in the upstream release

Browse Source
This commit is contained in:
Simon McVittie 2024-01-30 10:14:01 +00:00
parent 9f7099797a
commit 3c641ca2d3
5 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
debian/patches/Fix-for-6342.patch vendored
View File

@ -1,24 +0,0 @@
From: Michael Wyraz <mw@brick4u.de>
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);

23
debian/patches/don-t-free-monitor-name-twice-fixes-6345.patch vendored
View File

@ -1,23 +0,0 @@
From: Michael Wyraz <mw@brick4u.de>
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;
}

2
debian/patches/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch vendored
View File

@ -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)

2
debian/patches/reftests-Allow-minor-differences-to-be-tolerated.patch vendored
View File

@ -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,

2
debian/patches/series vendored
View File

@ -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