From 6ed9d6c63f69e206bad8684cf9b132fece130de5 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Thu, 13 Oct 2022 22:51:10 +0900
Subject: [PATCH] at-spi2-core: Bump to 2.46.0

---
 packages/at-spi2-core/build.sh    | 10 +++++++---
 x11-packages/at-spi2-atk/build.sh | 20 ++++++++------------
 x11-packages/atk/build.sh         | 19 ++++++++-----------
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/packages/at-spi2-core/build.sh b/packages/at-spi2-core/build.sh
index 96be68aedf..da86602479 100644
--- a/packages/at-spi2-core/build.sh
+++ b/packages/at-spi2-core/build.sh
@@ -2,11 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/Accessibility
 TERMUX_PKG_DESCRIPTION="Assistive Technology Service Provider Interface (AT-SPI)"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-_MAJOR_VERSION=2.44
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
+_MAJOR_VERSION=2.46
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
 TERMUX_PKG_SRCURL=https://download.gnome.org/sources/at-spi2-core/${_MAJOR_VERSION}/at-spi2-core-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=4beb23270ba6cf7caf20b597354d75194d89afb69d2efcf15f4271688ba6f746
+TERMUX_PKG_SHA256=aa0c86c79f7a8d67bae49a5b7a5ab08430c608cffe6e33bf47a72f41ab03c3d0
 TERMUX_PKG_DEPENDS="dbus, glib, libx11, libxi, libxtst"
+TERMUX_PKG_BUILD_DEPENDS="libxml2"
+TERMUX_PKG_PROVIDES="at-spi2-atk, atk"
+TERMUX_PKG_REPLACES="at-spi2-atk (<< 2.46.0), atk (<< 2.46.0), libatk"
+TERMUX_PKG_BREAKS="at-spi2-atk (<< 2.46.0), atk (<< 2.46.0), libatk"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dintrospection=no
 -Dx11=yes
diff --git a/x11-packages/at-spi2-atk/build.sh b/x11-packages/at-spi2-atk/build.sh
index dd147c41fe..755fc30afc 100644
--- a/x11-packages/at-spi2-atk/build.sh
+++ b/x11-packages/at-spi2-atk/build.sh
@@ -1,13 +1,9 @@
-TERMUX_PKG_HOMEPAGE=https://wiki.linuxfoundation.org/accessibility/atk/at-spi/at-spi_on_d-bus
-TERMUX_PKG_DESCRIPTION="A GTK+ module that bridges ATK to D-Bus at-spi"
-TERMUX_PKG_LICENSE="LGPL-2.1"
+TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-packages
+TERMUX_PKG_DESCRIPTION="A metapackage that installs at-spi2-core"
+TERMUX_PKG_LICENSE="Public Domain"
 TERMUX_PKG_MAINTAINER="@termux"
-_MAJOR_VERSION=2.38
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
-TERMUX_PKG_REVISION=6
-TERMUX_PKG_SRCURL=https://download.gnome.org/sources/at-spi2-atk/${_MAJOR_VERSION}/at-spi2-atk-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f
-TERMUX_PKG_DEPENDS="at-spi2-core, dbus, glib, atk"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--Dtests=false
-"
+TERMUX_PKG_VERSION=2.46.0
+TERMUX_PKG_SKIP_SRC_EXTRACT=true
+TERMUX_PKG_DEPENDS="at-spi2-core (>= 2.46.0)"
+TERMUX_PKG_METAPACKAGE=true
+TERMUX_PKG_PLATFORM_INDEPENDENT=true
diff --git a/x11-packages/atk/build.sh b/x11-packages/atk/build.sh
index 79410dd16c..755fc30afc 100644
--- a/x11-packages/atk/build.sh
+++ b/x11-packages/atk/build.sh
@@ -1,12 +1,9 @@
-TERMUX_PKG_HOMEPAGE=https://www.gtk.org
-TERMUX_PKG_DESCRIPTION="The interface definitions of accessibility infrastructure"
-TERMUX_PKG_LICENSE="LGPL-2.0"
+TERMUX_PKG_HOMEPAGE=https://github.com/termux/termux-packages
+TERMUX_PKG_DESCRIPTION="A metapackage that installs at-spi2-core"
+TERMUX_PKG_LICENSE="Public Domain"
 TERMUX_PKG_MAINTAINER="@termux"
-_MAJOR_VERSION=2.38
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
-TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/atk/${_MAJOR_VERSION}/atk-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36
-TERMUX_PKG_DEPENDS="glib"
-TERMUX_PKG_CONFLICTS="libatk"
-TERMUX_PKG_REPLACES="libatk"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-Dintrospection=false"
+TERMUX_PKG_VERSION=2.46.0
+TERMUX_PKG_SKIP_SRC_EXTRACT=true
+TERMUX_PKG_DEPENDS="at-spi2-core (>= 2.46.0)"
+TERMUX_PKG_METAPACKAGE=true
+TERMUX_PKG_PLATFORM_INDEPENDENT=true