Attachment #240884 for bug #269996

View | Details | Raw Unified | Return to bug 269996 | Differences between
Collapse All | Expand All





LICENSE=	LGPL21

LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
		libxkbcommon.so:x11/libxkbcommon

PORTSCOUT=	limitw:1,even


USE_XORG=	ice sm x11 xi xtst xext
USE_LDCONFIG=	yes

OPTIONS_DEFINE=	ATKONLY
OPTIONS_SUB=	yes
ATKONLY_DESC=	Build only ATK (no atspi or at-spi2-atk, unsupported by upstream)
ATKONLY_LIB_DEPENDS_OFF=	libdbus-1.so:devel/dbus
ATKONLY_MESON_TRUE= atk_only

post-install:
	${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd





diff --git a/meson.build b/meson.build
index c83059fd..d938e093 100644
--- meson.build.orig
+++ meson.build
@@ -127,7 +127,10 @@ gmodule_req_version = '>= 2.0.0'
 gio_req_version = '>= 2.28.0'
 libxml_req_version = '>= 2.9.1'
 
-libdbus_dep = dependency('dbus-1', version: libdbus_req_version)
+if not get_option('atk_only')
+  libdbus_dep = dependency('dbus-1', version: libdbus_req_version)
+endif
+
 glib_dep = dependency('glib-2.0', version: glib_req_version)
 gobject_dep = dependency('gobject-2.0', version: gobject_req_version)
 gio_dep = dependency('gio-2.0', version: gio_req_version)
@@ -166,10 +169,12 @@ dbus_alignments = [
   'dbus_int64_t',
 ]
 
-foreach a: dbus_alignments
-  at_spi_conf.set('ALIGNOF_' + a.underscorify().to_upper(),
-                  cc.alignment(a, prefix: '#include <dbus/dbus.h>', dependencies: libdbus_dep))
-endforeach
+if not get_option('atk_only')
+  foreach a: dbus_alignments
+    at_spi_conf.set('ALIGNOF_' + a.underscorify().to_upper(),
+                    cc.alignment(a, prefix: '#include <dbus/dbus.h>', dependencies: libdbus_dep))
+  endforeach
+endif
 
 at_spi_conf.set('ALIGNOF_DBIND_POINTER', cc.alignment('dbind_pointer', prefix: 'typedef void *dbind_pointer;'))
 at_spi_conf.set('ALIGNOF_DBIND_STRUCT', cc.alignment('dbind_struct', prefix: 'typedef struct { char s1; } dbind_struct;'))
@@ -191,18 +196,21 @@ else
   p2p_cflags = []
 endif
 
-install_data('at-spi2-atk.desktop',
-             install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules'))
-
-subdir('xml')
-subdir('dbind')
-subdir('atspi')
-subdir('bus')
-subdir('registryd')
 subdir('atk')
-subdir('droute')
-subdir('atk-adaptor')
-subdir('tests')
+
+if not get_option('atk_only')
+  install_data('at-spi2-atk.desktop',
+               install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules'))
+
+  subdir('xml')
+  subdir('dbind')
+  subdir('atspi')
+  subdir('bus')
+  subdir('registryd')
+  subdir('droute')
+  subdir('atk-adaptor')
+  subdir('tests')
+endif
 
 if get_option('docs')
   subdir('doc')
diff --git a/meson_options.txt b/meson_options.txt
index 11cde7bc..548cdf7e 100644
--- meson_options.txt.orig
+++ meson_options.txt
@@ -36,3 +36,7 @@ option('disable_p2p',
        description: 'Disable peer-to-peer DBus connections for at-spi2-atk',
        type: 'boolean',
        value: false)
+option('atk_only',
+       description: 'Build only the ATK stub library without atspi or at-spi2-atk (UNSUPPORTED)',
+       type: 'boolean',
+       value: false)




%%NO_ATKONLY%%etc/xdg/Xwayland-session.d/00-at-spi
%%NO_ATKONLY%%etc/xdg/autostart/at-spi-dbus-bus.desktop
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-accessible.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-action.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-application.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-collection.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-component.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-constants.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device-legacy.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device-listener.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device-x11.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-document.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-editabletext.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-enum-types.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-event-listener.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-gmain.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-hyperlink.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-hypertext.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-image.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-matchrule.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-misc.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-object.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-registry.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-relation.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-selection.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-stateset.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-table-cell.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-table.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-text.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-types.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-value.h
%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi.h
%%NO_ATKONLY%%include/at-spi2-atk/2.0/atk-bridge.h
include/atk-1.0/atk/atk-autocleanups.h
include/atk-1.0/atk/atk-enum-types.h
include/atk-1.0/atk/atk.h

include/atk-1.0/atk/atkversion.h
include/atk-1.0/atk/atkwindow.h
lib/girepository-1.0/Atk-1.0.typelib
%%NO_ATKONLY%%lib/girepository-1.0/Atspi-2.0.typelib
%%NO_ATKONLY%%lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
%%NO_ATKONLY%%lib/gtk-2.0/modules/libatk-bridge.so
lib/libatk-1.0.so
lib/libatk-1.0.so.0
lib/libatk-1.0.so.0.24609.1
%%NO_ATKONLY%%lib/libatk-bridge-2.0.so
%%NO_ATKONLY%%lib/libatk-bridge-2.0.so.0
%%NO_ATKONLY%%lib/libatk-bridge-2.0.so.0.0.0
%%NO_ATKONLY%%lib/libatspi.so
%%NO_ATKONLY%%lib/libatspi.so.0
%%NO_ATKONLY%%lib/libatspi.so.0.0.1
%%NO_ATKONLY%%libdata/pkgconfig/atk-bridge-2.0.pc
libdata/pkgconfig/atk.pc
%%NO_ATKONLY%%libdata/pkgconfig/atspi-2.pc
%%NO_ATKONLY%%libexec/at-spi-bus-launcher
%%NO_ATKONLY%%libexec/at-spi2-registryd
%%NO_ATKONLY%%share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
%%NO_ATKONLY%%share/dbus-1/services/org.a11y.Bus.service
%%NO_ATKONLY%%share/defaults/at-spi2/accessibility.conf
share/gir-1.0/Atk-1.0.gir
%%NO_ATKONLY%%share/gir-1.0/Atspi-2.0.gir
share/locale/ab/LC_MESSAGES/at-spi2-core.mo
share/locale/af/LC_MESSAGES/at-spi2-core.mo
share/locale/am/LC_MESSAGES/at-spi2-core.mo

Return to bug 269996

Lines 10-17 WWW= https://gitlab.gnome.org/GNOME/at-spi2-core Link Here

(-)b/accessibility/at-spi2-core/Makefile (-2 / +7 lines)
10		10
11	LICENSE= LGPL21	11	LICENSE= LGPL21
12		12
13	LIB_DEPENDS= libdbus-1.so:devel/dbus \	13	LIB_DEPENDS= libxkbcommon.so:x11/libxkbcommon
14	libxkbcommon.so:x11/libxkbcommon
15		14
16	PORTSCOUT= limitw:1,even	15	PORTSCOUT= limitw:1,even
17		16
Lines 20-25 USE_GNOME= glib20 introspection:build Link Here
20	USE_XORG= ice sm x11 xi xtst xext	19	USE_XORG= ice sm x11 xi xtst xext
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22		21
		22	OPTIONS_DEFINE= ATKONLY
		23	OPTIONS_SUB= yes
		24	ATKONLY_DESC= Build only ATK (no atspi or at-spi2-atk, unsupported by upstream)
		25	ATKONLY_LIB_DEPENDS_OFF= libdbus-1.so:devel/dbus
		26	ATKONLY_MESON_TRUE= atk_only
		27
23	post-install:	28	post-install:
24	${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd	29	${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
25		30

Added Link Here

(-)b/accessibility/at-spi2-core/files/patch-atkonly (+78 lines)
1	diff --git a/meson.build b/meson.build
2	index c83059fd..d938e093 100644
3	--- meson.build.orig
4	+++ meson.build
5	@@ -127,7 +127,10 @@ gmodule_req_version = '>= 2.0.0'
6	gio_req_version = '>= 2.28.0'
7	libxml_req_version = '>= 2.9.1'
8
9	-libdbus_dep = dependency('dbus-1', version: libdbus_req_version)
10	+if not get_option('atk_only')
11	+ libdbus_dep = dependency('dbus-1', version: libdbus_req_version)
12	+endif
13	+
14	glib_dep = dependency('glib-2.0', version: glib_req_version)
15	gobject_dep = dependency('gobject-2.0', version: gobject_req_version)
16	gio_dep = dependency('gio-2.0', version: gio_req_version)
17	@@ -166,10 +169,12 @@ dbus_alignments = [
18	'dbus_int64_t',
19	]
20
21	-foreach a: dbus_alignments
22	- at_spi_conf.set('ALIGNOF_' + a.underscorify().to_upper(),
23	- cc.alignment(a, prefix: '#include <dbus/dbus.h>', dependencies: libdbus_dep))
24	-endforeach
25	+if not get_option('atk_only')
26	+ foreach a: dbus_alignments
27	+ at_spi_conf.set('ALIGNOF_' + a.underscorify().to_upper(),
28	+ cc.alignment(a, prefix: '#include <dbus/dbus.h>', dependencies: libdbus_dep))
29	+ endforeach
30	+endif
31
32	at_spi_conf.set('ALIGNOF_DBIND_POINTER', cc.alignment('dbind_pointer', prefix: 'typedef void *dbind_pointer;'))
33	at_spi_conf.set('ALIGNOF_DBIND_STRUCT', cc.alignment('dbind_struct', prefix: 'typedef struct { char s1; } dbind_struct;'))
34	@@ -191,18 +196,21 @@ else
35	p2p_cflags = []
36	endif
37
38	-install_data('at-spi2-atk.desktop',
39	- install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules'))
40	-
41	-subdir('xml')
42	-subdir('dbind')
43	-subdir('atspi')
44	-subdir('bus')
45	-subdir('registryd')
46	subdir('atk')
47	-subdir('droute')
48	-subdir('atk-adaptor')
49	-subdir('tests')
50	+
51	+if not get_option('atk_only')
52	+ install_data('at-spi2-atk.desktop',
53	+ install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules'))
54	+
55	+ subdir('xml')
56	+ subdir('dbind')
57	+ subdir('atspi')
58	+ subdir('bus')
59	+ subdir('registryd')
60	+ subdir('droute')
61	+ subdir('atk-adaptor')
62	+ subdir('tests')
63	+endif
64
65	if get_option('docs')
66	subdir('doc')
67	diff --git a/meson_options.txt b/meson_options.txt
68	index 11cde7bc..548cdf7e 100644
69	--- meson_options.txt.orig
70	+++ meson_options.txt
71	@@ -36,3 +36,7 @@ option('disable_p2p',
72	description: 'Disable peer-to-peer DBus connections for at-spi2-atk',
73	type: 'boolean',
74	value: false)
75	+option('atk_only',
76	+ description: 'Build only the ATK stub library without atspi or at-spi2-atk (UNSUPPORTED)',
77	+ type: 'boolean',
78	+ value: false)

Lines 1-37 Link Here

(-)b/accessibility/at-spi2-core/pkg-plist (-51 / +51 lines)
1	etc/xdg/Xwayland-session.d/00-at-spi	1	%%NO_ATKONLY%%etc/xdg/Xwayland-session.d/00-at-spi
2	etc/xdg/autostart/at-spi-dbus-bus.desktop	2	%%NO_ATKONLY%%etc/xdg/autostart/at-spi-dbus-bus.desktop
3	include/at-spi-2.0/atspi/atspi-accessible.h	3	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-accessible.h
4	include/at-spi-2.0/atspi/atspi-action.h	4	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-action.h
5	include/at-spi-2.0/atspi/atspi-application.h	5	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-application.h
6	include/at-spi-2.0/atspi/atspi-collection.h	6	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-collection.h
7	include/at-spi-2.0/atspi/atspi-component.h	7	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-component.h
8	include/at-spi-2.0/atspi/atspi-constants.h	8	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-constants.h
9	include/at-spi-2.0/atspi/atspi-device-legacy.h	9	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device-legacy.h
10	include/at-spi-2.0/atspi/atspi-device-listener.h	10	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device-listener.h
11	include/at-spi-2.0/atspi/atspi-device-x11.h	11	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device-x11.h
12	include/at-spi-2.0/atspi/atspi-device.h	12	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-device.h
13	include/at-spi-2.0/atspi/atspi-document.h	13	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-document.h
14	include/at-spi-2.0/atspi/atspi-editabletext.h	14	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-editabletext.h
15	include/at-spi-2.0/atspi/atspi-enum-types.h	15	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-enum-types.h
16	include/at-spi-2.0/atspi/atspi-event-listener.h	16	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-event-listener.h
17	include/at-spi-2.0/atspi/atspi-gmain.h	17	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-gmain.h
18	include/at-spi-2.0/atspi/atspi-hyperlink.h	18	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-hyperlink.h
19	include/at-spi-2.0/atspi/atspi-hypertext.h	19	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-hypertext.h
20	include/at-spi-2.0/atspi/atspi-image.h	20	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-image.h
21	include/at-spi-2.0/atspi/atspi-matchrule.h	21	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-matchrule.h
22	include/at-spi-2.0/atspi/atspi-misc.h	22	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-misc.h
23	include/at-spi-2.0/atspi/atspi-object.h	23	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-object.h
24	include/at-spi-2.0/atspi/atspi-registry.h	24	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-registry.h
25	include/at-spi-2.0/atspi/atspi-relation.h	25	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-relation.h
26	include/at-spi-2.0/atspi/atspi-selection.h	26	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-selection.h
27	include/at-spi-2.0/atspi/atspi-stateset.h	27	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-stateset.h
28	include/at-spi-2.0/atspi/atspi-table-cell.h	28	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-table-cell.h
29	include/at-spi-2.0/atspi/atspi-table.h	29	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-table.h
30	include/at-spi-2.0/atspi/atspi-text.h	30	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-text.h
31	include/at-spi-2.0/atspi/atspi-types.h	31	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-types.h
32	include/at-spi-2.0/atspi/atspi-value.h	32	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi-value.h
33	include/at-spi-2.0/atspi/atspi.h	33	%%NO_ATKONLY%%include/at-spi-2.0/atspi/atspi.h
34	include/at-spi2-atk/2.0/atk-bridge.h	34	%%NO_ATKONLY%%include/at-spi2-atk/2.0/atk-bridge.h
35	include/atk-1.0/atk/atk-autocleanups.h	35	include/atk-1.0/atk/atk-autocleanups.h
36	include/atk-1.0/atk/atk-enum-types.h	36	include/atk-1.0/atk/atk-enum-types.h
37	include/atk-1.0/atk/atk.h	37	include/atk-1.0/atk/atk.h
Lines 68-95 include/atk-1.0/atk/atkvalue.h Link Here
68	include/atk-1.0/atk/atkversion.h	68	include/atk-1.0/atk/atkversion.h
69	include/atk-1.0/atk/atkwindow.h	69	include/atk-1.0/atk/atkwindow.h
70	lib/girepository-1.0/Atk-1.0.typelib	70	lib/girepository-1.0/Atk-1.0.typelib
71	lib/girepository-1.0/Atspi-2.0.typelib	71	%%NO_ATKONLY%%lib/girepository-1.0/Atspi-2.0.typelib
72	lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop	72	%%NO_ATKONLY%%lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
73	lib/gtk-2.0/modules/libatk-bridge.so	73	%%NO_ATKONLY%%lib/gtk-2.0/modules/libatk-bridge.so
74	lib/libatk-1.0.so	74	lib/libatk-1.0.so
75	lib/libatk-1.0.so.0	75	lib/libatk-1.0.so.0
76	lib/libatk-1.0.so.0.24609.1	76	lib/libatk-1.0.so.0.24609.1
77	lib/libatk-bridge-2.0.so	77	%%NO_ATKONLY%%lib/libatk-bridge-2.0.so
78	lib/libatk-bridge-2.0.so.0	78	%%NO_ATKONLY%%lib/libatk-bridge-2.0.so.0
79	lib/libatk-bridge-2.0.so.0.0.0	79	%%NO_ATKONLY%%lib/libatk-bridge-2.0.so.0.0.0
80	lib/libatspi.so	80	%%NO_ATKONLY%%lib/libatspi.so
81	lib/libatspi.so.0	81	%%NO_ATKONLY%%lib/libatspi.so.0
82	lib/libatspi.so.0.0.1	82	%%NO_ATKONLY%%lib/libatspi.so.0.0.1
83	libdata/pkgconfig/atk-bridge-2.0.pc	83	%%NO_ATKONLY%%libdata/pkgconfig/atk-bridge-2.0.pc
84	libdata/pkgconfig/atk.pc	84	libdata/pkgconfig/atk.pc
85	libdata/pkgconfig/atspi-2.pc	85	%%NO_ATKONLY%%libdata/pkgconfig/atspi-2.pc
86	libexec/at-spi-bus-launcher	86	%%NO_ATKONLY%%libexec/at-spi-bus-launcher
87	libexec/at-spi2-registryd	87	%%NO_ATKONLY%%libexec/at-spi2-registryd
88	share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service	88	%%NO_ATKONLY%%share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
89	share/dbus-1/services/org.a11y.Bus.service	89	%%NO_ATKONLY%%share/dbus-1/services/org.a11y.Bus.service
90	share/defaults/at-spi2/accessibility.conf	90	%%NO_ATKONLY%%share/defaults/at-spi2/accessibility.conf
91	share/gir-1.0/Atk-1.0.gir	91	share/gir-1.0/Atk-1.0.gir
92	share/gir-1.0/Atspi-2.0.gir	92	%%NO_ATKONLY%%share/gir-1.0/Atspi-2.0.gir
93	share/locale/ab/LC_MESSAGES/at-spi2-core.mo	93	share/locale/ab/LC_MESSAGES/at-spi2-core.mo
94	share/locale/af/LC_MESSAGES/at-spi2-core.mo	94	share/locale/af/LC_MESSAGES/at-spi2-core.mo
95	share/locale/am/LC_MESSAGES/at-spi2-core.mo	95	share/locale/am/LC_MESSAGES/at-spi2-core.mo