diff mbox series

[v5,2/5] package/at-spi2-atk: remove package

Message ID 20230227105838.358916-2-thomas.devoogdt@barco.com
State Superseded, archived
Headers show
Series [v5,1/5] package/at-spi2-core: bump to version 2.47.1 | expand

Commit Message

Thomas Devoogdt Feb. 27, 2023, 10:58 a.m. UTC 
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

Comments

Adrian Perez de Castro April 24, 2023, 12:13 p.m. UTC | #1 
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
diff mbox series

Patch

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))