package/atk: remove package

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 <[email protected]>
Signed-off-by: Thomas Devoogdt <[email protected]>
Tested-by: Adrian Perez de Castro <[email protected]>
Reviewed-by: Adrian Perez de Castro <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>

diff --git a/Config.in.legacy b/Config.in.legacy
index 7837f5a58836a0ad7807567bbe5461f597245fa8..debe8428a562b337e1794057abb4c45108557cce 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2023.05"
 
+config BR2_PACKAGE_ATK
+       bool "atk removed"
+       select BR2_LEGACY
+       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 92ef7160d0b29fd9eba0e0f203c305c8f1d6850a..420ebaa370b7a2d2b4d2afa24db740011ad5f4a1 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -1555,7 +1555,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/atkmm2_28/Config.in"
        source "package/bayer2rgb-neon/Config.in"

diff --git a/package/atk/Config.in b/package/atk/Config.in
deleted file mode 100644 (file)
index d9371b8..0000000
--- 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 (file)
index d8cd69f..0000000
--- 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 (file)
index 2820fb4..0000000
--- 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 1f370356ea7b1f521098d06ea9cf4540613acbaf..571d7e69adf8ac4b284047592a80b43040ad68d2 100644 (file)
--- a/package/atkmm/Config.in
+++ b/package/atkmm/Config.in
@@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM
        bool "atkmm (latest)"
        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 8afd0586437bf594b417afee1669917ebc006c01..ec63d8ecbcf358a8ea18a1031183fd0fd2962abd 100644 (file)
--- 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/atkmm2_28/Config.in b/package/atkmm2_28/Config.in
index 2340465b20344df44d11f9135a72aa15349d0c8b..e88073b87a3677424a044bd3be4b8d264d4cf008 100644 (file)
--- a/package/atkmm2_28/Config.in
+++ b/package/atkmm2_28/Config.in
@@ -2,10 +2,10 @@ config BR2_PACKAGE_ATKMM2_28
        bool "atkmm (2.28.x)"
        depends on BR2_INSTALL_LIBSTDCPP # glibmm
        depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
-       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_GLIBMM2_66
        select BR2_PACKAGE_LIBSIGC2
 

diff --git a/package/atkmm2_28/atkmm2_28.mk b/package/atkmm2_28/atkmm2_28.mk
index dc57363cf53bb954130ed9370592ec5a49bbc891..b56da61ec089a85c732f0709ce3a937d463b293e 100644 (file)
--- a/package/atkmm2_28/atkmm2_28.mk
+++ b/package/atkmm2_28/atkmm2_28.mk
@@ -11,6 +11,6 @@ ATKMM2_28_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM2_28_VERSION_MA
 ATKMM2_28_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
 ATKMM2_28_LICENSE_FILES = COPYING COPYING.tools
 ATKMM2_28_INSTALL_STAGING = YES
-ATKMM2_28_DEPENDENCIES = atk glibmm2_66 libsigc2 host-pkgconf
+ATKMM2_28_DEPENDENCIES = at-spi2-core glibmm2_66 libsigc2 host-pkgconf
 
 $(eval $(meson-package))

diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index c97c9becd2c1573346dd829ecc60ebdd5f994699..8d0d26f159ff93417197999a4881037086ebcab8 100644 (file)
--- 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 21aed6060517a67e3ee176729988fb6a15734315..af73d8bd0083ab9108f9cda55a03797799686972 100644 (file)
--- 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 c75c37fb63701bc2e73175c183b3300893a4d1bf..f2888b2f518723f91b61fdbc86657f8def9ead9a 100644 (file)
--- 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 859925e8d3afc4e08ac65be7c26c0c187b987af8..608c263e4da509abc18884aa85323b6e3183635a 100644 (file)
--- 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 82ca68d2da25099f944961a047754d1db3d35ba0..34b8d49eb3715906df80e1a5be78a4aa755913bf 100644 (file)
--- 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 b41049b0eeac85932dd1d6a0885be00dc3d67a28..d1840ef112fa4f03950e678d9bd56e510e2aa57d 100644 (file)
--- 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)