[gtk/private-x11-types] Do not parse all GDK-X11 source files
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/private-x11-types] Do not parse all GDK-X11 source files
- Date: Tue, 7 Apr 2020 17:06:54 +0000 (UTC)
commit 37c3ba264546432fe874a6e60230b17a2fa00c90
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue Apr 7 16:46:12 2020 +0100
Do not parse all GDK-X11 source files
We don't need all of them, only the ones that contain public API. This
allows us to reduce the chance of a stray symbol getting incorrectly
added to the introspection data.
gdk/x11/meson.build | 38 +++++++++++++++++++++++---------------
gtk/meson.build | 2 +-
2 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
index 6db7e695b3..f846450c3b 100644
--- a/gdk/x11/meson.build
+++ b/gdk/x11/meson.build
@@ -1,36 +1,44 @@
+# A list of sources that contain public API; these are the sources that
+# will be introspected for the GdkX11 namespace.
+#
# Note: gdksettings.c gets included from xsettings-client.c, do not add here
-gdk_x11_sources = files([
- 'gdkapplaunchcontext-x11.c',
- 'gdkasync.c',
- 'gdkcairocontext-x11.c',
- 'gdkclipboard-x11.c',
+gdk_x11_public_sources = files([
'gdkcursor-x11.c',
'gdkdevice-xi2.c',
'gdkdevicemanager-x11.c',
'gdkdevicemanager-xi2.c',
'gdkdisplay-x11.c',
- 'gdkdrag-x11.c',
- 'gdkdrop-x11.c',
- 'gdkeventsource.c',
- 'gdkeventtranslator.c',
'gdkglcontext-x11.c',
'gdkkeys-x11.c',
- 'gdkmain-x11.c',
'gdkmonitor-x11.c',
'gdkproperty-x11.c',
'gdkscreen-x11.c',
'gdkselection-x11.c',
- 'gdkselectioninputstream-x11.c',
- 'gdkselectionoutputstream-x11.c',
- 'gdktextlistconverter-x11.c',
'gdkvisual-x11.c',
- 'gdkvulkancontext-x11.c',
'gdksurface-x11.c',
- 'gdkxftdefaults.c',
'gdkxid.c',
'xsettings-client.c',
])
+# All sources
+gdk_x11_sources = gdk_x11_public_sources + [
+ 'gdkapplaunchcontext-x11.c',
+ 'gdkasync.c',
+ 'gdkcairocontext-x11.c',
+ 'gdkclipboard-x11.c',
+ 'gdkdrag-x11.c',
+ 'gdkdrop-x11.c',
+ 'gdkeventsource.c',
+ 'gdkeventtranslator.c',
+ 'gdkmain-x11.c',
+ 'gdkselectioninputstream-x11.c',
+ 'gdkselectionoutputstream-x11.c',
+ 'gdktextlistconverter-x11.c',
+ 'gdkvulkancontext-x11.c',
+ 'gdkxftdefaults.c',
+]
+
+# Public headers; will be installed and introspected
gdk_x11_public_headers = files([
'gdkx-autocleanups.h',
'gdkx11applaunchcontext.h',
diff --git a/gtk/meson.build b/gtk/meson.build
index d35f79630d..c7627af5f0 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1044,7 +1044,7 @@ if build_gir
if x11_enabled
gdk_x11_gir = gnome.generate_gir(libgtk,
- sources: gdk_x11_public_headers + gdk_x11_sources,
+ sources: gdk_x11_public_headers + gdk_x11_public_sources,
namespace: 'GdkX11',
nsversion: gtk_api_version,
identifier_prefix: 'Gdk',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]