From: Adrian Perez de Castro <aperez@igalia.com>
To: Thomas Devoogdt <thomas@devoogdt.com>
Cc: Daniel Lang <d.lang@abatec.at>,
Thomas Devoogdt <thomas.devoogdt@barco.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH v5 3/5] package/atk: remove package
Date: Mon, 24 Apr 2023 15:13:59 +0300 [thread overview]
Message-ID: <20230424151359.GF3960430@igalia.com> (raw)
In-Reply-To: <20230227105838.358916-3-thomas.devoogdt@barco.com>
[-- Attachment #1.1: Type: text/plain, Size: 9486 bytes --]
On Mon, 27 Feb 2023 11:58:36 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> From: Daniel Lang <d.lang@abatec.at>
>
> atk has been merged into at-spi2-core with version 2.45.1.
>
> https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_45_1/NEWS
> https://gitlab.gnome.org/GNOME/at-spi2-core/-/merge_requests/78
>
> 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>
> ---
> 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
> ---
> Config.in.legacy | 7 +++++++
> package/Config.in | 1 -
> package/atk/Config.in | 14 --------------
> package/atk/atk.hash | 5 -----
> package/atk/atk.mk | 25 -------------------------
> package/atkmm/Config.in | 8 ++++----
> package/atkmm/atkmm.mk | 2 +-
> package/libglade/Config.in | 2 +-
> package/libglade/libglade.mk | 2 +-
> package/libgtk2/Config.in | 2 +-
> package/libgtk2/libgtk2.mk | 2 +-
> package/libgtk3/Config.in | 2 +-
> package/libgtk3/libgtk3.mk | 2 +-
> 13 files changed, 18 insertions(+), 56 deletions(-)
> delete mode 100644 package/atk/Config.in
> delete mode 100644 package/atk/atk.hash
> delete mode 100644 package/atk/atk.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index b303677d3f..2d3b1d41ea 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2023.02"
>
> +config BR2_PACKAGE_ATK
> + bool "atk removed"
> + select BR2_LEGACY
> + select BR2_PACKAGE_AT_SPI2_CORE
> + help
> + atk is now part of at-spi2-core.
> +
> config BR2_PACKAGE_AT_SPI2_ATK
> bool "at-spi2-atk removed"
> select BR2_LEGACY
> diff --git a/package/Config.in b/package/Config.in
> index 42173fa2b1..3891f5abdd 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1553,7 +1553,6 @@ endmenu
> menu "Graphics"
> source "package/assimp/Config.in"
> source "package/at-spi2-core/Config.in"
> - source "package/atk/Config.in"
> source "package/atkmm/Config.in"
> source "package/bayer2rgb-neon/Config.in"
> source "package/bullet/Config.in"
> diff --git a/package/atk/Config.in b/package/atk/Config.in
> deleted file mode 100644
> index d9371b879b..0000000000
> --- a/package/atk/Config.in
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -config BR2_PACKAGE_ATK
> - bool "atk"
> - depends on BR2_USE_WCHAR # glib2
> - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
> - depends on BR2_USE_MMU # glib2
> - select BR2_PACKAGE_LIBGLIB2
> - help
> - The ATK accessibility toolkit, needed to build GTK+-2.x.
> -
> - https://gitlab.gnome.org/GNOME/atk
> -
> -comment "atk needs a toolchain w/ wchar, threads"
> - depends on BR2_USE_MMU
> - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
> diff --git a/package/atk/atk.hash b/package/atk/atk.hash
> deleted file mode 100644
> index d8cd69ff1f..0000000000
> --- a/package/atk/atk.hash
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.38/atk-2.38.0.sha256sum
> -sha256 ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36 atk-2.38.0.tar.xz
> -
> -# Hash for license file
> -sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
> diff --git a/package/atk/atk.mk b/package/atk/atk.mk
> deleted file mode 100644
> index 2820fb486d..0000000000
> --- a/package/atk/atk.mk
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -################################################################################
> -#
> -# atk
> -#
> -################################################################################
> -
> -ATK_VERSION_MAJOR = 2.38
> -ATK_VERSION = $(ATK_VERSION_MAJOR).0
> -ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
> -ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
> -ATK_LICENSE = LGPL-2.0+
> -ATK_LICENSE_FILES = COPYING
> -ATK_INSTALL_STAGING = YES
> -ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES)
> -
> -ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
> -ATK_CONF_OPTS += -Dintrospection=true
> -ATK_DEPENDENCIES += gobject-introspection
> -else
> -ATK_CONF_OPTS += -Dintrospection=false
> -endif
> -
> -ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
> -
> -$(eval $(meson-package))
> diff --git a/package/atkmm/Config.in b/package/atkmm/Config.in
> index aa58f8d593..f6f2ca8fc2 100644
> --- a/package/atkmm/Config.in
> +++ b/package/atkmm/Config.in
> @@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM
> bool "atkmm"
> depends on BR2_INSTALL_LIBSTDCPP # glibmm
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # libsigc
> - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2
> - depends on BR2_USE_MMU # atk/glibmm -> libglib2
> - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2
> - select BR2_PACKAGE_ATK
> + depends on BR2_TOOLCHAIN_HAS_THREADS # at-spi2-core/glibmm -> libglib2
> + depends on BR2_USE_MMU # at-spi2-core/glibmm -> libglib2
> + depends on BR2_USE_WCHAR # at-spi2-core/glibmm -> libglib2
> + select BR2_PACKAGE_AT_SPI2_CORE
> select BR2_PACKAGE_GLIBMM
> select BR2_PACKAGE_LIBSIGC
>
> diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk
> index 7ceb87b047..da763c8386 100644
> --- a/package/atkmm/atkmm.mk
> +++ b/package/atkmm/atkmm.mk
> @@ -11,6 +11,6 @@ ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR)
> ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
> ATKMM_LICENSE_FILES = COPYING COPYING.tools
> ATKMM_INSTALL_STAGING = YES
> -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf
> +ATKMM_DEPENDENCIES = at-spi2-core glibmm libsigc host-pkgconf
>
> $(eval $(meson-package))
> diff --git a/package/libglade/Config.in b/package/libglade/Config.in
> index c97c9becd2..8d0d26f159 100644
> --- a/package/libglade/Config.in
> +++ b/package/libglade/Config.in
> @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBGLADE
> depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
> depends on BR2_USE_MMU # glib2
> select BR2_PACKAGE_LIBGLIB2
> - select BR2_PACKAGE_ATK
> + select BR2_PACKAGE_AT_SPI2_CORE
> select BR2_PACKAGE_LIBXML2
> help
> Libglade allows you to load glade interface files in a program
> diff --git a/package/libglade/libglade.mk b/package/libglade/libglade.mk
> index 21aed60605..af73d8bd00 100644
> --- a/package/libglade/libglade.mk
> +++ b/package/libglade/libglade.mk
> @@ -9,7 +9,7 @@ LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4
> LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
> LIBGLADE_SITE = https://download.gnome.org/sources/libglade/$(LIBGLADE_VERSION_MAJOR)
> LIBGLADE_INSTALL_STAGING = YES
> -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2
> +LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 at-spi2-core libxml2
> LIBGLADE_LICENSE = LGPL-2.0+
> LIBGLADE_LICENSE_FILES = COPYING
>
> diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
> index c75c37fb63..f2888b2f51 100644
> --- a/package/libgtk2/Config.in
> +++ b/package/libgtk2/Config.in
> @@ -7,7 +7,7 @@ config BR2_PACKAGE_LIBGTK2
> depends on BR2_INSTALL_LIBSTDCPP # pango
> depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
> - select BR2_PACKAGE_ATK
> + select BR2_PACKAGE_AT_SPI2_CORE
> select BR2_PACKAGE_CAIRO
> select BR2_PACKAGE_CAIRO_PS
> select BR2_PACKAGE_CAIRO_PDF
> diff --git a/package/libgtk2/libgtk2.mk b/package/libgtk2/libgtk2.mk
> index 859925e8d3..608c263e4d 100644
> --- a/package/libgtk2/libgtk2.mk
> +++ b/package/libgtk2/libgtk2.mk
> @@ -23,7 +23,7 @@ LIBGTK2_CONF_ENV = \
>
> LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
>
> -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk \
> +LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango at-spi2-core \
> gdk-pixbuf $(TARGET_NLS_DEPENDENCIES)
>
> LIBGTK2_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS)
> diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
> index 82ca68d2da..34b8d49eb3 100644
> --- a/package/libgtk3/Config.in
> +++ b/package/libgtk3/Config.in
> @@ -23,7 +23,7 @@ config BR2_PACKAGE_LIBGTK3
> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pango -> harfbuzz
> depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
> BR2_PACKAGE_HAS_LIBGL
> - select BR2_PACKAGE_ATK
> + select BR2_PACKAGE_AT_SPI2_CORE
> select BR2_PACKAGE_CAIRO
> select BR2_PACKAGE_CAIRO_PS
> select BR2_PACKAGE_CAIRO_PDF
> diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
> index 283c129cef..2821c7eb52 100644
> --- a/package/libgtk3/libgtk3.mk
> +++ b/package/libgtk3/libgtk3.mk
> @@ -14,7 +14,7 @@ LIBGTK3_CPE_ID_VENDOR = gnome
> LIBGTK3_CPE_ID_PRODUCT = gtk
> LIBGTK3_INSTALL_STAGING = YES
>
> -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \
> +LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 at-spi2-core libglib2 cairo pango \
> gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES)
>
> ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
> --
> 2.39.2
>
> _______________________________________________
> 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
next prev parent reply other threads:[~2023-04-24 12:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-27 10:58 [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Thomas Devoogdt
2023-02-27 10:58 ` [Buildroot] [PATCH v5 2/5] package/at-spi2-atk: remove package Thomas Devoogdt
2023-04-24 12:13 ` Adrian Perez de Castro
2023-02-27 10:58 ` [Buildroot] [PATCH v5 3/5] package/atk: " Thomas Devoogdt
2023-04-15 15:37 ` Yann E. MORIN
2023-04-21 9:55 ` Adrian Perez de Castro
2023-04-24 12:13 ` Adrian Perez de Castro [this message]
2023-02-27 10:58 ` [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge Thomas Devoogdt
2023-04-24 12:14 ` Adrian Perez de Castro
2023-02-27 10:58 ` [Buildroot] [PATCH v5 5/5] package/libgtk3: fix update-icon-cache on empty directory Thomas Devoogdt
2023-04-24 12:14 ` Adrian Perez de Castro
2023-06-08 20:52 ` Peter Korsgaard
2023-04-24 12:11 ` [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Adrian Perez de Castro
2023-04-25 14:30 ` Adrian Perez de Castro
2023-04-27 14:41 ` Adrian Perez de Castro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230424151359.GF3960430@igalia.com \
--to=aperez@igalia.com \
--cc=buildroot@buildroot.org \
--cc=d.lang@abatec.at \
--cc=thomas.devoogdt@barco.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=thomas@devoogdt.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox