gtk4-unix-print: Switch to gir

Use a temporary symlink to Gtk-4.0.gir which includes the required
symbol defintions.

12 files changed, 48 insertions, 699 deletions

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index ed3cfa945..754c9e294 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -617,7 +617,9 @@ gtk+-unix-print-3.0:
 	$(GENVAPI) --library $(srcdir)/gtk+-unix-print-3.0 $(PACKAGESDIR)/gtk+-unix-print-3.0/gtk+-unix-print-3.0-custom.vala $(PACKAGESDIR)/gtk+-unix-print-3.0/gtk+-unix-print-3.0.gi
 
 gtk4-unix-print:
-	$(GENVAPI) --library $(srcdir)/gtk4-unix-print $(PACKAGESDIR)/gtk4-unix-print/gtk4-unix-print-custom.vala $(PACKAGESDIR)/gtk4-unix-print/gtk4-unix-print.gi
+	ln -s $(GIRDIR)/Gtk-4.0.gir GtkUnixPrint-4.0.gir; \
+	$(GENVAPI) --library $(srcdir)/gtk4-unix-print --pkg gtk4 --pkg pangocairo --metadatadir $(METADATADIR) $(METADATADIR)/GtkUnixPrint-4.0-custom.vala GtkUnixPrint-4.0.gir; \
+	rm -f GtkUnixPrint-4.0.gir
 
 gtksourceview-2.0:
 	$(GENVAPI) --library $(srcdir)/gtksourceview-2.0 $(PACKAGESDIR)/gtksourceview-2.0/gtksourceview-2.0.gi
diff --git a/vapi/gtk4-unix-print.vapi b/vapi/gtk4-unix-print.vapi
index 38a742e01..6885b50ae 100644
--- a/vapi/gtk4-unix-print.vapi
+++ b/vapi/gtk4-unix-print.vapi
@@ -2,10 +2,10 @@
 
 [CCode (cprefix = "Gtk", gir_namespace = "Gtk", gir_version = "4.0", lower_case_cprefix = "gtk_")]
 namespace Gtk {
-	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
-	public class PageSetupUnixDialog : Gtk.Dialog, Gtk.Accessible, Gtk.Buildable, Gtk.ConstraintTarget, Gtk.Native, Gtk.ShortcutManager, Gtk.Root {
+	[CCode (cheader_filename = "gtk/gtkunixprint.h", type_id = "gtk_page_setup_unix_dialog_get_type ()")]
+	public class PageSetupUnixDialog : Gtk.Dialog, Gtk.Accessible, Gtk.Buildable, Gtk.ConstraintTarget, Gtk.Native, Gtk.Root, Gtk.ShortcutManager {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public PageSetupUnixDialog (string title, Gtk.Window parent);
+		public PageSetupUnixDialog (string? title, Gtk.Window? parent);
 		public unowned Gtk.PageSetup get_page_setup ();
 		public unowned Gtk.PrintSettings get_print_settings ();
 		public void set_page_setup (Gtk.PageSetup page_setup);
@@ -14,7 +14,7 @@ namespace Gtk {
 	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
 	public abstract class PrintBackend : GLib.Object {
 	}
-	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
+	[CCode (cheader_filename = "gtk/gtkunixprint.h", type_id = "gtk_print_job_get_type ()")]
 	public class PrintJob : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public PrintJob (string title, Gtk.Printer printer, Gtk.PrintSettings settings, Gtk.PageSetup page_setup);
@@ -22,6 +22,7 @@ namespace Gtk {
 		public uint get_n_up ();
 		public Gtk.NumberUpLayout get_n_up_layout ();
 		public int get_num_copies ();
+		[CCode (array_length_pos = 0.1)]
 		public unowned Gtk.PageRange[] get_page_ranges ();
 		public Gtk.PageSet get_page_set ();
 		public Gtk.PrintPages get_pages ();
@@ -39,7 +40,7 @@ namespace Gtk {
 		public void set_n_up (uint n_up);
 		public void set_n_up_layout (Gtk.NumberUpLayout layout);
 		public void set_num_copies (int num_copies);
-		public void set_page_ranges (Gtk.PageRange[] ranges);
+		public void set_page_ranges ([CCode (array_length_cname = "n_ranges", array_length_pos = 1.1)] owned Gtk.PageRange[] ranges);
 		public void set_page_set (Gtk.PageSet page_set);
 		public void set_pages (Gtk.PrintPages pages);
 		public void set_reverse (bool reverse);
@@ -54,12 +55,12 @@ namespace Gtk {
 		public Gtk.PrintSettings settings { get; construct; }
 		public string title { get; construct; }
 		public bool track_print_status { get; set; }
-		public virtual signal void status_changed ();
+		public signal void status_changed ();
 	}
-	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
-	public class PrintUnixDialog : Gtk.Dialog, Gtk.Accessible, Gtk.Buildable, Gtk.ConstraintTarget, Gtk.Native, Gtk.ShortcutManager, Gtk.Root {
+	[CCode (cheader_filename = "gtk/gtkunixprint.h", type_id = "gtk_print_unix_dialog_get_type ()")]
+	public class PrintUnixDialog : Gtk.Dialog, Gtk.Accessible, Gtk.Buildable, Gtk.ConstraintTarget, Gtk.Native, Gtk.Root, Gtk.ShortcutManager {
 		[CCode (has_construct_function = false, type = "GtkWidget*")]
-		public PrintUnixDialog (string title, Gtk.Window parent);
+		public PrintUnixDialog (string? title, Gtk.Window? parent);
 		public void add_custom_tab (Gtk.Widget child, Gtk.Widget tab_label);
 		public int get_current_page ();
 		public bool get_embed_page_setup ();
@@ -75,7 +76,7 @@ namespace Gtk {
 		public void set_has_selection (bool has_selection);
 		public void set_manual_capabilities (Gtk.PrintCapabilities capabilities);
 		public void set_page_setup (Gtk.PageSetup page_setup);
-		public void set_settings (Gtk.PrintSettings settings);
+		public void set_settings (Gtk.PrintSettings? settings);
 		public void set_support_selection (bool support_selection);
 		public int current_page { get; set; }
 		public bool embed_page_setup { get; set; }
@@ -87,7 +88,7 @@ namespace Gtk {
 		public Gtk.Printer selected_printer { get; }
 		public bool support_selection { get; set; }
 	}
-	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
+	[CCode (cheader_filename = "gtk/gtkunixprint.h", type_id = "gtk_printer_get_type ()")]
 	public class Printer : GLib.Object {
 		[CCode (has_construct_function = false)]
 		public Printer (string name, Gtk.PrintBackend backend, bool virtual_);
@@ -132,9 +133,9 @@ namespace Gtk {
 		[NoAccessorMethod]
 		public bool paused { get; }
 		public string state_message { get; }
-		public virtual signal void details_acquired (bool p0);
+		public signal void details_acquired (bool success);
 	}
-	[CCode (cheader_filename = "gtk/gtkunixprint.h", cprefix = "GTK_PRINT_CAPABILITY_")]
+	[CCode (cheader_filename = "gtk/gtkunixprint.h", cprefix = "GTK_PRINT_CAPABILITY_", type_id = "gtk_print_capabilities_get_type ()")]
 	[Flags]
 	public enum PrintCapabilities {
 		PAGE_SET,
@@ -150,8 +151,8 @@ namespace Gtk {
 	}
 	[CCode (cheader_filename = "gtk/gtkunixprint.h", instance_pos = 1.9)]
 	public delegate void PrintJobCompleteFunc (Gtk.PrintJob print_job) throws GLib.Error;
-	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
+	[CCode (cheader_filename = "gtk/gtkunixprint.h", instance_pos = 1.9)]
 	public delegate bool PrinterFunc (Gtk.Printer printer);
 	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
-	public static void enumerate_printers (owned Gtk.PrinterFunc func, bool wait);
+	public static void enumerate_printers ([CCode (delegate_target_pos = 1.33333, destroy_notify_pos = 1.66667)] owned Gtk.PrinterFunc func, bool wait);
 }
diff --git a/vapi/metadata/GtkUnixPrint-4.0-custom.vala b/vapi/metadata/GtkUnixPrint-4.0-custom.vala
new file mode 100644
index 000000000..88fb76f6b
--- /dev/null
+++ b/vapi/metadata/GtkUnixPrint-4.0-custom.vala
@@ -0,0 +1,17 @@
+namespace Gtk {
+	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
+	public class Printer : GLib.Object {
+		[CCode (cname = "gtk_printer_accepts_pdf")]
+		public bool get_accepts_pdf ();
+		[CCode (cname = "gtk_printer_accepts_ps")]
+		public bool get_accepts_ps ();
+		[CCode (cname = "gtk_printer_is_virtual")]
+		public bool get_is_virtual ();
+		public Gtk.PrintBackend backend { get; construct; }
+	}
+	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
+	public abstract class PrintBackend : GLib.Object {
+	}
+	[CCode (cheader_filename = "gtk/gtkunixprint.h", instance_pos = 1.9)]
+	public delegate void PrintJobCompleteFunc (Gtk.PrintJob print_job) throws GLib.Error;
+}
diff --git a/vapi/metadata/GtkUnixPrint-4.0.metadata b/vapi/metadata/GtkUnixPrint-4.0.metadata
new file mode 100644
index 000000000..c595b6bde
--- /dev/null
+++ b/vapi/metadata/GtkUnixPrint-4.0.metadata
@@ -0,0 +1,12 @@
+* cheader_filename="gtk/gtkunixprint.h"
+* skip
+
+PageSetupUnixDialog skip=false
+Printer skip=false
+PrinterFunc skip=false
+//PrintBackend skip=false
+PrintCapabilities skip=false
+PrintJob skip=false
+//PrintJobCompleteFunc skip=false
+PrintUnixDialog skip=false
+enumerate_printers skip=false
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print-custom.vala b/vapi/packages/gtk4-unix-print/gtk4-unix-print-custom.vala
deleted file mode 100644
index cab400660..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print-custom.vala
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Gtk {
-	[CCode (cheader_filename = "gtk/gtkunixprint.h")]
-	public abstract class PrintBackend : GLib.Object {
-	}
-	[CCode (cheader_filename = "gtk/gtkunixprint.h", instance_pos = 1.9)]
-	public delegate void PrintJobCompleteFunc (Gtk.PrintJob print_job) throws GLib.Error;
-}
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.defines b/vapi/packages/gtk4-unix-print/gtk4-unix-print.defines
deleted file mode 100644
index f73e1233e..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print.defines
+++ /dev/null
@@ -1,3 +0,0 @@
--DGTK_COMPILATION
--DGSEAL_ENABLE
--D__GNUC__
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.deps b/vapi/packages/gtk4-unix-print/gtk4-unix-print.deps
deleted file mode 100644
index 18af01f95..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print.deps
+++ /dev/null
@@ -1,2 +0,0 @@
-cairo
-gtk4
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.excludes b/vapi/packages/gtk4-unix-print/gtk4-unix-print.excludes
deleted file mode 100644
index e69de29bb..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print.excludes
+++ /dev/null
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.files b/vapi/packages/gtk4-unix-print/gtk4-unix-print.files
deleted file mode 100644
index 0319925ca..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/gtk-4.0/unix-print/gtk
-lib/libgtk-4.so
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.gi b/vapi/packages/gtk4-unix-print/gtk4-unix-print.gi
deleted file mode 100644
index 6cb638b9a..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print.gi
+++ /dev/null
@@ -1,639 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Gtk">
-		<function name="enumerate_printers" symbol="gtk_enumerate_printers">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="func" type="GtkPrinterFunc"/>
-				<parameter name="data" type="gpointer"/>
-				<parameter name="destroy" type="GDestroyNotify"/>
-				<parameter name="wait" type="gboolean"/>
-			</parameters>
-		</function>
-		<callback name="GtkPrintJobCompleteFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="print_job" type="GtkPrintJob*"/>
-				<parameter name="user_data" type="gpointer"/>
-				<parameter name="error" type="GError*"/>
-			</parameters>
-		</callback>
-		<callback name="GtkPrinterFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="printer" type="GtkPrinter*"/>
-				<parameter name="data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<struct name="GtkPrintBackend">
-		</struct>
-		<struct name="GtkPrintJob_autoptr">
-		</struct>
-		<struct name="GtkPrintJob_listautoptr">
-		</struct>
-		<struct name="GtkPrintJob_queueautoptr">
-		</struct>
-		<struct name="GtkPrintJob_slistautoptr">
-		</struct>
-		<struct name="GtkPrintUnixDialog_autoptr">
-		</struct>
-		<struct name="GtkPrintUnixDialog_listautoptr">
-		</struct>
-		<struct name="GtkPrintUnixDialog_queueautoptr">
-		</struct>
-		<struct name="GtkPrintUnixDialog_slistautoptr">
-		</struct>
-		<struct name="GtkPrinter_autoptr">
-		</struct>
-		<struct name="GtkPrinter_listautoptr">
-		</struct>
-		<struct name="GtkPrinter_queueautoptr">
-		</struct>
-		<struct name="GtkPrinter_slistautoptr">
-		</struct>
-		<flags name="GtkPrintCapabilities" type-name="GtkPrintCapabilities" get-type="gtk_print_capabilities_get_type">
-			<member name="GTK_PRINT_CAPABILITY_PAGE_SET" value="1"/>
-			<member name="GTK_PRINT_CAPABILITY_COPIES" value="2"/>
-			<member name="GTK_PRINT_CAPABILITY_COLLATE" value="4"/>
-			<member name="GTK_PRINT_CAPABILITY_REVERSE" value="8"/>
-			<member name="GTK_PRINT_CAPABILITY_SCALE" value="16"/>
-			<member name="GTK_PRINT_CAPABILITY_GENERATE_PDF" value="32"/>
-			<member name="GTK_PRINT_CAPABILITY_GENERATE_PS" value="64"/>
-			<member name="GTK_PRINT_CAPABILITY_PREVIEW" value="128"/>
-			<member name="GTK_PRINT_CAPABILITY_NUMBER_UP" value="256"/>
-			<member name="GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT" value="512"/>
-		</flags>
-		<object name="GtkPageSetupUnixDialog" parent="GtkDialog" type-name="GtkPageSetupUnixDialog" get-type="gtk_page_setup_unix_dialog_get_type">
-			<implements>
-				<interface name="GtkAccessible"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkConstraintTarget"/>
-				<interface name="GtkNative"/>
-				<interface name="GtkShortcutManager"/>
-				<interface name="GtkRoot"/>
-			</implements>
-			<method name="get_page_setup" symbol="gtk_page_setup_unix_dialog_get_page_setup">
-				<return-type type="GtkPageSetup*"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPageSetupUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_print_settings" symbol="gtk_page_setup_unix_dialog_get_print_settings">
-				<return-type type="GtkPrintSettings*"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPageSetupUnixDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gtk_page_setup_unix_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="title" type="char*"/>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</constructor>
-			<method name="set_page_setup" symbol="gtk_page_setup_unix_dialog_set_page_setup">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPageSetupUnixDialog*"/>
-					<parameter name="page_setup" type="GtkPageSetup*"/>
-				</parameters>
-			</method>
-			<method name="set_print_settings" symbol="gtk_page_setup_unix_dialog_set_print_settings">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPageSetupUnixDialog*"/>
-					<parameter name="print_settings" type="GtkPrintSettings*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="GtkPrintJob" parent="GObject" type-name="GtkPrintJob" get-type="gtk_print_job_get_type">
-			<method name="get_collate" symbol="gtk_print_job_get_collate">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_n_up" symbol="gtk_print_job_get_n_up">
-				<return-type type="guint"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_n_up_layout" symbol="gtk_print_job_get_n_up_layout">
-				<return-type type="GtkNumberUpLayout"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_num_copies" symbol="gtk_print_job_get_num_copies">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_page_ranges" symbol="gtk_print_job_get_page_ranges">
-				<return-type type="GtkPageRange*"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="n_ranges" type="int*"/>
-				</parameters>
-			</method>
-			<method name="get_page_set" symbol="gtk_print_job_get_page_set">
-				<return-type type="GtkPageSet"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_pages" symbol="gtk_print_job_get_pages">
-				<return-type type="GtkPrintPages"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_printer" symbol="gtk_print_job_get_printer">
-				<return-type type="GtkPrinter*"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_reverse" symbol="gtk_print_job_get_reverse">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_rotate" symbol="gtk_print_job_get_rotate">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_scale" symbol="gtk_print_job_get_scale">
-				<return-type type="double"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_settings" symbol="gtk_print_job_get_settings">
-				<return-type type="GtkPrintSettings*"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_status" symbol="gtk_print_job_get_status">
-				<return-type type="GtkPrintStatus"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_surface" symbol="gtk_print_job_get_surface">
-				<return-type type="cairo_surface_t*"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="get_title" symbol="gtk_print_job_get_title">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<method name="get_track_print_status" symbol="gtk_print_job_get_track_print_status">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gtk_print_job_new">
-				<return-type type="GtkPrintJob*"/>
-				<parameters>
-					<parameter name="title" type="char*"/>
-					<parameter name="printer" type="GtkPrinter*"/>
-					<parameter name="settings" type="GtkPrintSettings*"/>
-					<parameter name="page_setup" type="GtkPageSetup*"/>
-				</parameters>
-			</constructor>
-			<method name="send" symbol="gtk_print_job_send">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="callback" type="GtkPrintJobCompleteFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-					<parameter name="dnotify" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="set_collate" symbol="gtk_print_job_set_collate">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="collate" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_n_up" symbol="gtk_print_job_set_n_up">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="n_up" type="guint"/>
-				</parameters>
-			</method>
-			<method name="set_n_up_layout" symbol="gtk_print_job_set_n_up_layout">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="layout" type="GtkNumberUpLayout"/>
-				</parameters>
-			</method>
-			<method name="set_num_copies" symbol="gtk_print_job_set_num_copies">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="num_copies" type="int"/>
-				</parameters>
-			</method>
-			<method name="set_page_ranges" symbol="gtk_print_job_set_page_ranges">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="ranges" type="GtkPageRange*"/>
-					<parameter name="n_ranges" type="int"/>
-				</parameters>
-			</method>
-			<method name="set_page_set" symbol="gtk_print_job_set_page_set">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="page_set" type="GtkPageSet"/>
-				</parameters>
-			</method>
-			<method name="set_pages" symbol="gtk_print_job_set_pages">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="pages" type="GtkPrintPages"/>
-				</parameters>
-			</method>
-			<method name="set_reverse" symbol="gtk_print_job_set_reverse">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="reverse" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_rotate" symbol="gtk_print_job_set_rotate">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="rotate" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_scale" symbol="gtk_print_job_set_scale">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="scale" type="double"/>
-				</parameters>
-			</method>
-			<method name="set_source_fd" symbol="gtk_print_job_set_source_fd">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="fd" type="int"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="set_source_file" symbol="gtk_print_job_set_source_file">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="filename" type="char*"/>
-					<parameter name="error" type="GError**"/>
-				</parameters>
-			</method>
-			<method name="set_track_print_status" symbol="gtk_print_job_set_track_print_status">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="job" type="GtkPrintJob*"/>
-					<parameter name="track_status" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="page-setup" type="GtkPageSetup*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="printer" type="GtkPrinter*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="settings" type="GtkPrintSettings*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="track-print-status" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="status-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="GtkPrintJob*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="GtkPrintUnixDialog" parent="GtkDialog" type-name="GtkPrintUnixDialog" get-type="gtk_print_unix_dialog_get_type">
-			<implements>
-				<interface name="GtkAccessible"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkConstraintTarget"/>
-				<interface name="GtkNative"/>
-				<interface name="GtkShortcutManager"/>
-				<interface name="GtkRoot"/>
-			</implements>
-			<method name="add_custom_tab" symbol="gtk_print_unix_dialog_add_custom_tab">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="child" type="GtkWidget*"/>
-					<parameter name="tab_label" type="GtkWidget*"/>
-				</parameters>
-			</method>
-			<method name="get_current_page" symbol="gtk_print_unix_dialog_get_current_page">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_embed_page_setup" symbol="gtk_print_unix_dialog_get_embed_page_setup">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_has_selection" symbol="gtk_print_unix_dialog_get_has_selection">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_manual_capabilities" symbol="gtk_print_unix_dialog_get_manual_capabilities">
-				<return-type type="GtkPrintCapabilities"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_page_setup" symbol="gtk_print_unix_dialog_get_page_setup">
-				<return-type type="GtkPageSetup*"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_page_setup_set" symbol="gtk_print_unix_dialog_get_page_setup_set">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_selected_printer" symbol="gtk_print_unix_dialog_get_selected_printer">
-				<return-type type="GtkPrinter*"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_settings" symbol="gtk_print_unix_dialog_get_settings">
-				<return-type type="GtkPrintSettings*"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<method name="get_support_selection" symbol="gtk_print_unix_dialog_get_support_selection">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gtk_print_unix_dialog_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="title" type="char*"/>
-					<parameter name="parent" type="GtkWindow*"/>
-				</parameters>
-			</constructor>
-			<method name="set_current_page" symbol="gtk_print_unix_dialog_set_current_page">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="current_page" type="int"/>
-				</parameters>
-			</method>
-			<method name="set_embed_page_setup" symbol="gtk_print_unix_dialog_set_embed_page_setup">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="embed" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_has_selection" symbol="gtk_print_unix_dialog_set_has_selection">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="has_selection" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_manual_capabilities" symbol="gtk_print_unix_dialog_set_manual_capabilities">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="capabilities" type="GtkPrintCapabilities"/>
-				</parameters>
-			</method>
-			<method name="set_page_setup" symbol="gtk_print_unix_dialog_set_page_setup">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="page_setup" type="GtkPageSetup*"/>
-				</parameters>
-			</method>
-			<method name="set_settings" symbol="gtk_print_unix_dialog_set_settings">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="settings" type="GtkPrintSettings*"/>
-				</parameters>
-			</method>
-			<method name="set_support_selection" symbol="gtk_print_unix_dialog_set_support_selection">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="dialog" type="GtkPrintUnixDialog*"/>
-					<parameter name="support_selection" type="gboolean"/>
-				</parameters>
-			</method>
-			<property name="current-page" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="embed-page-setup" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="has-selection" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="manual-capabilities" type="GtkPrintCapabilities" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="page-setup" type="GtkPageSetup*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="print-settings" type="GtkPrintSettings*" readable="1" writable="1" construct="0" construct-only="0"/>
-			<property name="selected-printer" type="GtkPrinter*" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="support-selection" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-		</object>
-		<object name="GtkPrinter" parent="GObject" type-name="GtkPrinter" get-type="gtk_printer_get_type">
-			<method name="accepts_pdf" symbol="gtk_printer_accepts_pdf">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="accepts_ps" symbol="gtk_printer_accepts_ps">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="compare" symbol="gtk_printer_compare">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="a" type="GtkPrinter*"/>
-					<parameter name="b" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_backend" symbol="gtk_printer_get_backend">
-				<return-type type="GtkPrintBackend*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_capabilities" symbol="gtk_printer_get_capabilities">
-				<return-type type="GtkPrintCapabilities"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_default_page_size" symbol="gtk_printer_get_default_page_size">
-				<return-type type="GtkPageSetup*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_description" symbol="gtk_printer_get_description">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_hard_margins" symbol="gtk_printer_get_hard_margins">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-					<parameter name="top" type="double*"/>
-					<parameter name="bottom" type="double*"/>
-					<parameter name="left" type="double*"/>
-					<parameter name="right" type="double*"/>
-				</parameters>
-			</method>
-			<method name="get_hard_margins_for_paper_size" symbol="gtk_printer_get_hard_margins_for_paper_size">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-					<parameter name="paper_size" type="GtkPaperSize*"/>
-					<parameter name="top" type="double*"/>
-					<parameter name="bottom" type="double*"/>
-					<parameter name="left" type="double*"/>
-					<parameter name="right" type="double*"/>
-				</parameters>
-			</method>
-			<method name="get_icon_name" symbol="gtk_printer_get_icon_name">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_job_count" symbol="gtk_printer_get_job_count">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_location" symbol="gtk_printer_get_location">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="gtk_printer_get_name">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="get_state_message" symbol="gtk_printer_get_state_message">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="has_details" symbol="gtk_printer_has_details">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="is_accepting_jobs" symbol="gtk_printer_is_accepting_jobs">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="is_active" symbol="gtk_printer_is_active">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="is_default" symbol="gtk_printer_is_default">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="is_paused" symbol="gtk_printer_is_paused">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="is_virtual" symbol="gtk_printer_is_virtual">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<method name="list_papers" symbol="gtk_printer_list_papers">
-				<return-type type="GList*"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gtk_printer_new">
-				<return-type type="GtkPrinter*"/>
-				<parameters>
-					<parameter name="name" type="char*"/>
-					<parameter name="backend" type="GtkPrintBackend*"/>
-					<parameter name="virtual_" type="gboolean"/>
-				</parameters>
-			</constructor>
-			<method name="request_details" symbol="gtk_printer_request_details">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="printer" type="GtkPrinter*"/>
-				</parameters>
-			</method>
-			<property name="accepting-jobs" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="accepts-pdf" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="accepts-ps" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="backend" type="GtkPrintBackend*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="icon-name" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="is-virtual" type="gboolean" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="job-count" type="gint" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="location" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="paused" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
-			<property name="state-message" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
-			<signal name="details-acquired" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="GtkPrinter*"/>
-					<parameter name="p0" type="gboolean"/>
-				</parameters>
-			</signal>
-		</object>
-	</namespace>
-</api>
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.metadata b/vapi/packages/gtk4-unix-print/gtk4-unix-print.metadata
deleted file mode 100644
index 248829ff6..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print.metadata
+++ /dev/null
@@ -1,29 +0,0 @@
-Gtk cheader_filename="gtk/gtkunixprint.h" gir_namespace="Gtk" gir_version="4.0" cprefix="Gtk" lower_case_cprefix="gtk_"
-
-gtk_print_job_get_page_ranges is_array="1"
-gtk_print_job_get_page_ranges.n_ranges hidden="1"
-gtk_print_job_send.callback transfer_ownership="1"
-gtk_print_job_send.dnotify hidden="1"
-gtk_print_unix_dialog_get_settings transfer_ownership="1"
-gtk_printer_accepts_pdf name="get_accepts_pdf"
-gtk_printer_accepts_ps name="get_accepts_ps"
-gtk_printer_get_default_page_size transfer_ownership="1"
-gtk_printer_get_hard_margins.top is_out="1"
-gtk_printer_get_hard_margins.bottom is_out="1"
-gtk_printer_get_hard_margins.left is_out="1"
-gtk_printer_get_hard_margins.right is_out="1"
-gtk_printer_get_hard_margins_for_paper_size.top is_out="1"
-gtk_printer_get_hard_margins_for_paper_size.bottom is_out="1"
-gtk_printer_get_hard_margins_for_paper_size.left is_out="1"
-gtk_printer_get_hard_margins_for_paper_size.right is_out="1"
-gtk_printer_is_virtual name="get_is_virtual"
-gtk_printer_list_papers transfer_ownership="1" type_name="GLib.List<Gtk.PageSetup>"
-GtkPrintJobCompleteFunc hidden="1"
-gtk_enumerate_printers.func transfer_ownership="1"
-gtk_enumerate_printers.data hidden="1"
-gtk_enumerate_printers.destroy hidden="1"
-
-*.dummy* hidden="1"
-*_reserved* hidden="1"
-*_gtk_recent* hidden="1"
-*autoptr hidden="1"
diff --git a/vapi/packages/gtk4-unix-print/gtk4-unix-print.namespace b/vapi/packages/gtk4-unix-print/gtk4-unix-print.namespace
deleted file mode 100644
index 0be6e7e3d..000000000
--- a/vapi/packages/gtk4-unix-print/gtk4-unix-print.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Gtk