Re: [Buildroot] [PATCH v7 1/5] package/at-spi2-core: bump to version 2.48.0

[Adrian Perez de Castro <aperez@igalia.com>]

[-- Attachment #1.1: Type: text/plain, Size: 10201 bytes --]

On Fri, 05 May 2023 14:56:15 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
> On Fri, 28 Apr 2023 09:59:16 +0200 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> > From: Daniel Lang <d.lang@abatec.at>
> > 
> > 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>

Thanks for the updated patch series, I hope this gets merged as it has solved
my build issues for WebKitGTK with X11 enabled =)

> > ---
> > v3:
> >  - rebased on https://patchwork.ozlabs.org/project/buildroot/list/?series=336254
> >  - needed to fix the webkitgtk 2.38.5 compilation
> >    (https://patchwork.ozlabs.org/project/buildroot/patch/20230220090923.2155635-2-thomas.devoogdt@barco.com/)
> > v5: rebased + grouped patches
> > v6: rebased + added Adrians patch
> >  - note: 2.48.0 is out, but will first merge this one
> > v7: bumped to 2.48.0 + added dlopen check
> > ---
> >  ...iring-libsystemd-when-configured-to-.patch | 92 +++++++++++++++++++
> >  package/at-spi2-core/Config.in                | 13 +--
> >  package/at-spi2-core/at-spi2-core.hash        |  4 +-
> >  package/at-spi2-core/at-spi2-core.mk          | 18 +++-
> >  4 files changed, 115 insertions(+), 12 deletions(-)
> >  create mode 100644 package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch
> > 
> > diff --git a/package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch b/package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch
> > new file mode 100644
> > index 0000000000..29c3de8d2d
> > --- /dev/null
> > +++ b/package/at-spi2-core/0001-meson-Avoid-requiring-libsystemd-when-configured-to-.patch
> > @@ -0,0 +1,92 @@
> > +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
> > +---
> > + 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
> > +
> > diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in
> > index f56c5b93c4..2a1b21d375 100644
> > --- a/package/at-spi2-core/Config.in
> > +++ b/package/at-spi2-core/Config.in
> > @@ -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
> > diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash
> > index 764e4c3661..9cf80d1cc0 100644
> > --- a/package/at-spi2-core/at-spi2-core.hash
> > +++ b/package/at-spi2-core/at-spi2-core.hash
> > @@ -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
> > diff --git a/package/at-spi2-core/at-spi2-core.mk b/package/at-spi2-core/at-spi2-core.mk
> > index f0b019c0ed..e4489f6f88 100644
> > --- a/package/at-spi2-core/at-spi2-core.mk
> > +++ b/package/at-spi2-core/at-spi2-core.mk
> > @@ -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))
> > -- 
> > 2.34.1
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
> > 
> 
> Cheers,
> —Adrián

Cheers,
—Adrián

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot