package/at-spi2-core: bump to version 2.48.0
https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_48_0/NEWS - X11 is now optional. - libxml2 is no longer optional. - atk and at-spi2-atk have been merged into at-spi2-core. - atk introspection option added. - Added patch to which avoids requiring libsystemd when configured to use dbus-daemon. - Added check on dlopen. Signed-off-by: Daniel Lang <d.lang@abatec.at> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com> Tested-by: Adrian Perez de Castro <aperez@igalia.com> Reviewed-by: Adrian Perez de Castro <aperez@igalia.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Daniel Lang
Yann E. MORIN
parent
c85f9f4a5e
commit
d1757fdfb0
@ -0,0 +1,93 @@
|
||||
From aeb14ffccaabe65a64e976576d71f30eb2165f43 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Date: Mon, 24 Apr 2023 12:09:50 +0300
|
||||
Subject: [PATCH] meson: Avoid requiring libsystemd when configured to use
|
||||
dbus-daemon
|
||||
|
||||
Checks for dbus-daemon and dbus-broker only when they are chosen
|
||||
with default_bus. This avoids requiring the systemd libraries if
|
||||
one wants the built at-spi2-core to use dbus-daemon, but dbus-worker
|
||||
is somehow available in the $PATH. A typical scenario is cross
|
||||
compilation, where the build host may have a dbus-broker program
|
||||
available, but the target system may not have it (or may not have
|
||||
nor want to use the systemd libraries).
|
||||
|
||||
Upstream: https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/134
|
||||
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
||||
---
|
||||
bus/meson.build | 53 ++++++++++++++++++++++++-------------------------
|
||||
1 file changed, 26 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/bus/meson.build b/bus/meson.build
|
||||
index 22a1bce6..2f3c5621 100644
|
||||
--- a/bus/meson.build
|
||||
+++ b/bus/meson.build
|
||||
@@ -46,39 +46,38 @@ launcher_args = [
|
||||
'-DDATADIR="@0@"'.format(atspi_datadir),
|
||||
]
|
||||
|
||||
-if get_option('dbus_daemon') != 'default'
|
||||
- launcher_args += '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon'))
|
||||
-else
|
||||
- dbus_daemon = find_program('dbus-daemon',
|
||||
- '/sbin/dbus-daemon',
|
||||
- '/usr/sbin/dbus-daemon',
|
||||
- '/libexec/dbus-daemon',
|
||||
- '/usr/libexec/dbus-daemon',
|
||||
- '/usr/lib/dbus-daemon',
|
||||
- '/usr/pkg/bin/dbus-daemon',
|
||||
- required: false)
|
||||
- if dbus_daemon.found()
|
||||
- launcher_args += '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path())
|
||||
- endif
|
||||
-endif
|
||||
-
|
||||
needs_systemd = false
|
||||
-if get_option('dbus_broker') != 'default'
|
||||
- launcher_args += '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker'))
|
||||
- needs_systemd = true
|
||||
+if get_option('default_bus') == 'dbus-daemon'
|
||||
+ if get_option('dbus_daemon') != 'default'
|
||||
+ launcher_args += '-DDBUS_DAEMON="@0@"'.format(get_option('dbus_daemon'))
|
||||
+ else
|
||||
+ dbus_daemon = find_program('dbus-daemon',
|
||||
+ '/sbin/dbus-daemon',
|
||||
+ '/usr/sbin/dbus-daemon',
|
||||
+ '/libexec/dbus-daemon',
|
||||
+ '/usr/libexec/dbus-daemon',
|
||||
+ '/usr/lib/dbus-daemon',
|
||||
+ '/usr/pkg/bin/dbus-daemon',
|
||||
+ required: false)
|
||||
+ if dbus_daemon.found()
|
||||
+ launcher_args += '-DDBUS_DAEMON="@0@"'.format(dbus_daemon.full_path())
|
||||
+ endif
|
||||
+ endif
|
||||
else
|
||||
- dbus_broker = find_program('dbus-broker-launch',
|
||||
- required: false)
|
||||
- if dbus_broker.found()
|
||||
- launcher_args += '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path())
|
||||
+ launcher_args += '-DWANT_DBUS_BROKER'
|
||||
+ if get_option('dbus_broker') != 'default'
|
||||
+ launcher_args += '-DDBUS_BROKER="@0@"'.format(get_option('dbus_broker'))
|
||||
needs_systemd = true
|
||||
+ else
|
||||
+ dbus_broker = find_program('dbus-broker-launch',
|
||||
+ required: false)
|
||||
+ if dbus_broker.found()
|
||||
+ launcher_args += '-DDBUS_BROKER="@0@"'.format(dbus_broker.full_path())
|
||||
+ needs_systemd = true
|
||||
+ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
-if get_option('default_bus') == 'dbus-broker'
|
||||
- launcher_args += '-DWANT_DBUS_BROKER'
|
||||
-endif
|
||||
-
|
||||
if needs_systemd
|
||||
systemd_dep = dependency('libsystemd')
|
||||
else
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
config BR2_PACKAGE_AT_SPI2_CORE
|
||||
bool "at-spi2-core"
|
||||
depends on BR2_PACKAGE_XORG7 # xlib-libxtst
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
|
||||
depends on BR2_USE_MMU # glib2
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_XLIB_LIBXTST
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_XORG7 # optionally for X11
|
||||
help
|
||||
The At-Spi2 Core package is a part of the GNOME
|
||||
Accessibility Project. It provides a Service Provider
|
||||
@ -16,10 +17,6 @@ config BR2_PACKAGE_AT_SPI2_CORE
|
||||
|
||||
https://wiki.gnome.org/Accessibility
|
||||
|
||||
comment "at-spi2-core needs a toolchain w/ wchar, threads"
|
||||
comment "at-spi2-core needs a toolchain w/ dynamic library, wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
comment "at-spi2-core depends on X.org"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# From https://download.gnome.org/sources/at-spi2-core/2.36/at-spi2-core-2.36.0.sha256sum
|
||||
sha256 88da57de0a7e3c60bc341a974a80fdba091612db3547c410d6deab039ca5c05a at-spi2-core-2.36.0.tar.xz
|
||||
# From https://download.gnome.org/sources/at-spi2-core/2.48/at-spi2-core-2.48.0.sha256sum
|
||||
sha256 905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30 at-spi2-core-2.48.0.tar.xz
|
||||
|
||||
# locally calculated
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@ -4,17 +4,31 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AT_SPI2_CORE_VERSION_MAJOR = 2.36
|
||||
AT_SPI2_CORE_VERSION_MAJOR = 2.48
|
||||
AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).0
|
||||
AT_SPI2_CORE_SOURCE = at-spi2-core-$(AT_SPI2_CORE_VERSION).tar.xz
|
||||
AT_SPI2_CORE_SITE = https://download.gnome.org/sources/at-spi2-core/$(AT_SPI2_CORE_VERSION_MAJOR)
|
||||
AT_SPI2_CORE_LICENSE = LGPL-2.1+
|
||||
AT_SPI2_CORE_LICENSE_FILES = COPYING
|
||||
AT_SPI2_CORE_INSTALL_STAGING = YES
|
||||
AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 xlib_libXtst \
|
||||
AT_SPI2_CORE_DEPENDENCIES = host-pkgconf dbus libglib2 libxml2 \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
AT_SPI2_CORE_CONF_OPTS = -Ddbus_daemon=/usr/bin/dbus-daemon
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
AT_SPI2_CORE_CONF_OPTS += -Dx11=enabled
|
||||
AT_SPI2_CORE_DEPENDENCIES += xlib_libXtst
|
||||
else
|
||||
AT_SPI2_CORE_CONF_OPTS += -Dx11=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
|
||||
AT_SPI2_CORE_CONF_OPTS += -Dintrospection=enabled
|
||||
AT_SPI2_CORE_DEPENDENCIES += gobject-introspection
|
||||
else
|
||||
AT_SPI2_CORE_CONF_OPTS += -Dintrospection=disabled
|
||||
endif
|
||||
|
||||
AT_SPI2_CORE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||
|
||||
$(eval $(meson-package))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user