All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 4/4] package/atk: remove package
@ 2023-01-09 12:59 Lang Daniel via buildroot
  2023-01-10  6:21 ` François Perrad
  0 siblings, 1 reply; 4+ messages in thread
From: Lang Daniel via buildroot @ 2023-01-09 12:59 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine, james.knight

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>
---
 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 184bab6097..ac5943519e 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 5c8dcd849f..95db7c627b 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1531,7 +1531,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 3bcb941c9f..76371aadbc 100644
--- a/package/atkmm/atkmm.mk
+++ b/package/atkmm/atkmm.mk
@@ -11,6 +11,6 @@ ATKMM_SITE = http://ftp.gnome.org/pub/gnome/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 e269a07548..4cf2ae4086 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 32fa595f5a..24865fb8ff 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 = http://ftp.gnome.org/pub/GNOME/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 d30e1d9d43..ad4dd74e4d 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 bc8cacd9f5..cb44607b7c 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 f277fce2ed..15190efd96 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -30,7 +30,7 @@ LIBGTK3_MAKE_OPTS = \
 	WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \
 	LIBS=$(TARGET_NLS_LIBS)
 
-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.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH 4/4] package/atk: remove package
  2023-01-09 12:59 [Buildroot] [PATCH 4/4] package/atk: remove package Lang Daniel via buildroot
@ 2023-01-10  6:21 ` François Perrad
  2023-01-10  9:12   ` Lang Daniel via buildroot
  0 siblings, 1 reply; 4+ messages in thread
From: François Perrad @ 2023-01-10  6:21 UTC (permalink / raw)
  To: Lang Daniel; +Cc: Fabrice Fontaine, james.knight, buildroot


[-- Attachment #1.1: Type: text/plain, Size: 9952 bytes --]

Le lun. 9 janv. 2023 à 13:59, Lang Daniel via buildroot <
buildroot@buildroot.org> a écrit :

> 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
>
>
so, the patch package/libgtk3/0003-disable-atk-bridge.patch becomes useless.

François


> Signed-off-by: Daniel Lang <d.lang@abatec.at>
> ---
>  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 184bab6097..ac5943519e 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 5c8dcd849f..95db7c627b 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -1531,7 +1531,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
> <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
> <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 3bcb941c9f..76371aadbc 100644
> --- a/package/atkmm/atkmm.mk
> +++ b/package/atkmm/atkmm.mk
> @@ -11,6 +11,6 @@ ATKMM_SITE =
> http://ftp.gnome.org/pub/gnome/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 e269a07548..4cf2ae4086 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 32fa595f5a..24865fb8ff 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 =
> http://ftp.gnome.org/pub/GNOME/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 d30e1d9d43..ad4dd74e4d 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 bc8cacd9f5..cb44607b7c 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 f277fce2ed..15190efd96 100644
> --- a/package/libgtk3/libgtk3.mk
> +++ b/package/libgtk3/libgtk3.mk
> @@ -30,7 +30,7 @@ LIBGTK3_MAKE_OPTS = \
>
> WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \
>         LIBS=$(TARGET_NLS_LIBS)
>
> -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.25.1
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
>

[-- Attachment #1.2: Type: text/html, Size: 13886 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] 4+ messages in thread

* Re: [Buildroot] [PATCH 4/4] package/atk: remove package
  2023-01-10  6:21 ` François Perrad
@ 2023-01-10  9:12   ` Lang Daniel via buildroot
  2023-01-10 17:08     ` François Perrad
  0 siblings, 1 reply; 4+ messages in thread
From: Lang Daniel via buildroot @ 2023-01-10  9:12 UTC (permalink / raw)
  To: François Perrad; +Cc: Fabrice Fontaine, james.knight, buildroot

Hello François,

> Le lun. 9 janv. 2023 à 13:59, Lang Daniel via buildroot <
> buildroot@buildroot.org> a écrit :
> 
> > 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
> >
> >
> so, the patch package/libgtk3/0003-disable-atk-bridge.patch becomes useless.

It didn't want to alter the behavior of libgtk3, but you are right, the argument for having
that patch is gone.

I can send a second version and also remove the patch, if you want.

> François

Regards
Daniel

> > Signed-off-by: Daniel Lang <d.lang@abatec.at>
> > ---
> >  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 184bab6097..ac5943519e 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 5c8dcd849f..95db7c627b 100644
> > --- a/package/Config.in
> > +++ b/package/Config.in
> > @@ -1531,7 +1531,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
> > <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
> > <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 3bcb941c9f..76371aadbc 100644
> > --- a/package/atkmm/atkmm.mk
> > +++ b/package/atkmm/atkmm.mk
> > @@ -11,6 +11,6 @@ ATKMM_SITE =
> > http://ftp.gnome.org/pub/gnome/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 e269a07548..4cf2ae4086 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 32fa595f5a..24865fb8ff 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 =
> > http://ftp.gnome.org/pub/GNOME/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 d30e1d9d43..ad4dd74e4d 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 bc8cacd9f5..cb44607b7c 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 f277fce2ed..15190efd96 100644
> > --- a/package/libgtk3/libgtk3.mk
> > +++ b/package/libgtk3/libgtk3.mk
> > @@ -30,7 +30,7 @@ LIBGTK3_MAKE_OPTS = \
> >
> > WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \
> >         LIBS=$(TARGET_NLS_LIBS)
> >
> > -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.25.1
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
> >
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [Buildroot] [PATCH 4/4] package/atk: remove package
  2023-01-10  9:12   ` Lang Daniel via buildroot
@ 2023-01-10 17:08     ` François Perrad
  0 siblings, 0 replies; 4+ messages in thread
From: François Perrad @ 2023-01-10 17:08 UTC (permalink / raw)
  To: Lang Daniel; +Cc: Fabrice Fontaine, james.knight, buildroot


[-- Attachment #1.1: Type: text/plain, Size: 11370 bytes --]

Le mar. 10 janv. 2023 à 10:13, Lang Daniel <d.lang@abatec.at> a écrit :

> Hello François,
>
> > Le lun. 9 janv. 2023 à 13:59, Lang Daniel via buildroot <
> > buildroot@buildroot.org> a écrit :
> >
> > > 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
> > >
> > >
> > so, the patch package/libgtk3/0003-disable-atk-bridge.patch becomes
> useless.
>
> It didn't want to alter the behavior of libgtk3, but you are right, the
> argument for having
> that patch is gone.
>
> I can send a second version and also remove the patch, if you want.
>

yes, please.


> > François
>
> Regards
> Daniel
>
> > > Signed-off-by: Daniel Lang <d.lang@abatec.at>
> > > ---
> > >  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 184bab6097..ac5943519e 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 5c8dcd849f..95db7c627b 100644
> > > --- a/package/Config.in
> > > +++ b/package/Config.in
> > > @@ -1531,7 +1531,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
> > > <
> 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
> > > <
> 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 3bcb941c9f..76371aadbc 100644
> > > --- a/package/atkmm/atkmm.mk
> > > +++ b/package/atkmm/atkmm.mk
> > > @@ -11,6 +11,6 @@ ATKMM_SITE =
> > > http://ftp.gnome.org/pub/gnome/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 e269a07548..4cf2ae4086 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 32fa595f5a..24865fb8ff 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 =
> > >
> http://ftp.gnome.org/pub/GNOME/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 d30e1d9d43..ad4dd74e4d 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 bc8cacd9f5..cb44607b7c 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 f277fce2ed..15190efd96 100644
> > > --- a/package/libgtk3/libgtk3.mk
> > > +++ b/package/libgtk3/libgtk3.mk
> > > @@ -30,7 +30,7 @@ LIBGTK3_MAKE_OPTS = \
> > >
> > > WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols \
> > >         LIBS=$(TARGET_NLS_LIBS)
> > >
> > > -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.25.1
> > > _______________________________________________
> > > buildroot mailing list
> > > buildroot@buildroot.org
> > > https://lists.buildroot.org/mailman/listinfo/buildroot
> > >

[-- Attachment #1.2: Type: text/html, Size: 17326 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] 4+ messages in thread

end of thread, other threads:[~2023-01-10 17:08 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-09 12:59 [Buildroot] [PATCH 4/4] package/atk: remove package Lang Daniel via buildroot
2023-01-10  6:21 ` François Perrad
2023-01-10  9:12   ` Lang Daniel via buildroot
2023-01-10 17:08     ` François Perrad

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.