Thanks, applied as 7dc817029af60516861adbd6074f8dd79f6b8354. Michael
[sent from post-receive hook] On Sat, 15 Jun 2024 16:58:54 +0200, Roland Hieber <r...@pengutronix.de> wrote: > I cannot find any official announcement on this, but it seems that atk > was merged into the at-spi2-core tree. At least the atk repository [1] > has been archived, there have been no new releases since 2022, but there > has been further development on the atk/ subdir in the at-spi2-core > repository [2], to which the ATK docs [3] now link too. > > [1]: https://git.gnome.org/atk > [2]: https://gitlab.gnome.org/GNOME/at-spi2-core/ > [3]: https://gnome.pages.gitlab.gnome.org/at-spi2-core/atk/ > > Rename the atk recipe to at-spi2-core, and build libatk as part of it. > The 'atk_only' meson option carries a big "(UNSUPPORTED)", so build > everything and only install the two new libs if needed, since they are > each about 1 MiB big even after stripping the debug symbols. > > Update the license info; COPYING was update from a LGPL-2.0 to a > LGPL-2.1 license text, and atspi/atspi-gmain.c carries both > LGPL-2.1-or-later as well as "Academic Free License version 2.1" > license statements. > > Signed-off-by: Roland Hieber <r...@pengutronix.de> > Message-Id: <20240613100744.1899176-2-...@pengutronix.de> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git > a/patches/at-spi2-core-2.52.0/0001-meson-don-t-require-libxml-if-building-with-atk_only.patch > > b/patches/at-spi2-core-2.52.0/0001-meson-don-t-require-libxml-if-building-with-atk_only.patch > new file mode 100644 > index 000000000000..a1db254fed7b > --- /dev/null > +++ > b/patches/at-spi2-core-2.52.0/0001-meson-don-t-require-libxml-if-building-with-atk_only.patch > @@ -0,0 +1,23 @@ > +From: Roland Hieber <r...@pengutronix.de> > +Date: Fri, 24 May 2024 11:35:30 +0200 > +Subject: [PATCH] meson: don't require libxml if building with atk_only > + > +libxml is only used for the at-spi2-atk tests, which are not built with > +atk_only=true. > +--- > + meson.build | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/meson.build b/meson.build > +index 4943b25ea926..57b07c2702fa 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -146,7 +146,7 @@ if not get_option('atk_only') > + endif > + endif > + gmodule_dep = dependency('gmodule-2.0', version: gmodule_req_version) > +-libxml_dep = dependency('libxml-2.0', version: libxml_req_version) > ++libxml_dep = dependency('libxml-2.0', version: libxml_req_version, > required: not get_option('atk_only')) > + > + x11_deps = [] > + x11_dep = dependency('x11', required: get_option('x11')) > diff --git a/patches/at-spi2-core-2.52.0/series > b/patches/at-spi2-core-2.52.0/series > new file mode 100644 > index 000000000000..4ea08207b4c1 > --- /dev/null > +++ b/patches/at-spi2-core-2.52.0/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-meson-don-t-require-libxml-if-building-with-atk_only.patch > +# 94469cbd978a0483e3d47d59eccae10e - git-ptx-patches magic > diff --git a/rules/atk.in b/rules/at-spi2-core.in > similarity index 72% > rename from rules/atk.in > rename to rules/at-spi2-core.in > index 3ddd3c4fffe6..062e79e58125 100644 > --- a/rules/atk.in > +++ b/rules/at-spi2-core.in > @@ -1,11 +1,12 @@ > ## SECTION=multimedia_gtk > > -config ATK > +config AT_SPI2_CORE > tristate > - prompt "atk" > + prompt "at-spi2-core" > select HOST_MESON > + select DBUS > select GLIB > - select GOBJECT_INTROSPECTION if ATK_INTROSPECTION > + select GOBJECT_INTROSPECTION if AT_SPI2_CORE_INTROSPECTION > help > ATK is a toolkit providing accessibility interfaces > for applications or other toolkits. By implementing > @@ -14,9 +15,9 @@ config ATK > magnifiers, and other alternative input devices. > ATK is part of the GNOME project. > > -if ATK > +if AT_SPI2_CORE > > -config ATK_INTROSPECTION > +config AT_SPI2_CORE_INTROSPECTION > bool > default GOBJECT_INTROSPECTION_HELPER > > diff --git a/rules/at-spi2-core.make b/rules/at-spi2-core.make > new file mode 100644 > index 000000000000..1d912c918c16 > --- /dev/null > +++ b/rules/at-spi2-core.make > @@ -0,0 +1,80 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2003-2006 Robert Schwebel <r.schwe...@pengutronix.de> > +# Pengutronix <i...@pengutronix.de>, Germany > +# 2009 by Marc Kleine-Budde <m...@pengutronix.de> > +# 2024 Roland Hieber, Pengutronix > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_AT_SPI2_CORE) += at-spi2-core > + > +# > +# Paths and names > +# > +AT_SPI2_CORE_VERSION := 2.52.0 > +AT_SPI2_CORE_MD5 := e6591545b2bf204fe9a58f777bd0b78a > +AT_SPI2_CORE := at-spi2-core-$(AT_SPI2_CORE_VERSION) > +AT_SPI2_CORE_SUFFIX := tar.xz > +AT_SPI2_CORE_URL := $(call ptx/mirror, GNOME, at-spi2-core/$(basename > $(AT_SPI2_CORE_VERSION))/$(AT_SPI2_CORE).$(AT_SPI2_CORE_SUFFIX)) > +AT_SPI2_CORE_SOURCE := $(SRCDIR)/$(AT_SPI2_CORE).$(AT_SPI2_CORE_SUFFIX) > +AT_SPI2_CORE_DIR := $(BUILDDIR)/$(AT_SPI2_CORE) > +AT_SPI2_CORE_LICENSE := LGPL-2.0-or-later AND LGPL-2.1-or-later AND AFL-2.1 > +AT_SPI2_CORE_LICENSE_FILES := \ > + > file://atk/atkaction.c;startline=1;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 > \ > + > file://atspi/atspi-gmain.c;startline=4;endline=21;md5=5a40bca956865414952184669ef3985c > \ > + file://COPYING;md5=4fbd65380cdd255951079008b364516c > + > +# > ---------------------------------------------------------------------------- > +# Prepare > +# > ---------------------------------------------------------------------------- > + > +# > +# meson > +# > +AT_SPI2_CORE_CONF_TOOL := meson > +AT_SPI2_CORE_CONF_OPT := \ > + $(CROSS_MESON_USR) \ > + -Datk_only=true \ > + -Ddbus_broker=default \ > + -Ddbus_daemon=default \ > + -Ddbus_services_dir=default \ > + -Ddefault_bus=dbus-daemon \ > + -Ddisable_p2p=false \ > + -Ddocs=false \ > + -Dgtk2_atk_adaptor=false \ > + -Dintrospection=$(call ptx/endis, PTXCONF_AT_SPI2_CORE_INTROSPECTION)d \ > + -Dsystemd_user_dir=default \ > + -Duse_systemd=false \ > + -Dx11=disabled > + > +# > ---------------------------------------------------------------------------- > +# Target-Install > +# > ---------------------------------------------------------------------------- > + > +$(STATEDIR)/at-spi2-core.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, at-spi2-core) > + @$(call install_fixup, at-spi2-core,PRIORITY,optional) > + @$(call install_fixup, at-spi2-core,SECTION,base) > + @$(call install_fixup, at-spi2-core,AUTHOR,"Robert Schwebel > <r.schwe...@pengutronix.de>") > + @$(call install_fixup, at-spi2-core,DESCRIPTION,missing) > + > + @$(call install_lib, at-spi2-core, 0, 0, 0644, libatk-1.0) > + > +ifdef PTXCONF_AT_SPI2_CORE_INTROSPECTION > + @$(call install_copy, at-spi2-core, 0, 0, 0644, -, \ > + /usr/lib/girepository-1.0/Atk-1.0.typelib) > +endif > + > + @$(call install_finish, at-spi2-core) > + > + @$(call touch) > + > +# vim: syntax=make > diff --git a/rules/atk.make b/rules/atk.make > deleted file mode 100644 > index 1183faf951f3..000000000000 > --- a/rules/atk.make > +++ /dev/null > @@ -1,67 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2003-2006 Robert Schwebel <r.schwe...@pengutronix.de> > -# Pengutronix <i...@pengutronix.de>, Germany > -# 2009 by Marc Kleine-Budde <m...@pengutronix.de> > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_ATK) += atk > - > -# > -# Paths and names > -# > -ATK_VERSION := 2.38.0 > -ATK_MD5 := 4dcea15cbf166706c166fc4fee05e3f8 > -ATK := atk-$(ATK_VERSION) > -ATK_SUFFIX := tar.xz > -ATK_URL := $(call ptx/mirror, GNOME, atk/$(basename > $(ATK_VERSION))/$(ATK).$(ATK_SUFFIX)) > -ATK_SOURCE := $(SRCDIR)/$(ATK).$(ATK_SUFFIX) > -ATK_DIR := $(BUILDDIR)/$(ATK) > -ATK_LICENSE := LGPL-2.0-or-later > -ATK_LICENSE_FILES := \ > - > file://atk/atkaction.c;startline=1;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3 > \ > - file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 > - > -# > ---------------------------------------------------------------------------- > -# Prepare > -# > ---------------------------------------------------------------------------- > - > -# > -# meson > -# > -ATK_CONF_TOOL := meson > -ATK_CONF_OPT := \ > - $(CROSS_MESON_USR) \ > - -Ddocs=false \ > - -Dintrospection=$(call ptx/truefalse, PTXCONF_ATK_INTROSPECTION) > - > -# > ---------------------------------------------------------------------------- > -# Target-Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/atk.targetinstall: > - @$(call targetinfo) > - > - @$(call install_init, atk) > - @$(call install_fixup, atk,PRIORITY,optional) > - @$(call install_fixup, atk,SECTION,base) > - @$(call install_fixup, atk,AUTHOR,"Robert Schwebel > <r.schwe...@pengutronix.de>") > - @$(call install_fixup, atk,DESCRIPTION,missing) > - > - @$(call install_lib, atk, 0, 0, 0644, libatk-1.0) > -ifdef PTXCONF_ATK_INTROSPECTION > - @$(call install_copy, atk, 0, 0, 0644, -, \ > - /usr/lib/girepository-1.0/Atk-1.0.typelib) > -endif > - > - @$(call install_finish, atk) > - > - @$(call touch) > - > -# vim: syntax=make > diff --git a/rules/gtk.in b/rules/gtk.in > index de4f7eaf3d98..ea8598cc1022 100644 > --- a/rules/gtk.in > +++ b/rules/gtk.in > @@ -8,7 +8,7 @@ menuconfig GTK > select HOST_GDK_PIXBUF > > # core dependencies > - select ATK > + select AT_SPI2_CORE > select CAIRO > select CAIRO_GOBJECT > select CAIRO_PDF > diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx > index 1628392980a2..9531b3e27a6a 100755 > --- a/scripts/migrate/migrate_ptx > +++ b/scripts/migrate/migrate_ptx > @@ -477,3 +477,12 @@ D > :not_systemd_helper > # SYSTEMD without SYSTEMD_HELPER so add it > s/^\(# \)\?\(PTXCONF_SYSTEMD\>\)\(.*\)/\1\2_HELPER\3\n\1\2\3/ > + > +# from : ptxdist-2024.05.0 > +# to : ptxdist-2024.06.0 > +# symbol : ATK -> AT_SPI2_CORE > +# symbol : ATK_INTROSPECTION -> AT_SPI2_CORE_INTROSPECTION > +# reason : libatk was merged into at-spi2-core > +# > +s/^\(\(# \)\?PTXCONF_\)ATK/\1AT_SPI2_CORE/ > +s/^\(\(# \)\?PTXCONF_\)ATK_INTROSPECTION/\1AT_SPI2_CORE_INTROSPECTION/
