Home Explore Help
Register Sign In
PUBLIC_REPOS
/
buildroot
mirror of git://git.buildroot.net/buildroot
2
1
Fork 0
Files
Browse Source

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 <d.lang@abatec.at>
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
Tested-by: Adrian Perez de Castro <aperez@igalia.com>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Daniel Lang 2 years ago
parent
2f43af1b99
commit
2c3ca7bea1
15 changed files with 22 additions and 61 deletions
Split View Show Diff Stats
  1. 6 0
      Config.in.legacy
  2. 0 1
      package/Config.in
  3. 0 14
      package/atk/Config.in
  4. 0 5
      package/atk/atk.hash
  5. 0 25
      package/atk/atk.mk
  6. 4 4
      package/atkmm/Config.in
  7. 1 1
      package/atkmm/atkmm.mk
  8. 4 4
      package/atkmm2_28/Config.in
  9. 1 1
      package/atkmm2_28/atkmm2_28.mk
  10. 1 1
      package/libglade/Config.in
  11. 1 1
      package/libglade/libglade.mk
  12. 1 1
      package/libgtk2/Config.in
  13. 1 1
      package/libgtk2/libgtk2.mk
  14. 1 1
      package/libgtk3/Config.in
  15. 1 1
      package/libgtk3/libgtk3.mk

+ 6 - 0
Config.in.legacy
View File 

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

+ 0 - 1
package/Config.in
View File 

@@ -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"

+ 0 - 14
package/atk/Config.in
View File 

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

+ 0 - 5
package/atk/atk.hash
View File 

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

+ 0 - 25
package/atk/atk.mk
View File 

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

+ 4 - 4
package/atkmm/Config.in
View File 

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

+ 1 - 1
package/atkmm/atkmm.mk
View File 

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

+ 4 - 4
package/atkmm2_28/Config.in
View File 

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

+ 1 - 1
package/atkmm2_28/atkmm2_28.mk
View File 

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

+ 1 - 1
package/libglade/Config.in
View File 

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

+ 1 - 1
package/libglade/libglade.mk
View File 

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

+ 1 - 1
package/libgtk2/Config.in
View File 

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

+ 1 - 1
package/libgtk2/libgtk2.mk
View File 

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

+ 1 - 1
package/libgtk3/Config.in
View File 

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

+ 1 - 1
package/libgtk3/libgtk3.mk
View File 

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