Attachment 240884 Details for Bug 269996 – Proposed patch

[patch] Proposed patch

at-spi2-core.patch (text/plain), 9.04 KB, created by Corey Halpin on 2023-03-15 22:33:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Corey Halpin

Created: 2023-03-15 22:33:33 UTC

Size: 9.04 KB

patch

obsolete

>diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
>index 6aa8898f5e..11b0ad3279 100644
>--- a/accessibility/at-spi2-core/Makefile
>+++ b/accessibility/at-spi2-core/Makefile
>@@ -10,8 +10,7 @@ WWW=		https://gitlab.gnome.org/GNOME/at-spi2-core
> 
> LICENSE=	LGPL21
> 
>-LIB_DEPENDS=	libdbus-1.so:devel/dbus \
>-		libxkbcommon.so:x11/libxkbcommon
>+LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
> 
> PORTSCOUT=	limitw:1,even
> 
>@@ -20,6 +19,12 @@ USE_GNOME=	glib20 introspection:build
> 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/accessibility/at-spi2-core/files/patch-atkonly b/accessibility/at-spi2-core/files/patch-atkonly
>new file mode 100644
>index 0000000000..cd8f6004c0
>--- /dev/null
>+++ b/accessibility/at-spi2-core/files/patch-atkonly
>@@ -0,0 +1,78 @@
>+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)
>diff --git a/accessibility/at-spi2-core/pkg-plist b/accessibility/at-spi2-core/pkg-plist
>index 4fa6ce6e79..194aeb4245 100644
>--- a/accessibility/at-spi2-core/pkg-plist
>+++ b/accessibility/at-spi2-core/pkg-plist
>@@ -1,37 +1,37 @@
>-etc/xdg/Xwayland-session.d/00-at-spi
>-etc/xdg/autostart/at-spi-dbus-bus.desktop
>-include/at-spi-2.0/atspi/atspi-accessible.h
>-include/at-spi-2.0/atspi/atspi-action.h
>-include/at-spi-2.0/atspi/atspi-application.h
>-include/at-spi-2.0/atspi/atspi-collection.h
>-include/at-spi-2.0/atspi/atspi-component.h
>-include/at-spi-2.0/atspi/atspi-constants.h
>-include/at-spi-2.0/atspi/atspi-device-legacy.h
>-include/at-spi-2.0/atspi/atspi-device-listener.h
>-include/at-spi-2.0/atspi/atspi-device-x11.h
>-include/at-spi-2.0/atspi/atspi-device.h
>-include/at-spi-2.0/atspi/atspi-document.h
>-include/at-spi-2.0/atspi/atspi-editabletext.h
>-include/at-spi-2.0/atspi/atspi-enum-types.h
>-include/at-spi-2.0/atspi/atspi-event-listener.h
>-include/at-spi-2.0/atspi/atspi-gmain.h
>-include/at-spi-2.0/atspi/atspi-hyperlink.h
>-include/at-spi-2.0/atspi/atspi-hypertext.h
>-include/at-spi-2.0/atspi/atspi-image.h
>-include/at-spi-2.0/atspi/atspi-matchrule.h
>-include/at-spi-2.0/atspi/atspi-misc.h
>-include/at-spi-2.0/atspi/atspi-object.h
>-include/at-spi-2.0/atspi/atspi-registry.h
>-include/at-spi-2.0/atspi/atspi-relation.h
>-include/at-spi-2.0/atspi/atspi-selection.h
>-include/at-spi-2.0/atspi/atspi-stateset.h
>-include/at-spi-2.0/atspi/atspi-table-cell.h
>-include/at-spi-2.0/atspi/atspi-table.h
>-include/at-spi-2.0/atspi/atspi-text.h
>-include/at-spi-2.0/atspi/atspi-types.h
>-include/at-spi-2.0/atspi/atspi-value.h
>-include/at-spi-2.0/atspi/atspi.h
>-include/at-spi2-atk/2.0/atk-bridge.h
>+%%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
>@@ -68,28 +68,28 @@ include/atk-1.0/atk/atkvalue.h
> include/atk-1.0/atk/atkversion.h
> include/atk-1.0/atk/atkwindow.h
> lib/girepository-1.0/Atk-1.0.typelib
>-lib/girepository-1.0/Atspi-2.0.typelib
>-lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
>-lib/gtk-2.0/modules/libatk-bridge.so
>+%%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
>-lib/libatk-bridge-2.0.so
>-lib/libatk-bridge-2.0.so.0
>-lib/libatk-bridge-2.0.so.0.0.0
>-lib/libatspi.so
>-lib/libatspi.so.0
>-lib/libatspi.so.0.0.1
>-libdata/pkgconfig/atk-bridge-2.0.pc
>+%%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
>-libdata/pkgconfig/atspi-2.pc
>-libexec/at-spi-bus-launcher
>-libexec/at-spi2-registryd
>-share/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
>-share/dbus-1/services/org.a11y.Bus.service
>-share/defaults/at-spi2/accessibility.conf
>+%%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
>-share/gir-1.0/Atspi-2.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

Actions: View | Diff

Attachments on bug 269996: 240624 | 240679 | 240884 | 240885 | 241055