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

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

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

Hello again,

On Mon, 24 Apr 2023 15:11:52 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
> Hi all,
> 
> On Mon, 27 Feb 2023 11:58:34 +0100 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_47_1/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.
> > 
> > Signed-off-by: Daniel Lang <d.lang@abatec.at>
> > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
> 
> I tested this patch series and indeed it also solves the WebKitGTK build
> issues causes by atk-bridge being missing. Overall I prefer this approach
> better than patching libgtk3's Meson build system as suggested in another
> patch.
> 
> There is one hurdle, though: I have to make one patch for at-spi2-core
> because I have dbus-broker installed in one of my computers and trying to
> build there result in the build configuration thinking that it needs to
> use libsystemd when the Buildroot configuration has it disabled. I made
> this patch which solved the issue for me, although I am not 100% sure it
> is the best way to go:
> 
>   https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/134
> 
> We may want to include this patch (or a similar one) while upstream does
> not have a solution for this issue.

My patch for at-spi2-core was merged, if you would resubmit the version
bump with it included, I will happily add my Tested-By / Reviewed-By to
the whole series ;-)
 
> > ---
> > 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
> > ---
> >  package/at-spi2-core/Config.in         |  8 ++------
> >  package/at-spi2-core/at-spi2-core.hash |  4 ++--
> >  package/at-spi2-core/at-spi2-core.mk   | 20 +++++++++++++++++---
> >  3 files changed, 21 insertions(+), 11 deletions(-)
> > 
> > diff --git a/package/at-spi2-core/Config.in b/package/at-spi2-core/Config.in
> > index f56c5b93c4..1f6c421777 100644
> > --- a/package/at-spi2-core/Config.in
> > +++ b/package/at-spi2-core/Config.in
> > @@ -1,12 +1,12 @@
> >  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
> >  	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
> > @@ -19,7 +19,3 @@ config BR2_PACKAGE_AT_SPI2_CORE
> >  comment "at-spi2-core needs a toolchain w/ 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
> > diff --git a/package/at-spi2-core/at-spi2-core.hash b/package/at-spi2-core/at-spi2-core.hash
> > index 764e4c3661..4531bf396c 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.47/at-spi2-core-2.47.1.sha256sum
> > +sha256  c6ba7c160434edebf09d2936933569c936f6ec972301766f2bdac5a4d418153c  at-spi2-core-2.47.1.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..e98e779884 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 = $(AT_SPI2_CORE_VERSION_MAJOR).0
> > +AT_SPI2_CORE_VERSION_MAJOR = 2.47
> > +AT_SPI2_CORE_VERSION = $(AT_SPI2_CORE_VERSION_MAJOR).1
> >  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.39.2
> > 
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
> > 
> 
> Cheers,
> —Adrián
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

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