glib-2.61.1-external-codegen.patch (5029B)
1 commit a3e5824c91a1b65b658c6a879df22e02e5d5815c
2 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
3 Date: 2019-07-28T22:10:25 GMT
4
5 gdbus-codegen external
6
7 diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build
8 index 930a3b7..d893170 100644
9 --- a/docs/reference/gio/meson.build
10 +++ b/docs/reference/gio/meson.build
11 @@ -164,7 +164,6 @@ if get_option('gtk_doc')
12 'gsettings.xml',
13 'gresource.xml',
14 'gdbus.xml',
15 - 'gdbus-codegen.xml',
16 ],
17 expand_content_files : [
18 'overview.xml',
19 @@ -172,7 +171,6 @@ if get_option('gtk_doc')
20 'migrating-gnome-vfs.xml',
21 'migrating-gconf.xml',
22 'migrating-gdbus.xml',
23 - 'gdbus-codegen.xml',
24 ],
25 html_assets : [
26 'gvfs-overview.png',
27 @@ -192,7 +190,7 @@ endif
28 if get_option('man')
29 manpages = ['gapplication', 'gio-querymodules', 'glib-compile-schemas',
30 'glib-compile-resources', 'gsettings', 'gresource', 'gdbus',
31 - 'gio', 'gdbus-codegen']
32 + 'gio']
33 foreach page : manpages
34 custom_target(page + '-man',
35 input: page + '.xml',
36 diff --git a/gio/meson.build b/gio/meson.build
37 index f0e08b4..d39ff60 100644
38 --- a/gio/meson.build
39 +++ b/gio/meson.build
40 @@ -232,7 +232,7 @@ gdbus_sources = files(
41 )
42
43 # Generate gdbus-codegen
44 -subdir('gdbus-2.0/codegen')
45 +#subdir('gdbus-2.0/codegen')
46
47 # Generate xdp-dbus.{c,h}
48 xdp_dbus_generated = custom_target('xdp-dbus',
49 @@ -241,8 +241,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
50 'org.freedesktop.portal.ProxyResolver.xml',
51 'org.freedesktop.portal.Trash.xml'],
52 output : ['xdp-dbus.h', 'xdp-dbus.c'],
53 - depend_files : gdbus_codegen_built_files,
54 - command : [python, gdbus_codegen,
55 + command : [find_program('gdbus-codegen'),
56 '--interface-prefix', 'org.freedesktop.portal.',
57 '--output-directory', '@OUTDIR@',
58 '--generate-c-code', 'xdp-dbus',
59 @@ -263,8 +262,7 @@ xdp_dbus_generated = custom_target('xdp-dbus',
60 gdbus_daemon_generated = custom_target('gdbus-daemon-generated',
61 input : ['dbus-daemon.xml'],
62 output : ['gdbus-daemon-generated.h', 'gdbus-daemon-generated.c'],
63 - depend_files : gdbus_codegen_built_files,
64 - command : [python, gdbus_codegen,
65 + command : [find_program('gdbus-codegen'),
66 '--interface-prefix', 'org.',
67 '--output-directory', '@OUTDIR@',
68 '--generate-c-code', 'gdbus-daemon-generated',
69 diff --git a/gio/tests/gdbus-object-manager-example/meson.build b/gio/tests/gdbus-object-manager-example/meson.build
70 index 404c377..50cf2d8 100644
71 --- a/gio/tests/gdbus-object-manager-example/meson.build
72 +++ b/gio/tests/gdbus-object-manager-example/meson.build
73 @@ -5,7 +5,7 @@ gdbus_example_objectmanager_generated = custom_target('objectmanager-gen',
74 'objectmanager-gen.c',
75 'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
76 'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml'],
77 - command : [python, gdbus_codegen,
78 + command : [find_program('gdbus-codegen'),
79 '--interface-prefix', 'org.gtk.GDBus.Example.ObjectManager.',
80 '--c-namespace', 'Example',
81 '--c-generate-object-manager',
82 diff --git a/gio/tests/meson.build b/gio/tests/meson.build
83 index a0c0944..9025c41 100644
84 --- a/gio/tests/meson.build
85 +++ b/gio/tests/meson.build
86 @@ -211,8 +211,7 @@ if host_machine.system() != 'windows'
87 input : ['test-codegen.xml'],
88 output : ['gdbus-test-codegen-generated.h',
89 'gdbus-test-codegen-generated.c'],
90 - depend_files : gdbus_codegen_built_files,
91 - command : [python, gdbus_codegen,
92 + command : [find_program('gdbus-codegen'),
93 '--interface-prefix', 'org.project.',
94 '--output-directory', '@OUTDIR@',
95 '--generate-c-code', 'gdbus-test-codegen-generated',
96 @@ -227,8 +226,7 @@ if host_machine.system() != 'windows'
97 custom_target('gdbus-test-codegen-generated-interface-info-h',
98 input : ['test-codegen.xml'],
99 output : ['gdbus-test-codegen-generated-interface-info.h'],
100 - depend_files : gdbus_codegen_built_files,
101 - command : [python, gdbus_codegen,
102 + command : [find_program('gdbus-codegen'),
103 '--interface-info-header',
104 annotate_args,
105 '--output', '@OUTPUT@',
106 @@ -236,8 +234,7 @@ if host_machine.system() != 'windows'
107 custom_target('gdbus-test-codegen-generated-interface-info-c',
108 input : ['test-codegen.xml'],
109 output : ['gdbus-test-codegen-generated-interface-info.c'],
110 - depend_files : gdbus_codegen_built_files,
111 - command : [python, gdbus_codegen,
112 + command : [find_program('gdbus-codegen'),
113 '--interface-info-body',
114 annotate_args,
115 '--output', '@OUTPUT@',