* [Buildroot] [PATCH v5 2/5] package/at-spi2-atk: remove package
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 ` 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
` (3 subsequent siblings)
4 siblings, 1 reply; 15+ messages in thread
From: Thomas Devoogdt @ 2023-02-27 10:58 UTC (permalink / raw)
To: buildroot; +Cc: Daniel Lang, Thomas Devoogdt, Thomas Petazzoni
From: Daniel Lang <d.lang@abatec.at>
at-spi2-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>
---
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 +++
DEVELOPERS | 1 -
package/Config.in | 1 -
.../0001-meson-add-tests-option.patch | 43 -------------------
package/at-spi2-atk/Config.in | 22 ----------
package/at-spi2-atk/at-spi2-atk.hash | 5 ---
package/at-spi2-atk/at-spi2-atk.mk | 19 --------
7 files changed, 7 insertions(+), 91 deletions(-)
delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch
delete mode 100644 package/at-spi2-atk/Config.in
delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash
delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 381e1e3a8c..b303677d3f 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2023.02"
+config BR2_PACKAGE_AT_SPI2_ATK
+ bool "at-spi2-atk removed"
+ select BR2_LEGACY
+ select BR2_PACKAGE_AT_SPI2_CORE
+ help
+ at-spi2-atk is now part of at-spi2-core.
+
config BR2_PACKAGE_UCCP420WLAN
bool "uccp420wlan removed"
select BR2_LEGACY
diff --git a/DEVELOPERS b/DEVELOPERS
index 6256576e02..9530c4cfb2 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1612,7 +1612,6 @@ F: support/testing/tests/package/test_avocado.py
F: support/testing/tests/package/test_python_aexpect.py
N: Joseph Kogut <joseph.kogut@gmail.com>
-F: package/at-spi2-atk/
F: package/at-spi2-core/
F: package/clang/
F: package/earlyoom/
diff --git a/package/Config.in b/package/Config.in
index 3ace25c665..42173fa2b1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1552,7 +1552,6 @@ endmenu
menu "Graphics"
source "package/assimp/Config.in"
- source "package/at-spi2-atk/Config.in"
source "package/at-spi2-core/Config.in"
source "package/atk/Config.in"
source "package/atkmm/Config.in"
diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch
deleted file mode 100644
index 3a2aefa090..0000000000
--- a/package/at-spi2-atk/0001-meson-add-tests-option.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sun, 3 May 2020 10:29:36 +0200
-Subject: [PATCH] meson: add tests option
-
-Add tests option to allow the user to build at-spi2-atk without tests,
-it is especially useful as one of the test requires libxml-2.0
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status:
-https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22]
----
- meson.build | 4 +++-
- meson_options.txt | 4 ++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 9fce5d6..61bc93d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop',
-
- subdir('droute')
- subdir('atk-adaptor')
--subdir('tests')
-+if get_option('tests')
-+ subdir('tests')
-+endif
-diff --git a/meson_options.txt b/meson_options.txt
-index 24c9228..a4abdc2 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -2,3 +2,7 @@ option('disable_p2p',
- description: 'Disable peer-to-peer DBus connections',
- type: 'boolean',
- value: false)
-+option('tests',
-+ description: 'Whether to build tests',
-+ type: 'boolean',
-+ value: true)
---
-2.26.2
-
diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in
deleted file mode 100644
index 9a7cfde0af..0000000000
--- a/package/at-spi2-atk/Config.in
+++ /dev/null
@@ -1,22 +0,0 @@
-config BR2_PACKAGE_AT_SPI2_ATK
- bool "at-spi2-atk"
- depends on BR2_PACKAGE_XORG7 # at-spi2-core
- depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
- depends on BR2_USE_MMU # glib2
- depends on BR2_USE_WCHAR # glib2
- select BR2_PACKAGE_ATK
- select BR2_PACKAGE_AT_SPI2_CORE
- select BR2_PACKAGE_LIBGLIB2
- help
- The At-Spi2 Atk package contains a library that bridges
- ATK to At-Spi2 D-Bus service.
-
- https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/
-
-comment "at-spi2-atk needs a toolchain w/ wchar, threads"
- depends on BR2_USE_MMU
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
-comment "at-spi2-atk depends on X.org"
- depends on BR2_USE_MMU
- depends on !BR2_PACKAGE_XORG7
diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash
deleted file mode 100644
index 9c564c32af..0000000000
--- a/package/at-spi2-atk/at-spi2-atk.hash
+++ /dev/null
@@ -1,5 +0,0 @@
-# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum
-sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz
-
-# locally calculated
-sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk
deleted file mode 100644
index 232b577230..0000000000
--- a/package/at-spi2-atk/at-spi2-atk.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-################################################################################
-#
-# at-spi2-atk
-#
-################################################################################
-
-AT_SPI2_ATK_VERSION_MAJOR = 2.34
-AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2
-AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz
-AT_SPI2_ATK_SITE = \
- http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR)
-AT_SPI2_ATK_LICENSE = LGPL-2.1+
-AT_SPI2_ATK_LICENSE_FILES = COPYING
-AT_SPI2_ATK_CPE_ID_VENDOR = gnome
-AT_SPI2_ATK_INSTALL_STAGING = YES
-AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf
-AT_SPI2_ATK_CONF_OPTS = -Dtests=false
-
-$(eval $(meson-package))
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH v5 2/5] package/at-spi2-atk: remove package
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
0 siblings, 0 replies; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-24 12:13 UTC (permalink / raw)
To: buildroot; +Cc: Daniel Lang, Thomas Devoogdt, Thomas Petazzoni
[-- Attachment #1.1: Type: text/plain, Size: 7200 bytes --]
Hi,
On Mon, 27 Feb 2023 11:58:35 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> From: Daniel Lang <d.lang@abatec.at>
>
> at-spi2-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>
> ---
> 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
Tested-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> Config.in.legacy | 7 +++
> DEVELOPERS | 1 -
> package/Config.in | 1 -
> .../0001-meson-add-tests-option.patch | 43 -------------------
> package/at-spi2-atk/Config.in | 22 ----------
> package/at-spi2-atk/at-spi2-atk.hash | 5 ---
> package/at-spi2-atk/at-spi2-atk.mk | 19 --------
> 7 files changed, 7 insertions(+), 91 deletions(-)
> delete mode 100644 package/at-spi2-atk/0001-meson-add-tests-option.patch
> delete mode 100644 package/at-spi2-atk/Config.in
> delete mode 100644 package/at-spi2-atk/at-spi2-atk.hash
> delete mode 100644 package/at-spi2-atk/at-spi2-atk.mk
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 381e1e3a8c..b303677d3f 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,13 @@ endif
>
> comment "Legacy options removed in 2023.02"
>
> +config BR2_PACKAGE_AT_SPI2_ATK
> + bool "at-spi2-atk removed"
> + select BR2_LEGACY
> + select BR2_PACKAGE_AT_SPI2_CORE
> + help
> + at-spi2-atk is now part of at-spi2-core.
> +
> config BR2_PACKAGE_UCCP420WLAN
> bool "uccp420wlan removed"
> select BR2_LEGACY
> diff --git a/DEVELOPERS b/DEVELOPERS
> index 6256576e02..9530c4cfb2 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -1612,7 +1612,6 @@ F: support/testing/tests/package/test_avocado.py
> F: support/testing/tests/package/test_python_aexpect.py
>
> N: Joseph Kogut <joseph.kogut@gmail.com>
> -F: package/at-spi2-atk/
> F: package/at-spi2-core/
> F: package/clang/
> F: package/earlyoom/
> diff --git a/package/Config.in b/package/Config.in
> index 3ace25c665..42173fa2b1 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1552,7 +1552,6 @@ endmenu
>
> menu "Graphics"
> source "package/assimp/Config.in"
> - source "package/at-spi2-atk/Config.in"
> source "package/at-spi2-core/Config.in"
> source "package/atk/Config.in"
> source "package/atkmm/Config.in"
> diff --git a/package/at-spi2-atk/0001-meson-add-tests-option.patch b/package/at-spi2-atk/0001-meson-add-tests-option.patch
> deleted file mode 100644
> index 3a2aefa090..0000000000
> --- a/package/at-spi2-atk/0001-meson-add-tests-option.patch
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -From 466d04a57b32417dbf2d5e818af1b7593af5f802 Mon Sep 17 00:00:00 2001
> -From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -Date: Sun, 3 May 2020 10:29:36 +0200
> -Subject: [PATCH] meson: add tests option
> -
> -Add tests option to allow the user to build at-spi2-atk without tests,
> -it is especially useful as one of the test requires libxml-2.0
> -
> -Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> -[Upstream status:
> -https://gitlab.gnome.org/GNOME/at-spi2-atk/-/merge_requests/22]
> ----
> - meson.build | 4 +++-
> - meson_options.txt | 4 ++++
> - 2 files changed, 7 insertions(+), 1 deletion(-)
> -
> -diff --git a/meson.build b/meson.build
> -index 9fce5d6..61bc93d 100644
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -61,4 +61,6 @@ install_data('at-spi2-atk.desktop',
> -
> - subdir('droute')
> - subdir('atk-adaptor')
> --subdir('tests')
> -+if get_option('tests')
> -+ subdir('tests')
> -+endif
> -diff --git a/meson_options.txt b/meson_options.txt
> -index 24c9228..a4abdc2 100644
> ---- a/meson_options.txt
> -+++ b/meson_options.txt
> -@@ -2,3 +2,7 @@ option('disable_p2p',
> - description: 'Disable peer-to-peer DBus connections',
> - type: 'boolean',
> - value: false)
> -+option('tests',
> -+ description: 'Whether to build tests',
> -+ type: 'boolean',
> -+ value: true)
> ---
> -2.26.2
> -
> diff --git a/package/at-spi2-atk/Config.in b/package/at-spi2-atk/Config.in
> deleted file mode 100644
> index 9a7cfde0af..0000000000
> --- a/package/at-spi2-atk/Config.in
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -config BR2_PACKAGE_AT_SPI2_ATK
> - bool "at-spi2-atk"
> - depends on BR2_PACKAGE_XORG7 # at-spi2-core
> - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
> - depends on BR2_USE_MMU # glib2
> - depends on BR2_USE_WCHAR # glib2
> - select BR2_PACKAGE_ATK
> - select BR2_PACKAGE_AT_SPI2_CORE
> - select BR2_PACKAGE_LIBGLIB2
> - help
> - The At-Spi2 Atk package contains a library that bridges
> - ATK to At-Spi2 D-Bus service.
> -
> - https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/
> -
> -comment "at-spi2-atk needs a toolchain w/ wchar, threads"
> - depends on BR2_USE_MMU
> - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
> -
> -comment "at-spi2-atk depends on X.org"
> - depends on BR2_USE_MMU
> - depends on !BR2_PACKAGE_XORG7
> diff --git a/package/at-spi2-atk/at-spi2-atk.hash b/package/at-spi2-atk/at-spi2-atk.hash
> deleted file mode 100644
> index 9c564c32af..0000000000
> --- a/package/at-spi2-atk/at-spi2-atk.hash
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# From http://ftp.acc.umu.se/pub/gnome/sources/at-spi2-atk/2.34/at-spi2-atk-2.34.2.sha256sum
> -sha256 901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216fa363005e27f4f0 at-spi2-atk-2.34.2.tar.xz
> -
> -# locally calculated
> -sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
> diff --git a/package/at-spi2-atk/at-spi2-atk.mk b/package/at-spi2-atk/at-spi2-atk.mk
> deleted file mode 100644
> index 232b577230..0000000000
> --- a/package/at-spi2-atk/at-spi2-atk.mk
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -################################################################################
> -#
> -# at-spi2-atk
> -#
> -################################################################################
> -
> -AT_SPI2_ATK_VERSION_MAJOR = 2.34
> -AT_SPI2_ATK_VERSION = $(AT_SPI2_ATK_VERSION_MAJOR).2
> -AT_SPI2_ATK_SOURCE = at-spi2-atk-$(AT_SPI2_ATK_VERSION).tar.xz
> -AT_SPI2_ATK_SITE = \
> - http://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/$(AT_SPI2_ATK_VERSION_MAJOR)
> -AT_SPI2_ATK_LICENSE = LGPL-2.1+
> -AT_SPI2_ATK_LICENSE_FILES = COPYING
> -AT_SPI2_ATK_CPE_ID_VENDOR = gnome
> -AT_SPI2_ATK_INSTALL_STAGING = YES
> -AT_SPI2_ATK_DEPENDENCIES = atk at-spi2-core libglib2 host-pkgconf
> -AT_SPI2_ATK_CONF_OPTS = -Dtests=false
> -
> -$(eval $(meson-package))
> --
> 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH v5 3/5] package/atk: remove package
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-02-27 10:58 ` Thomas Devoogdt
2023-04-15 15:37 ` Yann E. MORIN
2023-04-24 12:13 ` Adrian Perez de Castro
2023-02-27 10:58 ` [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge Thomas Devoogdt
` (2 subsequent siblings)
4 siblings, 2 replies; 15+ messages in thread
From: Thomas Devoogdt @ 2023-02-27 10:58 UTC (permalink / raw)
To: buildroot; +Cc: Daniel Lang, Thomas Devoogdt, Thomas Petazzoni
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>
---
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
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH v5 3/5] package/atk: remove package
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
1 sibling, 1 reply; 15+ messages in thread
From: Yann E. MORIN @ 2023-04-15 15:37 UTC (permalink / raw)
To: Thomas Devoogdt
Cc: Adrian Perez de Castro, Daniel Lang, Thomas Devoogdt,
Thomas Petazzoni, buildroot
Thomas, All,
+Adriàn
On 2023-02-27 11:58 +0100, Thomas Devoogdt spake thusly:
> 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>
> ---
> 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 +-
atk is also a dependency for atkmm2_28; I guess it got missed, because
it was only recently added, so no worries: it can probably be fixed when
applying. Which I'll do as soon as Adriàn reviews this series as he
promised! ;-)
Regards,
Yann E. MORIN.
> 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
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v5 3/5] package/atk: remove package
2023-04-15 15:37 ` Yann E. MORIN
@ 2023-04-21 9:55 ` Adrian Perez de Castro
0 siblings, 0 replies; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-21 9:55 UTC (permalink / raw)
To: Yann E. MORIN
Cc: Thomas Devoogdt, Daniel Lang, Thomas Devoogdt, Thomas Petazzoni,
buildroot
[-- Attachment #1.1: Type: text/plain, Size: 11346 bytes --]
Hi, all,
On Sat, 15 Apr 2023 17:37:33 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Thomas, All,
>
> +Adriàn
>
> On 2023-02-27 11:58 +0100, Thomas Devoogdt spake thusly:
> > 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>
> > ---
> > 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 +-
>
> atk is also a dependency for atkmm2_28; I guess it got missed, because
> it was only recently added, so no worries: it can probably be fixed when
> applying. Which I'll do as soon as Adriàn reviews this series as he
> promised! ;-)
I want to test this patch series, because it looks like it will be the way
to go, let's see if I get to it today or next week... first I want to submit
an update to WebKit 2.38.6, which was just released yesterday and includes
important security fixes, and the bump could be backported to the stable
branch(es); then I will get back to trying this and the WebKit 2.40.x update
for the development branch =)
Cheers,
-Adrian
> > 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
>
> --
> .-----------------.--------------------.------------------.--------------------.
> | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
> | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
> | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
> | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
> '------------------------------^-------^------------------^--------------------'
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v5 3/5] package/atk: remove package
2023-02-27 10:58 ` [Buildroot] [PATCH v5 3/5] package/atk: " Thomas Devoogdt
2023-04-15 15:37 ` Yann E. MORIN
@ 2023-04-24 12:13 ` Adrian Perez de Castro
1 sibling, 0 replies; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-24 12:13 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Daniel Lang, Thomas Devoogdt, Thomas Petazzoni, buildroot
[-- 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge
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-02-27 10:58 ` [Buildroot] [PATCH v5 3/5] package/atk: " Thomas Devoogdt
@ 2023-02-27 10:58 ` 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:11 ` [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Adrian Perez de Castro
4 siblings, 1 reply; 15+ messages in thread
From: Thomas Devoogdt @ 2023-02-27 10:58 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Devoogdt, Thomas Petazzoni
The at-spi2-core and at-spi2-atk were merged, and are now built by default,
so this patch is no longer required.
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
v5: added re-enable atk-bridge patch to the package/at-spi2-core: bump to version 2.47.1 group
---
package/libgtk3/0001-disable-atk-bridge.patch | 41 -------------------
1 file changed, 41 deletions(-)
delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch
diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch
deleted file mode 100644
index f3e9bff2ba..0000000000
--- a/package/libgtk3/0001-disable-atk-bridge.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Remove atk-bridge support.
-
-atk-bridge doesn't seem useful for now in Buildroot and requires to
-add two new packages just for it: at-spi2-core and at-spi2-atk.
-
-Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
-
---- a/gtk/a11y/gtkaccessibility.c
-+++ b/gtk/a11y/gtkaccessibility.c
-@@ -37,10 +37,6 @@
- #include <gtk/gtktogglebutton.h>
- #include <gtk/gtkaccessible.h>
-
--#ifdef GDK_WINDOWING_X11
--#include <atk-bridge.h>
--#endif
--
- static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
- guint n_param_values,
- const GValue *param_values,
-@@ -988,9 +984,5 @@ _gtk_accessibility_init (void)
- _gtk_accessibility_override_atk_util ();
- do_window_event_initialization ();
-
--#ifdef GDK_WINDOWING_X11
-- atk_bridge_adaptor_init (NULL, NULL);
--#endif
--
- atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
- }
---- a/meson.build
-+++ b/meson.build
-@@ -564,7 +564,7 @@ if x11_enabled
- xfixes_dep = dependency('xfixes', required: false)
- xcomposite_dep = dependency('xcomposite', required: false)
- fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
-- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
-+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false)
-
- backend_immodules += ['xim']
-
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge
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
0 siblings, 0 replies; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-24 12:14 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Thomas Devoogdt, Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 2621 bytes --]
On Mon, 27 Feb 2023 11:58:37 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> The at-spi2-core and at-spi2-atk were merged, and are now built by default,
> so this patch is no longer required.
>
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Tested-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> v5: added re-enable atk-bridge patch to the package/at-spi2-core: bump to version 2.47.1 group
> ---
> package/libgtk3/0001-disable-atk-bridge.patch | 41 -------------------
> 1 file changed, 41 deletions(-)
> delete mode 100644 package/libgtk3/0001-disable-atk-bridge.patch
>
> diff --git a/package/libgtk3/0001-disable-atk-bridge.patch b/package/libgtk3/0001-disable-atk-bridge.patch
> deleted file mode 100644
> index f3e9bff2ba..0000000000
> --- a/package/libgtk3/0001-disable-atk-bridge.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -Remove atk-bridge support.
> -
> -atk-bridge doesn't seem useful for now in Buildroot and requires to
> -add two new packages just for it: at-spi2-core and at-spi2-atk.
> -
> -Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
> -
> ---- a/gtk/a11y/gtkaccessibility.c
> -+++ b/gtk/a11y/gtkaccessibility.c
> -@@ -37,10 +37,6 @@
> - #include <gtk/gtktogglebutton.h>
> - #include <gtk/gtkaccessible.h>
> -
> --#ifdef GDK_WINDOWING_X11
> --#include <atk-bridge.h>
> --#endif
> --
> - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
> - guint n_param_values,
> - const GValue *param_values,
> -@@ -988,9 +984,5 @@ _gtk_accessibility_init (void)
> - _gtk_accessibility_override_atk_util ();
> - do_window_event_initialization ();
> -
> --#ifdef GDK_WINDOWING_X11
> -- atk_bridge_adaptor_init (NULL, NULL);
> --#endif
> --
> - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
> - }
> ---- a/meson.build
> -+++ b/meson.build
> -@@ -564,7 +564,7 @@ if x11_enabled
> - xfixes_dep = dependency('xfixes', required: false)
> - xcomposite_dep = dependency('xcomposite', required: false)
> - fontconfig_dep = dependency('fontconfig', fallback: ['fontconfig', 'fontconfig_dep'])
> -- atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req)
> -+ atkbridge_dep = dependency('atk-bridge-2.0', version: at_spi2_atk_req, required: false)
> -
> - backend_immodules += ['xim']
> -
> --
> 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* [Buildroot] [PATCH v5 5/5] package/libgtk3: fix update-icon-cache on empty directory
2023-02-27 10:58 [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Thomas Devoogdt
` (2 preceding siblings ...)
2023-02-27 10:58 ` [Buildroot] [PATCH v5 4/5] package/libgtk3: re-enable atk-bridge Thomas Devoogdt
@ 2023-02-27 10:58 ` Thomas Devoogdt
2023-04-24 12:14 ` Adrian Perez de Castro
2023-04-24 12:11 ` [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Adrian Perez de Castro
4 siblings, 1 reply; 15+ messages in thread
From: Thomas Devoogdt @ 2023-02-27 10:58 UTC (permalink / raw)
To: buildroot; +Cc: Thomas Devoogdt, Thomas Petazzoni
If both, hicolor-icon-theme (selected by libgtk3-demo) and
adwaita-icon-theme is not selected, then the /usr/share/icons
folder is empty, causing find to fail.
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
v5:
- Fixed indentation.
- Grouped patches.
---
package/libgtk3/libgtk3.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index 2821c7eb52..191e28dda6 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -146,8 +146,9 @@ endef
# Create icon-theme.cache for each of the icon directories/themes
# It's not strictly necessary but speeds up lookups
define LIBGTK3_UPDATE_ICON_CACHE
- find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
- -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \;
+ [ ! -d $(TARGET_DIR)/usr/share/icons ] || \
+ find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
+ -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \;
endef
LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE
--
2.39.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH v5 5/5] package/libgtk3: fix update-icon-cache on empty directory
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
0 siblings, 1 reply; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-24 12:14 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Thomas Devoogdt, Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 1472 bytes --]
On Mon, 27 Feb 2023 11:58:38 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> If both, hicolor-icon-theme (selected by libgtk3-demo) and
> adwaita-icon-theme is not selected, then the /usr/share/icons
> folder is empty, causing find to fail.
>
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Tested-by: Adrian Perez de Castro <aperez@igalia.com>
> ---
> v5:
> - Fixed indentation.
> - Grouped patches.
> ---
> package/libgtk3/libgtk3.mk | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
> index 2821c7eb52..191e28dda6 100644
> --- a/package/libgtk3/libgtk3.mk
> +++ b/package/libgtk3/libgtk3.mk
> @@ -146,8 +146,9 @@ endef
> # Create icon-theme.cache for each of the icon directories/themes
> # It's not strictly necessary but speeds up lookups
> define LIBGTK3_UPDATE_ICON_CACHE
> - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
> - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \;
> + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \
> + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
> + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \;
> endef
> LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE
>
> --
> 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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH v5 5/5] package/libgtk3: fix update-icon-cache on empty directory
2023-04-24 12:14 ` Adrian Perez de Castro
@ 2023-06-08 20:52 ` Peter Korsgaard
0 siblings, 0 replies; 15+ messages in thread
From: Peter Korsgaard @ 2023-06-08 20:52 UTC (permalink / raw)
To: Adrian Perez de Castro
Cc: Thomas Devoogdt, Thomas Devoogdt, Thomas Petazzoni, buildroot
>>>>> "Adrian" == Adrian Perez de Castro <aperez@igalia.com> writes:
> On Mon, 27 Feb 2023 11:58:38 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
>> If both, hicolor-icon-theme (selected by libgtk3-demo) and
>> adwaita-icon-theme is not selected, then the /usr/share/icons
>> folder is empty, causing find to fail.
>>
>> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
> Tested-by: Adrian Perez de Castro <aperez@igalia.com>
Committed to 2023.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1
2023-02-27 10:58 [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1 Thomas Devoogdt
` (3 preceding siblings ...)
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:11 ` Adrian Perez de Castro
2023-04-25 14:30 ` Adrian Perez de Castro
4 siblings, 1 reply; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-24 12:11 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Daniel Lang, Thomas Devoogdt, Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 5398 bytes --]
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.
> ---
> 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
[-- 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
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1
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
0 siblings, 1 reply; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-25 14:30 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Daniel Lang, Thomas Devoogdt, Thomas Petazzoni, buildroot
[-- 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
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Buildroot] [PATCH v5 1/5] package/at-spi2-core: bump to version 2.47.1
2023-04-25 14:30 ` Adrian Perez de Castro
@ 2023-04-27 14:41 ` Adrian Perez de Castro
0 siblings, 0 replies; 15+ messages in thread
From: Adrian Perez de Castro @ 2023-04-27 14:41 UTC (permalink / raw)
To: Thomas Devoogdt; +Cc: Daniel Lang, Thomas Devoogdt, Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 7072 bytes --]
Hi Thomas,
One more note about this...
On Tue, 25 Apr 2023 17:30:33 +0300 Adrian Perez de Castro <aperez@igalia.com> wrote:
> 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
In typical GNOME fashion, the second version number being odd means that this
was a development release. Even second numbers are the stable ones, so it
would be better to do the version bump to 2.48.0 instead, which has been
available for a month:
https://gitlab.gnome.org/GNOME/at-spi2-core/-/blob/AT_SPI2_CORE_2_48_0/NEWS
Cheers, and thanks again for your effort on this patch set =)
> > > - 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
> _______________________________________________
> 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
^ permalink raw reply [flat|nested] 15+ messages in thread