[Buildroot] [PATCH v1 1/3] Revert "xorg-server: not available with musl on ARM"

[Buildroot] [PATCH v1 1/3] Revert "xorg-server: not available with musl on ARM"

[Thomas Devoogdt]

From: Thomas Devoogdt <thomas.devoogdt@gmail.com>

This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc.

Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
---
 package/x11r7/xserver_xorg-server/Config.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 865917c4ec..b933bd0285 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,11 +1,6 @@
-comment "xorg-server needs a glibc or uClibc toolchain"
-	depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL
-
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
 	depends on BR2_USE_MMU # fork()
-	# xserver uses inb/outb on arm, which aren't available with musl
-	depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL)
 	# We need a SHA1 implementation. If either openssl or
 	# libgcrypt are already part of the build, we'll use one of
 	# them, otherwise, use the small libsha1 library.
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge

[Thomas Devoogdt]

The reason why it was not used was that at-spi2-core and at-spi2-atk were not available,
since then, it is, so drop this patch. This will also avoid warnings in webkitgtk.

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
 package/libgtk3/0001-disable-atk-bridge.patch | 41 -------------------
 package/libgtk3/Config.in                     |  2 +
 package/libgtk3/libgtk3.mk                    |  4 +-
 3 files changed, 4 insertions(+), 43 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']
- 
diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
index 82ca68d2da..d921f79226 100644
--- a/package/libgtk3/Config.in
+++ b/package/libgtk3/Config.in
@@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3
 	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
 		BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_ATK
+	select BR2_PACKAGE_AT_SPI2_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..fc2b501cb8 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -14,8 +14,8 @@ LIBGTK3_CPE_ID_VENDOR = gnome
 LIBGTK3_CPE_ID_PRODUCT = gtk
 LIBGTK3_INSTALL_STAGING = YES
 
-LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango \
-	gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES)
+LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk at-spi2-atk at-spi2-core libglib2 \
+	cairo pango gdk-pixbuf libepoxy $(TARGET_NLS_DEPENDENCIES)
 
 ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
 LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrandr xlib_libXrender xlib_libXi
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5

[Thomas Devoogdt]

From: Thomas Devoogdt <thomas.devoogdt@gmail.com>

Bugfix release, with many security fixes, including (but not limited to)
a patch for CVE-2023-23529.

Release notes:

  https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html

Accompanying security advisory:

  https://webkitgtk.org/security/WSA-2023-0002.html

Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4.
Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4,
we do check on >= GCC 8, because we can't check on >= GCC 8.3.

  https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b

Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
---
 package/webkitgtk/Config.in      | 4 ++--
 package/webkitgtk/webkitgtk.hash | 8 ++++----
 package/webkitgtk/webkitgtk.mk   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
index dc5d738dae..976341093e 100644
--- a/package/webkitgtk/Config.in
+++ b/package/webkitgtk/Config.in
@@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 
-comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9"
+comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9"
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on !BR2_BINFMT_FLAT
 	depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
@@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK
 	depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
 	depends on BR2_USE_WCHAR # icu, libsoup
 	depends on BR2_PACKAGE_LIBGTK3
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
index 34fd19d3de..c771297b5a 100644
--- a/package/webkitgtk/webkitgtk.hash
+++ b/package/webkitgtk/webkitgtk.hash
@@ -1,7 +1,7 @@
-# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums
-md5  1c9ca83a0ad7e4ca9e933094572cb7d9  webkitgtk-2.38.4.tar.xz
-sha1  38b47df2be9bfb97d68fce8c7fa2819966a79036  webkitgtk-2.38.4.tar.xz
-sha256  4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36  webkitgtk-2.38.4.tar.xz
+# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums
+md5  de05d314a3ecb5fb3835e4d84f8f466d  webkitgtk-2.38.5.tar.xz
+sha1  1774390c628bb3a524d4ed76f11de4a878078db6  webkitgtk-2.38.5.tar.xz
+sha256  40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7  webkitgtk-2.38.5.tar.xz
 
 # Hashes for license files:
 sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
index a6974db926..3263f7fea0 100644
--- a/package/webkitgtk/webkitgtk.mk
+++ b/package/webkitgtk/webkitgtk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.38.4
+WEBKITGTK_VERSION = 2.38.5
 WEBKITGTK_SITE = https://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5

[Adrian Perez de Castro]

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

Hi Thomas, all,

On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
> 
> Bugfix release, with many security fixes, including (but not limited to)
> a patch for CVE-2023-23529.
> 
> Release notes:
> 
>   https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html

Hehe, I was just about to submit this update myself after smoke-testing
a build. Thanks for sending it :-)

> Accompanying security advisory:
> 
>   https://webkitgtk.org/security/WSA-2023-0002.html
> 
> Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4.
> Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4,
> we do check on >= GCC 8, because we can't check on >= GCC 8.3.
> 
>   https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b
> 
> Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>

Acked-by: Adrian Perez de Castro <aperez@igalia.com>

> ---
>  package/webkitgtk/Config.in      | 4 ++--
>  package/webkitgtk/webkitgtk.hash | 8 ++++----
>  package/webkitgtk/webkitgtk.mk   | 2 +-
>  3 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
> index dc5d738dae..976341093e 100644
> --- a/package/webkitgtk/Config.in
> +++ b/package/webkitgtk/Config.in
> @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
>  	depends on BR2_TOOLCHAIN_HAS_SYNC_4
>  	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
>  
> -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9"
> +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9"
>  	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
>  	depends on !BR2_BINFMT_FLAT
>  	depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
> @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK
>  	depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
>  	depends on BR2_INSTALL_LIBSTDCPP
>  	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
> -	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
>  	depends on BR2_USE_WCHAR # icu, libsoup
>  	depends on BR2_PACKAGE_LIBGTK3
>  	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
> index 34fd19d3de..c771297b5a 100644
> --- a/package/webkitgtk/webkitgtk.hash
> +++ b/package/webkitgtk/webkitgtk.hash
> @@ -1,7 +1,7 @@
> -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums
> -md5  1c9ca83a0ad7e4ca9e933094572cb7d9  webkitgtk-2.38.4.tar.xz
> -sha1  38b47df2be9bfb97d68fce8c7fa2819966a79036  webkitgtk-2.38.4.tar.xz
> -sha256  4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36  webkitgtk-2.38.4.tar.xz
> +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums
> +md5  de05d314a3ecb5fb3835e4d84f8f466d  webkitgtk-2.38.5.tar.xz
> +sha1  1774390c628bb3a524d4ed76f11de4a878078db6  webkitgtk-2.38.5.tar.xz
> +sha256  40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7  webkitgtk-2.38.5.tar.xz
>  
>  # Hashes for license files:
>  sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
> diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
> index a6974db926..3263f7fea0 100644
> --- a/package/webkitgtk/webkitgtk.mk
> +++ b/package/webkitgtk/webkitgtk.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -WEBKITGTK_VERSION = 2.38.4
> +WEBKITGTK_VERSION = 2.38.5
>  WEBKITGTK_SITE = https://www.webkitgtk.org/releases
>  WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
>  WEBKITGTK_INSTALL_STAGING = YES
> -- 
> 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

Re: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5

[Thomas Devoogdt]

Hi,

Compiling webkitgtk takes some time, so I won't check all
architectures, but at least this small report is ok:

$ cat webkitgtk.config
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_OPENGL_GLX=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_LIBGTK3=y
BR2_PACKAGE_WEBKITGTK=y

$ ./utils/test-pkg -c webkitgtk.config -p webkitgtk
                    bootlin-armv5-uclibc [1/6]: OK
                     bootlin-armv7-glibc [2/6]: OK
                   bootlin-armv7m-uclibc [3/6]: SKIPPED
                     bootlin-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: SKIPPED
                            sourcery-arm [6/6]: SKIPPED
6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed

kr,

Thomas Devoogdt

Op ma 20 feb. 2023 om 10:29 schreef Adrian Perez de Castro <aperez@igalia.com>:
>
> Hi Thomas, all,
>
> On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> > From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
> >
> > Bugfix release, with many security fixes, including (but not limited to)
> > a patch for CVE-2023-23529.
> >
> > Release notes:
> >
> >   https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html
>
> Hehe, I was just about to submit this update myself after smoke-testing
> a build. Thanks for sending it :-)
>
> > Accompanying security advisory:
> >
> >   https://webkitgtk.org/security/WSA-2023-0002.html
> >
> > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4.
> > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4,
> > we do check on >= GCC 8, because we can't check on >= GCC 8.3.
> >
> >   https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b
> >
> > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
>
> Acked-by: Adrian Perez de Castro <aperez@igalia.com>
>
> > ---
> >  package/webkitgtk/Config.in      | 4 ++--
> >  package/webkitgtk/webkitgtk.hash | 8 ++++----
> >  package/webkitgtk/webkitgtk.mk   | 2 +-
> >  3 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
> > index dc5d738dae..976341093e 100644
> > --- a/package/webkitgtk/Config.in
> > +++ b/package/webkitgtk/Config.in
> > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> >       depends on BR2_TOOLCHAIN_HAS_SYNC_4
> >       depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
> >
> > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9"
> > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9"
> >       depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> >       depends on !BR2_BINFMT_FLAT
> >       depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
> > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK
> >       depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
> >       depends on BR2_INSTALL_LIBSTDCPP
> >       depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
> > -     depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
> > +     depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
> >       depends on BR2_USE_WCHAR # icu, libsoup
> >       depends on BR2_PACKAGE_LIBGTK3
> >       depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
> > index 34fd19d3de..c771297b5a 100644
> > --- a/package/webkitgtk/webkitgtk.hash
> > +++ b/package/webkitgtk/webkitgtk.hash
> > @@ -1,7 +1,7 @@
> > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums
> > -md5  1c9ca83a0ad7e4ca9e933094572cb7d9  webkitgtk-2.38.4.tar.xz
> > -sha1  38b47df2be9bfb97d68fce8c7fa2819966a79036  webkitgtk-2.38.4.tar.xz
> > -sha256  4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36  webkitgtk-2.38.4.tar.xz
> > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums
> > +md5  de05d314a3ecb5fb3835e4d84f8f466d  webkitgtk-2.38.5.tar.xz
> > +sha1  1774390c628bb3a524d4ed76f11de4a878078db6  webkitgtk-2.38.5.tar.xz
> > +sha256  40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7  webkitgtk-2.38.5.tar.xz
> >
> >  # Hashes for license files:
> >  sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
> > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
> > index a6974db926..3263f7fea0 100644
> > --- a/package/webkitgtk/webkitgtk.mk
> > +++ b/package/webkitgtk/webkitgtk.mk
> > @@ -4,7 +4,7 @@
> >  #
> >  ################################################################################
> >
> > -WEBKITGTK_VERSION = 2.38.4
> > +WEBKITGTK_VERSION = 2.38.5
> >  WEBKITGTK_SITE = https://www.webkitgtk.org/releases
> >  WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
> >  WEBKITGTK_INSTALL_STAGING = YES
> > --
> > 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

Re: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5

[Adrian Perez de Castro]

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

On Mon, 20 Feb 2023 14:01:24 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> Hi,
> 
> Compiling webkitgtk takes some time, so I won't check all
> architectures, but at least this small report is ok:
> 
> $ cat webkitgtk.config
> BR2_PACKAGE_XORG7=y
> BR2_PACKAGE_MESA3D=y
> BR2_PACKAGE_MESA3D_OPENGL_GLX=y
> BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
> BR2_PACKAGE_LIBGTK3=y
> BR2_PACKAGE_WEBKITGTK=y
> 
> $ ./utils/test-pkg -c webkitgtk.config -p webkitgtk
>                     bootlin-armv5-uclibc [1/6]: OK
>                      bootlin-armv7-glibc [2/6]: OK
>                    bootlin-armv7m-uclibc [3/6]: SKIPPED
>                      bootlin-x86-64-musl [4/6]: OK
>                       br-arm-full-static [5/6]: SKIPPED
>                             sourcery-arm [6/6]: SKIPPED
> 6 builds, 3 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed

My ARM64 builds (glibc, musl) completed just fine, too :-)

> kr,
> 
> Thomas Devoogdt
> 
> Op ma 20 feb. 2023 om 10:29 schreef Adrian Perez de Castro <aperez@igalia.com>:
> >
> > Hi Thomas, all,
> >
> > On Mon, 20 Feb 2023 10:09:23 +0100 Thomas Devoogdt <thomas@devoogdt.com> wrote:
> > > From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
> > >
> > > Bugfix release, with many security fixes, including (but not limited to)
> > > a patch for CVE-2023-23529.
> > >
> > > Release notes:
> > >
> > >   https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html
> >
> > Hehe, I was just about to submit this update myself after smoke-testing
> > a build. Thanks for sending it :-)
> >
> > > Accompanying security advisory:
> > >
> > >   https://webkitgtk.org/security/WSA-2023-0002.html
> > >
> > > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4.
> > > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4,
> > > we do check on >= GCC 8, because we can't check on >= GCC 8.3.
> > >
> > >   https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b
> > >
> > > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>
> >
> > Acked-by: Adrian Perez de Castro <aperez@igalia.com>
> >
> > > ---
> > >  package/webkitgtk/Config.in      | 4 ++--
> > >  package/webkitgtk/webkitgtk.hash | 8 ++++----
> > >  package/webkitgtk/webkitgtk.mk   | 2 +-
> > >  3 files changed, 7 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in
> > > index dc5d738dae..976341093e 100644
> > > --- a/package/webkitgtk/Config.in
> > > +++ b/package/webkitgtk/Config.in
> > > @@ -16,7 +16,7 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> > >       depends on BR2_TOOLCHAIN_HAS_SYNC_4
> > >       depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
> > >
> > > -comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 7, host gcc >= 4.9"
> > > +comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 8, host gcc >= 4.9"
> > >       depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> > >       depends on !BR2_BINFMT_FLAT
> > >       depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
> > > @@ -32,7 +32,7 @@ config BR2_PACKAGE_WEBKITGTK
> > >       depends on BR2_HOST_GCC_AT_LEAST_4_9 # icu, host-ruby
> > >       depends on BR2_INSTALL_LIBSTDCPP
> > >       depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup
> > > -     depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7
> > > +     depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
> > >       depends on BR2_USE_WCHAR # icu, libsoup
> > >       depends on BR2_PACKAGE_LIBGTK3
> > >       depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
> > > diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash
> > > index 34fd19d3de..c771297b5a 100644
> > > --- a/package/webkitgtk/webkitgtk.hash
> > > +++ b/package/webkitgtk/webkitgtk.hash
> > > @@ -1,7 +1,7 @@
> > > -# From https://webkitgtk.org/releases/webkitgtk-2.38.4.tar.xz.sums
> > > -md5  1c9ca83a0ad7e4ca9e933094572cb7d9  webkitgtk-2.38.4.tar.xz
> > > -sha1  38b47df2be9bfb97d68fce8c7fa2819966a79036  webkitgtk-2.38.4.tar.xz
> > > -sha256  4f47ea29a2d4d5f15eef3dc9e2d6c6f067e8de863a3f64455e1ccf9693cc1d36  webkitgtk-2.38.4.tar.xz
> > > +# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums
> > > +md5  de05d314a3ecb5fb3835e4d84f8f466d  webkitgtk-2.38.5.tar.xz
> > > +sha1  1774390c628bb3a524d4ed76f11de4a878078db6  webkitgtk-2.38.5.tar.xz
> > > +sha256  40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7  webkitgtk-2.38.5.tar.xz
> > >
> > >  # Hashes for license files:
> > >  sha256  0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4  Source/WebCore/LICENSE-APPLE
> > > diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk
> > > index a6974db926..3263f7fea0 100644
> > > --- a/package/webkitgtk/webkitgtk.mk
> > > +++ b/package/webkitgtk/webkitgtk.mk
> > > @@ -4,7 +4,7 @@
> > >  #
> > >  ################################################################################
> > >
> > > -WEBKITGTK_VERSION = 2.38.4
> > > +WEBKITGTK_VERSION = 2.38.5
> > >  WEBKITGTK_SITE = https://www.webkitgtk.org/releases
> > >  WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
> > >  WEBKITGTK_INSTALL_STAGING = YES
> > > --
> > > 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

Re: [Buildroot] [PATCH v1 1/3] Revert "xorg-server: not available with musl on ARM"

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:

 > From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
 > This reverts commit 9daafbcb75a7ab593ce8a1f21c6149c8437bc0bc.

 > Fixed since https://gitlab.freedesktop.org/xorg/xserver/-/issues/840.

I've added a note that this was included since xserver 1.20.6 and
committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:

 > The reason why it was not used was that at-spi2-core and at-spi2-atk were not available,
 > since then, it is, so drop this patch. This will also avoid warnings in webkitgtk.

 > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
 > ---
 >  package/libgtk3/0001-disable-atk-bridge.patch | 41 -------------------
 >  package/libgtk3/Config.in                     |  2 +
 >  package/libgtk3/libgtk3.mk                    |  4 +-
 >  3 files changed, 4 insertions(+), 43 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']
 > - 

 > diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
 > index 82ca68d2da..d921f79226 100644
 > --- a/package/libgtk3/Config.in
 > +++ b/package/libgtk3/Config.in
 > @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3
 >  	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
 >  		BR2_PACKAGE_HAS_LIBGL
 >  	select BR2_PACKAGE_ATK
 > +	select BR2_PACKAGE_AT_SPI2_ATK
 > +	select BR2_PACKAGE_AT_SPI2_CORE

at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we
would pull that in even for libgtk3 builds with the broadway/wayland
backends, is that sensible?

Maybe it is? Does at-spi2 work under wayland?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 3/3] package/webkitgtk: security bump to version 2.38.5

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:

 > From: Thomas Devoogdt <thomas.devoogdt@gmail.com>
 > Bugfix release, with many security fixes, including (but not limited to)
 > a patch for CVE-2023-23529.

 > Release notes:

 >   https://webkitgtk.org/2023/02/15/webkitgtk2.38.5-released.html

 > Accompanying security advisory:

 >   https://webkitgtk.org/security/WSA-2023-0002.html

 > Also raise the minimal GCC version to 8.3, which was already required since webkitgtk-2.36.4.
 > Similar to commit ec1ff802df9a0f17dd2b734ba536a5e206aa5aa4,
 > we do check on >= GCC 8, because we can't check on >= GCC 8.3.

 >   https://github.com/WebKit/WebKit/commit/f812c5db1ff22bcbe1070ca4ed613085cd36499b

 > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge

[Thomas Devoogdt]

Hi,

I see that X11 support is optional and is automatically detected:
https://github.com/GNOME/at-spi2-core/blob/main/meson_options.txt#L31-L34
So it would be better to append a commit to this one to remove the
Xorg dependency on at-spi2-core.

Kr,

Thomas Devoogdt

Op ma 20 feb. 2023 om 18:22 schreef Peter Korsgaard <peter@korsgaard.com>:
>
> >>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:
>
>  > The reason why it was not used was that at-spi2-core and at-spi2-atk were not available,
>  > since then, it is, so drop this patch. This will also avoid warnings in webkitgtk.
>
>  > Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
>  > ---
>  >  package/libgtk3/0001-disable-atk-bridge.patch | 41 -------------------
>  >  package/libgtk3/Config.in                     |  2 +
>  >  package/libgtk3/libgtk3.mk                    |  4 +-
>  >  3 files changed, 4 insertions(+), 43 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']
>  > -
>
>  > diff --git a/package/libgtk3/Config.in b/package/libgtk3/Config.in
>  > index 82ca68d2da..d921f79226 100644
>  > --- a/package/libgtk3/Config.in
>  > +++ b/package/libgtk3/Config.in
>  > @@ -24,6 +24,8 @@ config BR2_PACKAGE_LIBGTK3
>  >      depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
>  >              BR2_PACKAGE_HAS_LIBGL
>  >      select BR2_PACKAGE_ATK
>  > +    select BR2_PACKAGE_AT_SPI2_ATK
>  > +    select BR2_PACKAGE_AT_SPI2_CORE
>
> at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we
> would pull that in even for libgtk3 builds with the broadway/wayland
> backends, is that sensible?
>
> Maybe it is? Does at-spi2 work under wayland?
>
> --
> Bye, Peter Korsgaard
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Devoogdt <thomas@devoogdt.com> writes:

 > Hi,
 > I see that X11 support is optional and is automatically detected:
 > https://github.com/GNOME/at-spi2-core/blob/main/meson_options.txt#L31-L34
 > So it would be better to append a commit to this one to remove the
 > Xorg dependency on at-spi2-core.

Thanks, care to send a patch for that?

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge

[Thomas Petazzoni via buildroot]

On Mon, 20 Feb 2023 18:22:16 +0100
Peter Korsgaard <peter@korsgaard.com> wrote:

> at-spi2-core depends on xorg7 / xlib-libXtst, so that would mean that we
> would pull that in even for libgtk3 builds with the broadway/wayland
> backends, is that sensible?
> 
> Maybe it is? Does at-spi2 work under wayland?

Please note that we also have a series that removes atk, at-spi2-atk,
and bumps at-spi2-core, which now replaces both atk and at-spi2-atk:

  https://patchwork.ozlabs.org/project/buildroot/list/?series=336254

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge

[Peter Korsgaard]

On 20/02/2023 21.49, Thomas Petazzoni wrote:
>> Maybe it is? Does at-spi2 work under wayland?
> 
> Please note that we also have a series that removes atk, at-spi2-atk,
> and bumps at-spi2-core, which now replaces both atk and at-spi2-atk:
> 
>    https://patchwork.ozlabs.org/project/buildroot/list/?series=336254

Ahh yes, that is probably the way to go.

-- 
Bye, Peter Korsgaard

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 2/3] package/libgtk3: re-enable atk-bridge

[Thomas Devoogdt]

Hi

The reason for this patch was to fix this bug:

```
Package 'atk-bridge-2.0', required by 'gtk+-3.0', not found
Package atk-bridge-2.0 was not found in the pkg-config search path.
Perhaps you should add the directory containing `atk-bridge-2.0.pc'
to the PKG_CONFIG_PATH environment variable
```

Right now, the upstream 2.38.5 is not compiling (or at least not my
branch which is rebased on 2023.02-rc1).
So it will be important to have the proposed patch series from Thomas
Petazzoni merged into the master before 2023.02 lands.
My original patch can be dropped then. Also, it would require Xorg to
be built, even if build for e.g. Wayland.

Unfortunately, I could not apply the patch series myself due to some
weird encoding (UTF-16?).
But if I find out how to do that, then I can double-check.

Kr,

Thomas

```
>>> webkitgtk 2.38.5 Building
PATH="/home/thomas/buildroot/output/host/bin:/home/thomas/buildroot/output/host/sbin:/home/thomas/.local/bin:/home/thomas/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/snap/bin:/home/thomas/.dotnet/tools:/home/thomas/.local/bin"
/usr/bin/cmake --build
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/
[773/5265] Generating
../../WebCore/DerivedSources/CSSProperties.jso...,
../../WebCore/DerivedSources/CSSStyleDeclaration+PropertyNames.idl
1 input keys have identical hash values, examine output carefully...
[995/5265] Building CXX object
Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/API/glib/JSCOptions.cpp.o
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/JavaScriptCore/API/glib/JSCOptions.cpp:
In function ‘GOptionGroup* jsc_options_get_option_group()’:
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/JavaScriptCore/API/glib/JSCOptions.cpp:703:84:
warning: cast from ‘gchar*’ {aka ‘char*’} to ‘GOptionEntry*’ {aka
‘_GOptionEntry*’} increases required alignment of target type
[-Wcast-align]
     g_option_group_add_entries(group,
reinterpret_cast<GOptionEntry*>(entries->data));

             ^
[1910/5265] Building CXX object
Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o
FAILED: Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o
/home/thomas/buildroot/output/host/bin/arm-linux-g++
--sysroot=/home/thomas/buildroot/output/host/arm-buildroot-linux-gnueabi/sysroot
-DBUILDING_GTK__=1 -DBUILDING_PAL -DBUILDING_WITH_CMAKE=1
-DGETTEXT_PACKAGE=\"WebKit2GTK-4.1\" -DHAVE_CONFIG_H=1
-DJSC_GLIB_API_ENABLED -DPAS_BMALLOC=1
-DWEBKITGTK_API_VERSION_STRING=\"4.1\"
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/PAL/DerivedSources
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/crypto
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/system
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCore/Headers
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCore/PrivateHeaders
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCoreGLib/Headers
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/JavaScriptCoreGLib/DerivedSources
-I/home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers
-fdiagnostics-color=always -Wextra -Wall -pipe -Wno-odr
-Wno-stringop-overflow -Wno-nonnull -Wno-array-bounds
-Wno-expansion-to-defined -Wno-noexcept-type -Wno-psabi
-Wno-misleading-indentation -Wno-maybe-uninitialized -Wwrite-strings
-Wundef -Wpointer-arith -Wmissing-format-attribute -Wformat-security
-Wcast-align -Wno-tautological-compare -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0
-fno-strict-aliasing -fno-exceptions -fno-rtti  -DNDEBUG -fPIC
-fvisibility=hidden -std=c++2a -MD -MT
Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o -MF
Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o.d -o
Source/WebCore/PAL/pal/CMakeFiles/PAL.dir/text/TextCodecICU.cpp.o -c
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextCodecICU.cpp
In file included from
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers/wtf/URL.h:31,
                 from
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextEncoding.h:29,
                 from
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/Source/WebCore/PAL/pal/text/TextCodecICU.cpp:30:
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/WTF/Headers/wtf/glib/GRefPtr.h:28:10:
fatal error: glib.h: No such file or directory
 #include <glib.h>
          ^~~~~~~~
compilation terminated.
[1923/5265] Generating ../../inspector-resources.stamp
ninja: build stopped: subcommand failed.
make[1]: *** [package/pkg-generic.mk:293:
/home/thomas/buildroot/output/build/webkitgtk-2.38.5/.stamp_built]
Error 1
make: *** [Makefile:82: _all] Error 2
```

Op ma 20 feb. 2023 om 21:57 schreef Peter Korsgaard <peter@korsgaard.com>:

>
> On 20/02/2023 21.49, Thomas Petazzoni wrote:
> >> Maybe it is? Does at-spi2 work under wayland?
> >
> > Please note that we also have a series that removes atk, at-spi2-atk,
> > and bumps at-spi2-core, which now replaces both atk and at-spi2-atk:
> >
> >    https://patchwork.ozlabs.org/project/buildroot/list/?series=336254
>
> Ahh yes, that is probably the way to go.
>
> --
> Bye, Peter Korsgaard
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH v3 1/4] package/at-spi2-core: bump to version 2.47.1

[Thomas Devoogdt]

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

[Buildroot] [PATCH v3 2/4] package/at-spi2-atk: remove package

[Thomas Devoogdt]

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/)
---
 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 7f69462f2e..0de7e6e6d6 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_KERNEL_HEADERS_6_0
 	bool "kernel headers version 6.0.x are no longer supported"
 	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 6c5238a9b0..fe64b2a8e1 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-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

[Buildroot] [PATCH v3 3/4] package/atk: remove package

[Thomas Devoogdt]

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/)
---
 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 0de7e6e6d6..0bdfc6cf73 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 fe64b2a8e1..64876eb7f1 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1554,7 +1554,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

[Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built

[Thomas Devoogdt]

Similar to:
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs

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/)
---
 package/libgtk3/libgtk3.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index 2821c7eb52..b78578d568 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -145,11 +145,13 @@ endef
 
 # Create icon-theme.cache for each of the icon directories/themes
 # It's not strictly necessary but speeds up lookups
+ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y)
 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 {} \;
 endef
 LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE
+endif
 
 $(eval $(meson-package))
 $(eval $(host-generic-package))
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built

[François Perrad]

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

Le mar. 21 févr. 2023 à 20:29, Thomas Devoogdt <thomas@devoogdt.com> a
écrit :

> Similar to:
> https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs
>
> 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/
> )
> ---
>  package/libgtk3/libgtk3.mk | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
> index 2821c7eb52..b78578d568 100644
> --- a/package/libgtk3/libgtk3.mk
> +++ b/package/libgtk3/libgtk3.mk
> @@ -145,11 +145,13 @@ endef
>
>  # Create icon-theme.cache for each of the icon directories/themes
>  # It's not strictly necessary but speeds up lookups
> +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y)
>

I disagree with this logic.
At this time, icons could installed by 2 packages:
- hicolor-icon-theme which is selected by libgtk3-demo
- adwaita-icon-theme

From my point of view, this finalize hook must be always enabled as
actually,
but it must never fails even when there is no icons.

François



>  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 {} \;
>  endef
>  LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE
> +endif
>
>  $(eval $(meson-package))
>  $(eval $(host-generic-package))
> --
> 2.39.2
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
>

[-- Attachment #1.2: Type: text/html, Size: 3916 bytes --]

[-- Attachment #2: Type: text/plain, Size: 150 bytes --]

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v3 4/4] package/libgtk3: only update-icon-cache when the demos are built

[Thomas Devoogdt]

Hi,

Ok, the proposed solution makes sense. And would be safer anyway. I
adapt the last patch.

Kr,

Thomas

Op do 23 feb. 2023 om 07:58 schreef François Perrad <francois.perrad@gadz.org>:
>
>
>
> Le mar. 21 févr. 2023 à 20:29, Thomas Devoogdt <thomas@devoogdt.com> a écrit :
>>
>> Similar to:
>> https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4358/diffs
>>
>> 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/)
>> ---
>>  package/libgtk3/libgtk3.mk | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
>> index 2821c7eb52..b78578d568 100644
>> --- a/package/libgtk3/libgtk3.mk
>> +++ b/package/libgtk3/libgtk3.mk
>> @@ -145,11 +145,13 @@ endef
>>
>>  # Create icon-theme.cache for each of the icon directories/themes
>>  # It's not strictly necessary but speeds up lookups
>> +ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y)
>
>
> I disagree with this logic.
> At this time, icons could installed by 2 packages:
> - hicolor-icon-theme which is selected by libgtk3-demo
> - adwaita-icon-theme
>
> From my point of view, this finalize hook must be always enabled as actually,
> but it must never fails even when there is no icons.
>
> François
>
>
>>
>>  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 {} \;
>>  endef
>>  LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE
>> +endif
>>
>>  $(eval $(meson-package))
>>  $(eval $(host-generic-package))
>> --
>> 2.39.2
>>
>> _______________________________________________
>> 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

[Buildroot] [PATCH v4 4/4] package/libgtk3: fix update-icon-cache on empty directory

[Thomas Devoogdt]

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>
---
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/)
v4:
 - replace only update-icon-cache when the demos are built to a dir check
---
 package/libgtk3/libgtk3.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk
index 2821c7eb52..e2dc8eabfb 100644
--- a/package/libgtk3/libgtk3.mk
+++ b/package/libgtk3/libgtk3.mk
@@ -146,6 +146,7 @@ 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
+[ ! -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
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v4 4/4] package/libgtk3: fix update-icon-cache on empty directory

[Thomas Petazzoni via buildroot]

Hello Thomas,

On Thu, 23 Feb 2023 13:56:12 +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>

Thanks for this work on gtk!

Could you please always resend complete series, even if only one patch
is changed? Otherwise, it's super confusing. We see just PATCH 4/4 in
version 4, and we wonder if the other patches (1/4, 2/4, 3/4) were lost.

> @@ -146,6 +146,7 @@ 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
> +[ ! -d $(TARGET_DIR)/usr/share/icons ] || \

Indentation is not correct, this line should be indented with one tab.

>  	find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
>  		-exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \;
>  endef

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot