Attachment #240679 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 library
ATKONLY_LIB_DEPENDS_OFF=	libdbus-1.so:devel/dbus
ATKONLY_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-meson.build

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MATKONLY}
PKGMESSAGE=	${.CURDIR}/pkg-message-atkonly
.endif

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





--- meson.build.orig	2022-09-17 13:53:22 UTC
+++ meson.build
@@ -126,7 +126,6 @@ gio_req_version = '>= 2.28.0'
 gir_req_version = '>= 0.6.7'
 libxml_req_version = '>= 2.9.1'
 
-libdbus_dep = dependency('dbus-1', version: libdbus_req_version)
 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)
@@ -173,11 +172,6 @@ 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
-
 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;'))
 
@@ -206,18 +200,7 @@ 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 get_option('docs')
   subdir('doc')




[
{ type: install
  message: <<EOM
Warning!

You have installed this port with the ATKONLY option enabled. Only the ATK
library component is installed.

This could break desktop environments and should only be used by
advanced users, those who know exactly what they are doing.

Please do not file bug reports if you are using this option, and certainly do
not contact upstream regarding the consequences of its usage (there is no
equivalent option in the original software, it exists only in the ports tree).

EOM
}
]




%%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 / +13 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 library
		25	ATKONLY_LIB_DEPENDS_OFF= libdbus-1.so:devel/dbus
		26	ATKONLY_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-meson.build
		27
		28	.include <bsd.port.options.mk>
		29
		30	.if ${PORT_OPTIONS:MATKONLY}
		31	PKGMESSAGE= ${.CURDIR}/pkg-message-atkonly
		32	.endif
		33
23	post-install:	34	post-install:
24	${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd	35	${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd
25		36

Added Link Here

(-)b/accessibility/at-spi2-core/files/extra-patch-meson.build (+41 lines)
1	--- meson.build.orig 2022-09-17 13:53:22 UTC
2	+++ meson.build
3	@@ -126,7 +126,6 @@ gio_req_version = '>= 2.28.0'
4	gir_req_version = '>= 0.6.7'
5	libxml_req_version = '>= 2.9.1'
6
7	-libdbus_dep = dependency('dbus-1', version: libdbus_req_version)
8	glib_dep = dependency('glib-2.0', version: glib_req_version)
9	gobject_dep = dependency('gobject-2.0', version: gobject_req_version)
10	gio_dep = dependency('gio-2.0', version: gio_req_version)
11	@@ -173,11 +172,6 @@ dbus_alignments = [
12	'dbus_int64_t',
13	]
14
15	-foreach a: dbus_alignments
16	- at_spi_conf.set('ALIGNOF_' + a.underscorify().to_upper(),
17	- cc.alignment(a, prefix: '#include <dbus/dbus.h>', dependencies: libdbus_dep))
18	-endforeach
19	-
20	at_spi_conf.set('ALIGNOF_DBIND_POINTER', cc.alignment('dbind_pointer', prefix: 'typedef void *dbind_pointer;'))
21	at_spi_conf.set('ALIGNOF_DBIND_STRUCT', cc.alignment('dbind_struct', prefix: 'typedef struct { char s1; } dbind_struct;'))
22
23	@@ -206,18 +200,7 @@ else
24	p2p_cflags = []
25	endif
26
27	-install_data('at-spi2-atk.desktop',
28	- install_dir: join_paths(get_option('libdir'), 'gnome-settings-daemon-3.0', 'gtk-modules'))
29	-
30	-subdir('xml')
31	-subdir('dbind')
32	-subdir('atspi')
33	-subdir('bus')
34	-subdir('registryd')
35	subdir('atk')
36	-subdir('droute')
37	-subdir('atk-adaptor')
38	-subdir('tests')
39
40	if get_option('docs')
41	subdir('doc')

Added Link Here

(-)b/accessibility/at-spi2-core/pkg-message-atkonly (+18 lines)
1	[
2	{ type: install
3	message: <<EOM
4	Warning!
5
6	You have installed this port with the ATKONLY option enabled. Only the ATK
7	library component is installed.
8
9	This could break desktop environments and should only be used by
10	advanced users, those who know exactly what they are doing.
11
12	Please do not file bug reports if you are using this option, and certainly do
13	not contact upstream regarding the consequences of its usage (there is no
14	equivalent option in the original software, it exists only in the ports tree).
15
16	EOM
17	}
18	]

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