From 9ec00c5915c9ce5214011e34fbdff2802c99028e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jeremy=20B=C3=ADcha?= Date: Tue, 8 Aug 2023 08:39:34 -0400 Subject: [PATCH] Cherry-pick patch to fix undefined references --- ...rting-apart-includes-change-for-gtkp.patch | 69 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 70 insertions(+) create mode 100644 debian/patches/print-Revert-Start-sorting-apart-includes-change-for-gtkp.patch diff --git a/debian/patches/print-Revert-Start-sorting-apart-includes-change-for-gtkp.patch b/debian/patches/print-Revert-Start-sorting-apart-includes-change-for-gtkp.patch new file mode 100644 index 0000000000..8f1c019701 --- /dev/null +++ b/debian/patches/print-Revert-Start-sorting-apart-includes-change-for-gtkp.patch @@ -0,0 +1,69 @@ +From: Xi Ruoyao +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 ++#include + + 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); + + diff --git a/debian/patches/series b/debian/patches/series index b395b66929..8fb140ac79 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ 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 debian/reftest_compare_surfaces-Report-how-much-the-images-diffe.patch debian/reftests-Allow-minor-differences-to-be-tolerated.patch debian/Disable-inscription-markup.ui-reftest.patch -- 2.30.2