+++ /dev/null
-From: Xi Ruoyao <xry111@xry111.site>
-Date: Mon, 7 Aug 2023 18:00:34 +0800
-Subject: print: Revert "Start sorting apart includes" change for
- gtkprinteroptionprivate.h
-
-The print backends needs the functions in gtkprinteroptionprivate.h to
-be exported.
-
-Fixes #6003.
-
-(cherry picked from commit 4d7277f72c8f4915f237e36982ffd7dfba524b15)
-
-Origin: future 4.12.1
----
- gtk/print/gtkprinteroptionprivate.h | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/gtk/print/gtkprinteroptionprivate.h b/gtk/print/gtkprinteroptionprivate.h
-index 82dd873..a7d8e8a 100644
---- a/gtk/print/gtkprinteroptionprivate.h
-+++ b/gtk/print/gtkprinteroptionprivate.h
-@@ -27,6 +27,7 @@
- #endif
-
- #include <glib-object.h>
-+#include <gdk/gdk.h>
-
- G_BEGIN_DECLS
-
-@@ -87,28 +88,39 @@ struct _GtkPrinterOptionClass
- void (*_gtk_reserved4) (void);
- };
-
-+GDK_AVAILABLE_IN_ALL
- GType gtk_printer_option_get_type (void) G_GNUC_CONST;
-
-+GDK_AVAILABLE_IN_ALL
- GtkPrinterOption *gtk_printer_option_new (const char *name,
- const char *display_text,
- GtkPrinterOptionType type);
-+GDK_AVAILABLE_IN_ALL
- void gtk_printer_option_set (GtkPrinterOption *option,
- const char *value);
-+GDK_AVAILABLE_IN_ALL
- void gtk_printer_option_set_has_conflict (GtkPrinterOption *option,
- gboolean has_conflict);
-+GDK_AVAILABLE_IN_ALL
- void gtk_printer_option_clear_has_conflict (GtkPrinterOption *option);
-+GDK_AVAILABLE_IN_ALL
- void gtk_printer_option_set_boolean (GtkPrinterOption *option,
- gboolean value);
-+GDK_AVAILABLE_IN_ALL
- void gtk_printer_option_allocate_choices (GtkPrinterOption *option,
- int num);
-+GDK_AVAILABLE_IN_ALL
- void gtk_printer_option_choices_from_array (GtkPrinterOption *option,
- int num_choices,
- const char **choices,
- const char **choices_display);
-+GDK_AVAILABLE_IN_ALL
- gboolean gtk_printer_option_has_choice (GtkPrinterOption *option,
- const char *choice);
-+GDK_AVAILABLE_IN_ALL
- void gtk_printer_option_set_activates_default (GtkPrinterOption *option,
- gboolean activates);
-+GDK_AVAILABLE_IN_ALL
- gboolean gtk_printer_option_get_activates_default (GtkPrinterOption *option);
-
-
-tests-Accept-slightly-different-numeric-results.patch
Revert-tests-Stop-copying-the-tool-tests.patch
Revert-build-Drop-the-install-tests-option.patch
-print-Revert-Start-sorting-apart-includes-change-for-gtkp.patch
-test-calendar-Update-timezone-name.patch
tests-mark-headless-tests-as-flaky.patch
debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
debian/reftests-Allow-minor-differences-to-be-tolerated.patch
+++ /dev/null
-From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha@canonical.com>
-Date: Tue, 8 Aug 2023 09:47:14 -0400
-Subject: test-calendar: Update timezone name
-
-Debian no longer provides the MET timezone
-but instead provides geographical region and city name
-
-Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6258
----
- testsuite/gtk/calendar.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testsuite/gtk/calendar.c b/testsuite/gtk/calendar.c
-index 4e76c71..809260d 100644
---- a/testsuite/gtk/calendar.c
-+++ b/testsuite/gtk/calendar.c
-@@ -10,7 +10,7 @@ test_calendar_set_day (void)
-
- cal = gtk_calendar_new ();
-
-- tz = g_time_zone_new_identifier ("MET");
-+ tz = g_time_zone_new_identifier ("Europe/Brussels");
- g_assert_nonnull (tz);
- dt = g_date_time_new (tz, 1970, 3, 1, 0, 0, 0);
- g_assert_nonnull (dt);
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Tue, 22 Aug 2023 10:49:36 +0100
-Subject: tests: Accept slightly different numeric results
-
-FLT_EPSILON is the distance between 1.0 and the next distinct floating
-point number, and doesn't necessarily have anything to do with the
-precision we can expect from a series of floating-point calculations.
-Experimentally, 1e-6 is achievable, even on platforms with unusual
-floating point implementations like i387.
-
-Bug: https://gitlab.gnome.org/GNOME/gtk/-/issues/6051
-Bug-Debian: https://bugs.debian.org/1050076
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6320
-Appled-upstream: 4.13.0, commit:0f125aad90742582c3467640abb291ce4feea7dd
----
- testsuite/gtk/colorutils.c | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/testsuite/gtk/colorutils.c b/testsuite/gtk/colorutils.c
-index b4d42e2..8f0acfb 100644
---- a/testsuite/gtk/colorutils.c
-+++ b/testsuite/gtk/colorutils.c
-@@ -30,6 +30,10 @@ struct {
- { 1, 0, 1, 5.0 / 6.0, 1, 1 },
- };
-
-+/* Close enough for float precision to match, even with some
-+ * rounding errors */
-+#define EPSILON 1e-6
-+
- static void
- test_roundtrips (void)
- {
-@@ -40,13 +44,13 @@ test_roundtrips (void)
-
- g_print ("color %u\n", i);
- gtk_hsv_to_rgb (tests[i].h, tests[i].s, tests[i].v, &r, &g, &b);
-- g_assert_cmpfloat_with_epsilon (r, tests[i].r, FLT_EPSILON);
-- g_assert_cmpfloat_with_epsilon (g, tests[i].g, FLT_EPSILON);
-- g_assert_cmpfloat_with_epsilon (b, tests[i].b, FLT_EPSILON);
-+ g_assert_cmpfloat_with_epsilon (r, tests[i].r, EPSILON);
-+ g_assert_cmpfloat_with_epsilon (g, tests[i].g, EPSILON);
-+ g_assert_cmpfloat_with_epsilon (b, tests[i].b, EPSILON);
- gtk_rgb_to_hsv (tests[i].r, tests[i].g, tests[i].b, &h, &s, &v);
-- g_assert_cmpfloat_with_epsilon (h, tests[i].h, FLT_EPSILON);
-- g_assert_cmpfloat_with_epsilon (s, tests[i].s, FLT_EPSILON);
-- g_assert_cmpfloat_with_epsilon (v, tests[i].v, FLT_EPSILON);
-+ g_assert_cmpfloat_with_epsilon (h, tests[i].h, EPSILON);
-+ g_assert_cmpfloat_with_epsilon (s, tests[i].s, EPSILON);
-+ g_assert_cmpfloat_with_epsilon (v, tests[i].v, EPSILON);
- }
- }
-
projects / gtk4.git / commitdiff