From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 11 Jan 2014 16:30:59 +0000 (+0100)
Subject: gdk-x11-3.0: Switch to GIR
X-Git-Tag: 0.23.2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65e3dc87c418ab88ef7e088be7e029b7cc9c6a5;p=thirdparty%2Fvala.git

gdk-x11-3.0: Switch to GIR
---

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 8d5da2fe7..12506367a 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -480,7 +480,7 @@ gdk-x11-2.0:
 	$(GENVAPI) --library $(srcdir)/gdk-x11-2.0 $(PACKAGESDIR)/gdk-x11-2.0/gdk-x11-2.0-custom.vala $(PACKAGESDIR)/gdk-x11-2.0/gdk-x11-2.0.gi
 
 gdk-x11-3.0:
-	$(GENVAPI) --library $(srcdir)/gdk-x11-3.0 $(PACKAGESDIR)/gdk-x11-3.0/gdk-x11-3.0.gi
+	$(GENVAPI) --library $(srcdir)/gdk-x11-3.0 --pkg gio-2.0 --pkg gdk-3.0 --pkg x11 --metadatadir $(METADATADIR) $(METADATADIR)/GdkX11-3.0-custom.vala $(GIRDIR)/GdkX11-3.0.gir
 
 gdl-1.0:
 	$(GENVAPI) --library $(srcdir)/gdl-1.0 $(PACKAGESDIR)/gdl-1.0/gdl-1.0-custom.vala $(PACKAGESDIR)/gdl-1.0/gdl-1.0.gi
diff --git a/vapi/gdk-x11-3.0.vapi b/vapi/gdk-x11-3.0.vapi
index a053b1781..1744b5909 100644
--- a/vapi/gdk-x11-3.0.vapi
+++ b/vapi/gdk-x11-3.0.vapi
@@ -1,16 +1,188 @@
 /* gdk-x11-3.0.vapi generated by vapigen, do not modify. */
 
+[CCode (cprefix = "Gdk", gir_namespace = "GdkX11", gir_version = "3.0", lower_case_cprefix = "gdk_")]
 namespace Gdk {
+	namespace X11 {
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_app_launch_context_get_type ()")]
+		[GIR (name = "X11AppLaunchContext")]
+		public class AppLaunchContext : Gdk.AppLaunchContext {
+			[CCode (has_construct_function = false)]
+			protected AppLaunchContext ();
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_cursor_get_type ()")]
+		[GIR (name = "X11Cursor")]
+		public class Cursor : Gdk.Cursor {
+			[CCode (has_construct_function = false)]
+			protected Cursor ();
+			public X.Cursor get_xcursor ();
+			public unowned X.Display get_xdisplay ();
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_device_core_get_type ()")]
+		[GIR (name = "X11DeviceCore")]
+		public class DeviceCore : Gdk.Device {
+			[CCode (has_construct_function = false)]
+			protected DeviceCore ();
+			[CCode (cname = "gdk_x11_device_manager_lookup")]
+			public static unowned Gdk.X11.DeviceCore lookup_for_device_manager (Gdk.X11.DeviceManagerCore device_manager, int device_id);
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_device_manager_core_get_type ()")]
+		[GIR (name = "X11DeviceManagerCore")]
+		public class DeviceManagerCore : Gdk.DeviceManager {
+			[CCode (has_construct_function = false)]
+			protected DeviceManagerCore ();
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_device_manager_xi2_get_type ()")]
+		[GIR (name = "X11DeviceManagerXI2")]
+		public class DeviceManagerXI2 : Gdk.X11.DeviceManagerCore {
+			[CCode (has_construct_function = false)]
+			protected DeviceManagerXI2 ();
+			[NoAccessorMethod]
+			public int major { get; construct; }
+			[NoAccessorMethod]
+			public int minor { get; construct; }
+			[NoAccessorMethod]
+			public int opcode { get; construct; }
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_device_xi2_get_type ()")]
+		[GIR (name = "X11DeviceXI2")]
+		public class DeviceXI2 : Gdk.Device {
+			[CCode (has_construct_function = false)]
+			protected DeviceXI2 ();
+			[NoAccessorMethod]
+			public int device_id { get; construct; }
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_display_get_type ()")]
+		[GIR (name = "X11Display")]
+		public class Display : Gdk.Display {
+			[CCode (has_construct_function = false)]
+			protected Display ();
+			public void broadcast_startup_message (string message_type, ...);
+			public int error_trap_pop ();
+			public void error_trap_pop_ignored ();
+			public void error_trap_push ();
+			public unowned string get_startup_notification_id ();
+			public uint32 get_user_time ();
+			public unowned X.Display get_xdisplay ();
+			public void grab ();
+			[CCode (cname = "gdk_x11_lookup_xdisplay")]
+			public static unowned Gdk.X11.Display lookup_for_xdisplay (X.Display xdisplay);
+			public void set_cursor_theme (string theme, int size);
+			public void set_startup_notification_id (string startup_id);
+			public void set_window_scale (int scale);
+			public int string_to_compound_text (string str, out Gdk.Atom encoding, out int format, [CCode (array_length_cname = "length", array_length_pos = 4.1)] out uint8[] ctext);
+			public int text_property_to_text_list (Gdk.Atom encoding, int format, uint8 text, int length, string list);
+			public void ungrab ();
+			public bool utf8_to_compound_text (string str, out Gdk.Atom encoding, out int format, [CCode (array_length_cname = "length", array_length_pos = 4.1)] out uint8[] ctext);
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_display_manager_get_type ()")]
+		[GIR (name = "X11DisplayManager")]
+		public class DisplayManager : Gdk.DisplayManager {
+			[CCode (has_construct_function = false)]
+			protected DisplayManager ();
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_drag_context_get_type ()")]
+		[GIR (name = "X11DragContext")]
+		public class DragContext : Gdk.DragContext {
+			[CCode (has_construct_function = false)]
+			protected DragContext ();
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_keymap_get_type ()")]
+		[GIR (name = "X11Keymap")]
+		public class Keymap : Gdk.Keymap {
+			[CCode (has_construct_function = false)]
+			protected Keymap ();
+			public int get_group_for_state (uint state);
+			public bool key_is_modifier (uint keycode);
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_screen_get_type ()")]
+		[GIR (name = "X11Screen")]
+		public class Screen : Gdk.Screen {
+			[CCode (has_construct_function = false)]
+			protected Screen ();
+			public uint32 get_current_desktop ();
+			public X.ID get_monitor_output (int monitor_num);
+			public uint32 get_number_of_desktops ();
+			public int get_screen_number ();
+			public unowned string get_window_manager_name ();
+			public unowned X.Screen get_xscreen ();
+			public unowned Gdk.X11.Visual lookup_visual (X.VisualID xvisualid);
+			public bool supports_net_wm_hint (Gdk.Atom property);
+			public signal void window_manager_changed ();
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_visual_get_type ()")]
+		[GIR (name = "X11Visual")]
+		public class Visual : Gdk.Visual {
+			[CCode (has_construct_function = false)]
+			protected Visual ();
+			public unowned X.Visual get_xvisual ();
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h", type_id = "gdk_x11_window_get_type ()")]
+		[GIR (name = "X11Window")]
+		public class Window : Gdk.Window {
+			[CCode (has_construct_function = false)]
+			protected Window ();
+			[CCode (cname = "gdk_x11_window_foreign_new_for_display", has_construct_function = false, type = "GdkWindow*")]
+			public Window.foreign_for_display (Gdk.X11.Display display, X.Window window);
+			public uint32 get_desktop ();
+			public X.Window get_xid ();
+			public static unowned Gdk.X11.Window lookup_for_display (Gdk.X11.Display display, X.Window window);
+			public void move_to_current_desktop ();
+			public void move_to_desktop (uint32 desktop);
+			[Deprecated (since = "3.12")]
+			public void set_frame_extents (int left, int right, int top, int bottom);
+			public void set_frame_sync_enabled (bool frame_sync_enabled);
+			public void set_hide_titlebar_when_maximized (bool hide_titlebar_when_maximized);
+			public void set_theme_variant (string variant);
+			public void set_user_time (uint32 timestamp);
+			public void set_utf8_property (string name, string? value);
+		}
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static X.Atom atom_to_xatom (Gdk.Atom atom);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static X.Atom atom_to_xatom_for_display (Gdk.X11.Display display, Gdk.Atom atom);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static int device_get_id (Gdk.X11.DeviceCore device);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static void free_compound_text ([CCode (array_length = false, type = "guchar*")] uint8[] ctext);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static void free_text_list (string list);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static X.Window get_default_root_xwindow ();
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static int get_default_screen ();
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static unowned X.Display get_default_xdisplay ();
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static uint32 get_server_time (Gdk.X11.Window window);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static X.Atom get_xatom_by_name (string atom_name);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static X.Atom get_xatom_by_name_for_display (Gdk.X11.Display display, string atom_name);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static unowned string get_xatom_name (X.Atom xatom);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static unowned string get_xatom_name_for_display (Gdk.X11.Display display, X.Atom xatom);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static void grab_server ();
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static void register_standard_event_type (Gdk.X11.Display display, int event_base, int n_events);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static void set_sm_client_id (string sm_client_id);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static void ungrab_server ();
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static Gdk.Atom xatom_to_atom (X.Atom xatom);
+		[CCode (cheader_filename = "gdk/gdkx.h")]
+		public static Gdk.Atom xatom_to_atom_for_display (Gdk.X11.Display display, X.Atom xatom);
+	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.AppLaunchContext", since = "vala-0.24")]
 	public class X11AppLaunchContext : Gdk.AppLaunchContext {
 		[CCode (has_construct_function = false)]
 		protected X11AppLaunchContext ();
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11AppLaunchContextClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Cursor", since = "vala-0.24")]
 	public class X11Cursor : Gdk.Cursor {
 		[CCode (has_construct_function = false)]
 		protected X11Cursor ();
@@ -18,10 +190,7 @@ namespace Gdk {
 		public static unowned X.Display get_xdisplay (Gdk.Cursor cursor);
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11CursorClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Display", since = "vala-0.24")]
 	public class X11Display : Gdk.Display {
 		[CCode (has_construct_function = false)]
 		protected X11Display ();
@@ -42,28 +211,19 @@ namespace Gdk {
 		public static bool utf8_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11DisplayClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.DisplayManager", since = "vala-0.24")]
 	public class X11DisplayManager : Gdk.DisplayManager {
 		[CCode (has_construct_function = false)]
 		protected X11DisplayManager ();
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11DisplayManagerClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.DragContext", since = "vala-0.24")]
 	public class X11DragContext : Gdk.DragContext {
 		[CCode (has_construct_function = false)]
 		protected X11DragContext ();
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11DragContextClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Keymap", since = "vala-0.24")]
 	public class X11Keymap : Gdk.Keymap {
 		[CCode (has_construct_function = false)]
 		protected X11Keymap ();
@@ -71,10 +231,7 @@ namespace Gdk {
 		public static bool key_is_modifier (Gdk.Keymap keymap, uint keycode);
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11KeymapClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Screen", since = "vala-0.24")]
 	public class X11Screen : Gdk.Screen {
 		[CCode (has_construct_function = false)]
 		protected X11Screen ();
@@ -89,20 +246,14 @@ namespace Gdk {
 		public virtual signal void window_manager_changed ();
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11ScreenClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Visual", since = "vala-0.24")]
 	public class X11Visual : Gdk.Visual {
 		[CCode (has_construct_function = false)]
 		protected X11Visual ();
 		public static unowned X.Visual get_xvisual (Gdk.Visual visual);
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11VisualClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Window", since = "vala-0.24")]
 	public class X11Window : Gdk.Window {
 		[CCode (has_construct_function = false)]
 		protected X11Window ();
@@ -120,45 +271,60 @@ namespace Gdk {
 		public static void set_utf8_property (Gdk.Window window, string name, string value);
 	}
 	[CCode (cheader_filename = "gdk/gdkx.h")]
-	[Compact]
-	public class X11WindowClass {
-	}
-	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.atom_to_xatom", since = "vala-0.24")]
 	public static X.Atom x11_atom_to_xatom (Gdk.Atom atom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.atom_to_xatom_for_display", since = "vala-0.24")]
 	public static X.Atom x11_atom_to_xatom_for_display (Gdk.Display display, Gdk.Atom atom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.free_compound_text", since = "vala-0.24")]
 	public static void x11_free_compound_text (uchar[] ctext);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.free_text_list", since = "vala-0.24")]
 	public static void x11_free_text_list (string list);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_default_root_xwindow", since = "vala-0.24")]
 	public static X.Window x11_get_default_root_xwindow ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_default_scree", since = "vala-0.24")]
 	public static int x11_get_default_screen ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_default_xdisplay", since = "vala-0.24")]
 	public static unowned X.Display x11_get_default_xdisplay ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_server_time", since = "vala-0.24")]
 	public static uint32 x11_get_server_time (Gdk.Window window);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_by_name", since = "vala-0.24")]
 	public static X.Atom x11_get_xatom_by_name (string atom_name);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_by_name_for_display", since = "vala-0.24")]
 	public static X.Atom x11_get_xatom_by_name_for_display (Gdk.Display display, string atom_name);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_nam", since = "vala-0.24")]
 	public static unowned string x11_get_xatom_name (X.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_name_for_display", since = "vala-0.24")]
 	public static unowned string x11_get_xatom_name_for_display (Gdk.Display display, X.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.grab_server", since = "vala-0.24")]
 	public static void x11_grab_server ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Display.lookup_for_xdisplay", since = "vala-0.24")]
 	public static unowned Gdk.Display x11_lookup_xdisplay (X.Display xdisplay);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.register_standard_event_type", since = "vala-0.24")]
 	public static void x11_register_standard_event_type (Gdk.Display display, int event_base, int n_events);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.set_sm_client_id", since = "vala-0.24")]
 	public static void x11_set_sm_client_id (string sm_client_id);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.ungrab_server", since = "vala-0.24")]
 	public static void x11_ungrab_server ();
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.xatom_to_atom", since = "vala-0.24")]
 	public static Gdk.Atom x11_xatom_to_atom (X.Atom xatom);
 	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.xatom_to_atom_for_display", since = "vala-0.24")]
 	public static Gdk.Atom x11_xatom_to_atom_for_display (Gdk.Display display, X.Atom xatom);
 }
diff --git a/vapi/metadata/GdkX11-3.0-custom.vala b/vapi/metadata/GdkX11-3.0-custom.vala
new file mode 100644
index 000000000..14fbd0db8
--- /dev/null
+++ b/vapi/metadata/GdkX11-3.0-custom.vala
@@ -0,0 +1,155 @@
+namespace Gdk {
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.AppLaunchContext", since = "vala-0.24")]
+	public class X11AppLaunchContext : Gdk.AppLaunchContext {
+		[CCode (has_construct_function = false)]
+		protected X11AppLaunchContext ();
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Cursor", since = "vala-0.24")]
+	public class X11Cursor : Gdk.Cursor {
+		[CCode (has_construct_function = false)]
+		protected X11Cursor ();
+		public static X.Cursor get_xcursor (Gdk.Cursor cursor);
+		public static unowned X.Display get_xdisplay (Gdk.Cursor cursor);
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Display", since = "vala-0.24")]
+	public class X11Display : Gdk.Display {
+		[CCode (has_construct_function = false)]
+		protected X11Display ();
+		public static void broadcast_startup_message (Gdk.Display display, string message_type, ...);
+		public static int error_trap_pop (Gdk.Display display);
+		public static void error_trap_pop_ignored (Gdk.Display display);
+		public static void error_trap_push (Gdk.Display display);
+		public static unowned string get_startup_notification_id (Gdk.Display display);
+		public static uint32 get_user_time (Gdk.Display display);
+		public static unowned X.Display get_xdisplay (Gdk.Display display);
+		public static void grab (Gdk.Display display);
+		public static void set_cursor_theme (Gdk.Display display, string theme, int size);
+		public static void set_startup_notification_id (Gdk.Display display, string startup_id);
+		public static void set_window_scale (Gdk.Display display, int scale);
+		public static int string_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
+		public static int text_property_to_text_list (Gdk.Display display, Gdk.Atom encoding, int format, uchar[] text, int length, string list);
+		public static void ungrab (Gdk.Display display);
+		public static bool utf8_to_compound_text (Gdk.Display display, string str, out Gdk.Atom encoding, int format, uchar[] ctext, int length);
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.DisplayManager", since = "vala-0.24")]
+	public class X11DisplayManager : Gdk.DisplayManager {
+		[CCode (has_construct_function = false)]
+		protected X11DisplayManager ();
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.DragContext", since = "vala-0.24")]
+	public class X11DragContext : Gdk.DragContext {
+		[CCode (has_construct_function = false)]
+		protected X11DragContext ();
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Keymap", since = "vala-0.24")]
+	public class X11Keymap : Gdk.Keymap {
+		[CCode (has_construct_function = false)]
+		protected X11Keymap ();
+		public static int get_group_for_state (Gdk.Keymap keymap, uint state);
+		public static bool key_is_modifier (Gdk.Keymap keymap, uint keycode);
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Screen", since = "vala-0.24")]
+	public class X11Screen : Gdk.Screen {
+		[CCode (has_construct_function = false)]
+		protected X11Screen ();
+		public static uint32 get_current_desktop (Gdk.Screen screen);
+		public static X.ID get_monitor_output (Gdk.Screen screen, int monitor_num);
+		public static uint32 get_number_of_desktops (Gdk.Screen screen);
+		public static int get_screen_number (Gdk.Screen screen);
+		public static unowned string get_window_manager_name (Gdk.Screen screen);
+		public static unowned X.Screen get_xscreen (Gdk.Screen screen);
+		public static unowned Gdk.Visual lookup_visual (Gdk.Screen screen, X.VisualID xvisualid);
+		public static bool supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property);
+		public virtual signal void window_manager_changed ();
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Visual", since = "vala-0.24")]
+	public class X11Visual : Gdk.Visual {
+		[CCode (has_construct_function = false)]
+		protected X11Visual ();
+		public static unowned X.Visual get_xvisual (Gdk.Visual visual);
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Window", since = "vala-0.24")]
+	public class X11Window : Gdk.Window {
+		[CCode (has_construct_function = false)]
+		protected X11Window ();
+		public static unowned Gdk.Window foreign_new_for_display (Gdk.Display display, X.Window window);
+		public static uint32 get_desktop (Gdk.Window window);
+		public static X.Window get_xid (Gdk.Window window);
+		public static unowned Gdk.Window lookup_for_display (Gdk.Display display, X.Window window);
+		public static void move_to_current_desktop (Gdk.Window window);
+		public static void move_to_desktop (Gdk.Window window, uint32 desktop);
+		public static void set_frame_extents (Gdk.Window window, int left, int right, int top, int bottom);
+		public static void set_frame_sync_enabled (Gdk.Window window, bool frame_sync_enabled);
+		public static void set_hide_titlebar_when_maximized (Gdk.Window window, bool hide_titlebar_when_maximized);
+		public static void set_theme_variant (Gdk.Window window, string variant);
+		public static void set_user_time (Gdk.Window window, uint32 timestamp);
+		public static void set_utf8_property (Gdk.Window window, string name, string value);
+	}
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.atom_to_xatom", since = "vala-0.24")]
+	public static X.Atom x11_atom_to_xatom (Gdk.Atom atom);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.atom_to_xatom_for_display", since = "vala-0.24")]
+	public static X.Atom x11_atom_to_xatom_for_display (Gdk.Display display, Gdk.Atom atom);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.free_compound_text", since = "vala-0.24")]
+	public static void x11_free_compound_text (uchar[] ctext);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.free_text_list", since = "vala-0.24")]
+	public static void x11_free_text_list (string list);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_default_root_xwindow", since = "vala-0.24")]
+	public static X.Window x11_get_default_root_xwindow ();
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_default_scree", since = "vala-0.24")]
+	public static int x11_get_default_screen ();
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_default_xdisplay", since = "vala-0.24")]
+	public static unowned X.Display x11_get_default_xdisplay ();
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_server_time", since = "vala-0.24")]
+	public static uint32 x11_get_server_time (Gdk.Window window);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_by_name", since = "vala-0.24")]
+	public static X.Atom x11_get_xatom_by_name (string atom_name);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_by_name_for_display", since = "vala-0.24")]
+	public static X.Atom x11_get_xatom_by_name_for_display (Gdk.Display display, string atom_name);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_nam", since = "vala-0.24")]
+	public static unowned string x11_get_xatom_name (X.Atom xatom);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.get_xatom_name_for_display", since = "vala-0.24")]
+	public static unowned string x11_get_xatom_name_for_display (Gdk.Display display, X.Atom xatom);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.grab_server", since = "vala-0.24")]
+	public static void x11_grab_server ();
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.Display.lookup_for_xdisplay", since = "vala-0.24")]
+	public static unowned Gdk.Display x11_lookup_xdisplay (X.Display xdisplay);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.register_standard_event_type", since = "vala-0.24")]
+	public static void x11_register_standard_event_type (Gdk.Display display, int event_base, int n_events);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.set_sm_client_id", since = "vala-0.24")]
+	public static void x11_set_sm_client_id (string sm_client_id);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.ungrab_server", since = "vala-0.24")]
+	public static void x11_ungrab_server ();
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.xatom_to_atom", since = "vala-0.24")]
+	public static Gdk.Atom x11_xatom_to_atom (X.Atom xatom);
+	[CCode (cheader_filename = "gdk/gdkx.h")]
+	[Deprecated (replacement = "Gdk.X11.xatom_to_atom_for_display", since = "vala-0.24")]
+	public static Gdk.Atom x11_xatom_to_atom_for_display (Gdk.Display display, X.Atom xatom);
+
+}
diff --git a/vapi/metadata/GdkX11-3.0.metadata b/vapi/metadata/GdkX11-3.0.metadata
new file mode 100644
index 000000000..c26eccc3a
--- /dev/null
+++ b/vapi/metadata/GdkX11-3.0.metadata
@@ -0,0 +1,12 @@
+x11_* name="x11_(.+)" parent="Gdk.X11"
+X11* name="X11(.+)" parent="Gdk.X11"
+
+X11Display
+	.broadcast_startup_message skip=false
+
+X11Window
+	.foreign_new_for_display name="foreign_for_display"
+
+x11_device_manager_lookup name="lookup_for_device_manager" parent="Gdk.X11.DeviceCore"
+x11_free_compound_text.ctext type="uint8[]"
+x11_lookup_xdisplay name="lookup_for_xdisplay" parent="Gdk.X11.Display"
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
deleted file mode 100644
index 4cc33b2dc..000000000
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.defines
+++ /dev/null
@@ -1,3 +0,0 @@
--DGDK_COMPILATION
--DGDK_DISABLE_DEPRECATED
--DGSEAL_ENABLE
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.deps b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.deps
deleted file mode 100644
index 5d3176013..000000000
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.deps
+++ /dev/null
@@ -1,7 +0,0 @@
-gio-2.0
-gdk-3.0
-gdk-pixbuf-2.0
-cairo
-pango
-pangocairo
-x11
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes
deleted file mode 100644
index e0d91876d..000000000
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.excludes
+++ /dev/null
@@ -1 +0,0 @@
-gdkx11device.*h
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
deleted file mode 100644
index 7847ecd3d..000000000
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.files
+++ /dev/null
@@ -1,3 +0,0 @@
-include/gtk-3.0/gdk/gdkx.h
-include/gtk-3.0/gdk/x11
-lib/libgdk-3.so
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
deleted file mode 100644
index 8edd3942b..000000000
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.gi
+++ /dev/null
@@ -1,433 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="Gdk">
-		<function name="x11_atom_to_xatom" symbol="gdk_x11_atom_to_xatom">
-			<return-type type="Atom"/>
-			<parameters>
-				<parameter name="atom" type="GdkAtom"/>
-			</parameters>
-		</function>
-		<function name="x11_atom_to_xatom_for_display" symbol="gdk_x11_atom_to_xatom_for_display">
-			<return-type type="Atom"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="atom" type="GdkAtom"/>
-			</parameters>
-		</function>
-		<function name="x11_free_compound_text" symbol="gdk_x11_free_compound_text">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="ctext" type="guchar*"/>
-			</parameters>
-		</function>
-		<function name="x11_free_text_list" symbol="gdk_x11_free_text_list">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="list" type="gchar**"/>
-			</parameters>
-		</function>
-		<function name="x11_get_default_root_xwindow" symbol="gdk_x11_get_default_root_xwindow">
-			<return-type type="Window"/>
-		</function>
-		<function name="x11_get_default_screen" symbol="gdk_x11_get_default_screen">
-			<return-type type="gint"/>
-		</function>
-		<function name="x11_get_default_xdisplay" symbol="gdk_x11_get_default_xdisplay">
-			<return-type type="Display*"/>
-		</function>
-		<function name="x11_get_server_time" symbol="gdk_x11_get_server_time">
-			<return-type type="guint32"/>
-			<parameters>
-				<parameter name="window" type="GdkWindow*"/>
-			</parameters>
-		</function>
-		<function name="x11_get_xatom_by_name" symbol="gdk_x11_get_xatom_by_name">
-			<return-type type="Atom"/>
-			<parameters>
-				<parameter name="atom_name" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="x11_get_xatom_by_name_for_display" symbol="gdk_x11_get_xatom_by_name_for_display">
-			<return-type type="Atom"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="atom_name" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="x11_get_xatom_name" symbol="gdk_x11_get_xatom_name">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="xatom" type="Atom"/>
-			</parameters>
-		</function>
-		<function name="x11_get_xatom_name_for_display" symbol="gdk_x11_get_xatom_name_for_display">
-			<return-type type="gchar*"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="xatom" type="Atom"/>
-			</parameters>
-		</function>
-		<function name="x11_grab_server" symbol="gdk_x11_grab_server">
-			<return-type type="void"/>
-		</function>
-		<function name="x11_lookup_xdisplay" symbol="gdk_x11_lookup_xdisplay">
-			<return-type type="GdkDisplay*"/>
-			<parameters>
-				<parameter name="xdisplay" type="Display*"/>
-			</parameters>
-		</function>
-		<function name="x11_register_standard_event_type" symbol="gdk_x11_register_standard_event_type">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="event_base" type="gint"/>
-				<parameter name="n_events" type="gint"/>
-			</parameters>
-		</function>
-		<function name="x11_set_sm_client_id" symbol="gdk_x11_set_sm_client_id">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="sm_client_id" type="gchar*"/>
-			</parameters>
-		</function>
-		<function name="x11_ungrab_server" symbol="gdk_x11_ungrab_server">
-			<return-type type="void"/>
-		</function>
-		<function name="x11_xatom_to_atom" symbol="gdk_x11_xatom_to_atom">
-			<return-type type="GdkAtom"/>
-			<parameters>
-				<parameter name="xatom" type="Atom"/>
-			</parameters>
-		</function>
-		<function name="x11_xatom_to_atom_for_display" symbol="gdk_x11_xatom_to_atom_for_display">
-			<return-type type="GdkAtom"/>
-			<parameters>
-				<parameter name="display" type="GdkDisplay*"/>
-				<parameter name="xatom" type="Atom"/>
-			</parameters>
-		</function>
-		<struct name="GdkX11AppLaunchContextClass">
-		</struct>
-		<struct name="GdkX11CursorClass">
-		</struct>
-		<struct name="GdkX11DisplayClass">
-		</struct>
-		<struct name="GdkX11DisplayManagerClass">
-		</struct>
-		<struct name="GdkX11DragContextClass">
-		</struct>
-		<struct name="GdkX11KeymapClass">
-		</struct>
-		<struct name="GdkX11ScreenClass">
-		</struct>
-		<struct name="GdkX11VisualClass">
-		</struct>
-		<struct name="GdkX11WindowClass">
-		</struct>
-		<object name="GdkX11AppLaunchContext" parent="GdkAppLaunchContext" type-name="GdkX11AppLaunchContext" get-type="gdk_x11_app_launch_context_get_type">
-		</object>
-		<object name="GdkX11Cursor" parent="GdkCursor" type-name="GdkX11Cursor" get-type="gdk_x11_cursor_get_type">
-			<method name="get_xcursor" symbol="gdk_x11_cursor_get_xcursor">
-				<return-type type="Cursor"/>
-				<parameters>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</method>
-			<method name="get_xdisplay" symbol="gdk_x11_cursor_get_xdisplay">
-				<return-type type="Display*"/>
-				<parameters>
-					<parameter name="cursor" type="GdkCursor*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="GdkX11Display" parent="GdkDisplay" type-name="GdkX11Display" get-type="gdk_x11_display_get_type">
-			<implements>
-				<interface name="GdkEventTranslator"/>
-			</implements>
-			<method name="broadcast_startup_message" symbol="gdk_x11_display_broadcast_startup_message">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="message_type" type="char*"/>
-				</parameters>
-			</method>
-			<method name="error_trap_pop" symbol="gdk_x11_display_error_trap_pop">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="error_trap_pop_ignored" symbol="gdk_x11_display_error_trap_pop_ignored">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="error_trap_push" symbol="gdk_x11_display_error_trap_push">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="get_startup_notification_id" symbol="gdk_x11_display_get_startup_notification_id">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="get_user_time" symbol="gdk_x11_display_get_user_time">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="get_xdisplay" symbol="gdk_x11_display_get_xdisplay">
-				<return-type type="Display*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="grab" symbol="gdk_x11_display_grab">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="set_cursor_theme" symbol="gdk_x11_display_set_cursor_theme">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="theme" type="gchar*"/>
-					<parameter name="size" type="gint"/>
-				</parameters>
-			</method>
-			<method name="set_startup_notification_id" symbol="gdk_x11_display_set_startup_notification_id">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="startup_id" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_window_scale" symbol="gdk_x11_display_set_window_scale">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="scale" type="gint"/>
-				</parameters>
-			</method>
-			<method name="string_to_compound_text" symbol="gdk_x11_display_string_to_compound_text">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="str" type="gchar*"/>
-					<parameter name="encoding" type="GdkAtom*"/>
-					<parameter name="format" type="gint*"/>
-					<parameter name="ctext" type="guchar**"/>
-					<parameter name="length" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="text_property_to_text_list" symbol="gdk_x11_display_text_property_to_text_list">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="encoding" type="GdkAtom"/>
-					<parameter name="format" type="gint"/>
-					<parameter name="text" type="guchar*"/>
-					<parameter name="length" type="gint"/>
-					<parameter name="list" type="gchar***"/>
-				</parameters>
-			</method>
-			<method name="ungrab" symbol="gdk_x11_display_ungrab">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-				</parameters>
-			</method>
-			<method name="utf8_to_compound_text" symbol="gdk_x11_display_utf8_to_compound_text">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="str" type="gchar*"/>
-					<parameter name="encoding" type="GdkAtom*"/>
-					<parameter name="format" type="gint*"/>
-					<parameter name="ctext" type="guchar**"/>
-					<parameter name="length" type="gint*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="GdkX11DisplayManager" parent="GdkDisplayManager" type-name="GdkX11DisplayManager" get-type="gdk_x11_display_manager_get_type">
-		</object>
-		<object name="GdkX11DragContext" parent="GdkDragContext" type-name="GdkX11DragContext" get-type="gdk_x11_drag_context_get_type">
-		</object>
-		<object name="GdkX11Keymap" parent="GdkKeymap" type-name="GdkX11Keymap" get-type="gdk_x11_keymap_get_type">
-			<method name="get_group_for_state" symbol="gdk_x11_keymap_get_group_for_state">
-				<return-type type="gint"/>
-				<parameters>
-					<parameter name="keymap" type="GdkKeymap*"/>
-					<parameter name="state" type="guint"/>
-				</parameters>
-			</method>
-			<method name="key_is_modifier" symbol="gdk_x11_keymap_key_is_modifier">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="keymap" type="GdkKeymap*"/>
-					<parameter name="keycode" type="guint"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="GdkX11Screen" parent="GdkScreen" type-name="GdkX11Screen" get-type="gdk_x11_screen_get_type">
-			<method name="get_current_desktop" symbol="gdk_x11_screen_get_current_desktop">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<method name="get_monitor_output" symbol="gdk_x11_screen_get_monitor_output">
-				<return-type type="XID"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="monitor_num" type="gint"/>
-				</parameters>
-			</method>
-			<method name="get_number_of_desktops" symbol="gdk_x11_screen_get_number_of_desktops">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<method name="get_screen_number" symbol="gdk_x11_screen_get_screen_number">
-				<return-type type="int"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<method name="get_window_manager_name" symbol="gdk_x11_screen_get_window_manager_name">
-				<return-type type="char*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<method name="get_xscreen" symbol="gdk_x11_screen_get_xscreen">
-				<return-type type="Screen*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-				</parameters>
-			</method>
-			<method name="lookup_visual" symbol="gdk_x11_screen_lookup_visual">
-				<return-type type="GdkVisual*"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="xvisualid" type="VisualID"/>
-				</parameters>
-			</method>
-			<method name="supports_net_wm_hint" symbol="gdk_x11_screen_supports_net_wm_hint">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="screen" type="GdkScreen*"/>
-					<parameter name="property" type="GdkAtom"/>
-				</parameters>
-			</method>
-			<signal name="window-manager-changed" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="object" type="GdkX11Screen*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="GdkX11Visual" parent="GdkVisual" type-name="GdkX11Visual" get-type="gdk_x11_visual_get_type">
-			<method name="get_xvisual" symbol="gdk_x11_visual_get_xvisual">
-				<return-type type="Visual*"/>
-				<parameters>
-					<parameter name="visual" type="GdkVisual*"/>
-				</parameters>
-			</method>
-		</object>
-		<object name="GdkX11Window" parent="GdkWindow" type-name="GdkX11Window" get-type="gdk_x11_window_get_type">
-			<method name="foreign_new_for_display" symbol="gdk_x11_window_foreign_new_for_display">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="window" type="Window"/>
-				</parameters>
-			</method>
-			<method name="get_desktop" symbol="gdk_x11_window_get_desktop">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-				</parameters>
-			</method>
-			<method name="get_xid" symbol="gdk_x11_window_get_xid">
-				<return-type type="Window"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-				</parameters>
-			</method>
-			<method name="lookup_for_display" symbol="gdk_x11_window_lookup_for_display">
-				<return-type type="GdkWindow*"/>
-				<parameters>
-					<parameter name="display" type="GdkDisplay*"/>
-					<parameter name="window" type="Window"/>
-				</parameters>
-			</method>
-			<method name="move_to_current_desktop" symbol="gdk_x11_window_move_to_current_desktop">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-				</parameters>
-			</method>
-			<method name="move_to_desktop" symbol="gdk_x11_window_move_to_desktop">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="desktop" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="set_frame_extents" symbol="gdk_x11_window_set_frame_extents">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="left" type="int"/>
-					<parameter name="right" type="int"/>
-					<parameter name="top" type="int"/>
-					<parameter name="bottom" type="int"/>
-				</parameters>
-			</method>
-			<method name="set_frame_sync_enabled" symbol="gdk_x11_window_set_frame_sync_enabled">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="frame_sync_enabled" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_hide_titlebar_when_maximized" symbol="gdk_x11_window_set_hide_titlebar_when_maximized">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="hide_titlebar_when_maximized" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_theme_variant" symbol="gdk_x11_window_set_theme_variant">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="variant" type="char*"/>
-				</parameters>
-			</method>
-			<method name="set_user_time" symbol="gdk_x11_window_set_user_time">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="timestamp" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="set_utf8_property" symbol="gdk_x11_window_set_utf8_property">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="window" type="GdkWindow*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="value" type="gchar*"/>
-				</parameters>
-			</method>
-		</object>
-	</namespace>
-</api>
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
deleted file mode 100644
index 6597f5f2f..000000000
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.metadata
+++ /dev/null
@@ -1,8 +0,0 @@
-Gdk cheader_filename="gdk/gdkx.h" 
-VisualID name="uint32"
-XID name="uint32"
-XImage name="pointer"
-GC name="pointer"
-Display name="pointer"
-gdk_x11_display_broadcast_startup_message ellipsis="1"
-GdkEventTranslator hidden="1"
diff --git a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.namespace b/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.namespace
deleted file mode 100644
index 2617db96f..000000000
--- a/vapi/packages/gdk-x11-3.0/gdk-x11-3.0.namespace
+++ /dev/null
@@ -1 +0,0 @@
-Gdk