From 9538ea33f65a3f923644e9a35115cdf17bb11e83 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 7 Apr 2023 17:26:17 -0700
Subject: [PATCH] at-spi2-core: update to 2.48.0.

---
 srcpkgs/at-spi2-atk           |  1 +
 srcpkgs/at-spi2-atk-devel     |  2 +-
 srcpkgs/at-spi2-atk/template  | 28 ----------------
 srcpkgs/at-spi2-core/template | 61 ++++++++++++++++++++++++++++++-----
 srcpkgs/atk                   |  1 +
 srcpkgs/atk-devel             |  2 +-
 srcpkgs/atk/template          | 32 ------------------
 7 files changed, 57 insertions(+), 70 deletions(-)
 create mode 120000 srcpkgs/at-spi2-atk
 delete mode 100644 srcpkgs/at-spi2-atk/template
 create mode 120000 srcpkgs/atk
 delete mode 100644 srcpkgs/atk/template

diff --git a/srcpkgs/at-spi2-atk b/srcpkgs/at-spi2-atk
new file mode 120000
index 000000000000..da1f75dcf9f7
--- /dev/null
+++ b/srcpkgs/at-spi2-atk
@@ -0,0 +1 @@
+at-spi2-core
\ No newline at end of file
diff --git a/srcpkgs/at-spi2-atk-devel b/srcpkgs/at-spi2-atk-devel
index bd94de40f0c8..da1f75dcf9f7 120000
--- a/srcpkgs/at-spi2-atk-devel
+++ b/srcpkgs/at-spi2-atk-devel
@@ -1 +1 @@
-at-spi2-atk
\ No newline at end of file
+at-spi2-core
\ No newline at end of file
diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template
deleted file mode 100644
index cf945dffb266..000000000000
--- a/srcpkgs/at-spi2-atk/template
+++ /dev/null
@@ -1,28 +0,0 @@
-# Template file for 'at-spi2-atk'
-pkgname=at-spi2-atk
-version=2.38.0
-revision=1
-build_style=meson
-hostmakedepends="libtool pkg-config intltool glib-devel"
-makedepends="libglib-devel atk-devel at-spi2-core-devel libxml2-devel"
-short_desc="GTK+ module that bridges ATK to D-Bus at-spi"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.0-or-later"
-homepage="http://www.gnome.org"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f
-
-# non-trivial dbus setup
-do_check() {
-	:
-}
-
-at-spi2-atk-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-	}
-}
diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template
index 1a9ce8bddcb8..fd5f8f64fed3 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,17 +1,19 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.44.0
+version=2.48.0
 revision=1
 build_style=meson
 build_helper="gir"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="pkg-config dbus glib-devel gettext"
-makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel dbus-devel"
+makedepends="libglib-devel libXext-devel libSM-devel libXtst-devel dbus-devel
+ libxml2-devel"
 short_desc="Assistive Technology Service Provider Interface"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://gitlab.gnome.org/GNOME/at-spi2-core"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=7eee3cf285b089060fd6b6e51b3eb2cacf752cca3a082c7f4c2c5ab841e51353
+distfiles="${GNOME_SITE}/at-spi2-core/${version%.*}/at-spi2-core-${version}.tar.xz"
+checksum=905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30
 make_check=no # non-trivial dbus setup
 
 # Package build options
@@ -23,11 +25,54 @@ at-spi2-core-devel_package() {
 	 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
+		vmove usr/include/at-spi-2.0
+		vmove usr/lib/libatspi.so
+		vmove usr/lib/pkgconfig/atspi-2.pc
 		if [ "$build_option_gir" ]; then
-			vmove usr/share/gir-1.0
+			vmove usr/share/gir-1.0/Atspi-2.0.gir
 		fi
-		vmove "usr/lib/*.so"
+	}
+}
+
+atk_package() {
+	short_desc="Set of interfaces for accessibility"
+	pkg_install() {
+		if [ "$build_option_gir" ]; then
+			vmove usr/lib/girepository-1.0/Atk-1.0.typelib
+		fi
+		vmove "usr/lib/libatk-1.0.so.*"
+	}
+}
+
+atk-devel_package() {
+	depends="libglib-devel atk>=${version}_${revision}"
+	short_desc="Set of interfaces for accessibility - development files"
+	pkg_install() {
+		vmove usr/include/atk-1.0
+		vmove usr/lib/libatk-1.0.so
+		vmove usr/lib/pkgconfig/atk.pc
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0/Atk-1.0.gir
+		fi
+	}
+}
+
+at-spi2-atk_package() {
+	short_desc+=" - ATK bridge"
+	pkg_install() {
+		vmove usr/lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
+		vmove usr/lib/gtk-2.0/modules/libatk-bridge.so
+		vmove "usr/lib/libatk-bridge-2.0.so.*"
+	}
+}
+
+at-spi2-atk-devel_package() {
+	depends="libglib-devel atk-devel at-spi2-core-devel libxml2-devel
+	 at-spi2-atk>=${version}_${revision}"
+	short_desc+=" - ATK bridge development files"
+	pkg_install() {
+		vmove usr/include/at-spi2-atk
+		vmove usr/lib/pkgconfig/atk-bridge-2.0.pc
+		vmove usr/lib/libatk-bridge-2.0.so
 	}
 }
diff --git a/srcpkgs/atk b/srcpkgs/atk
new file mode 120000
index 000000000000..da1f75dcf9f7
--- /dev/null
+++ b/srcpkgs/atk
@@ -0,0 +1 @@
+at-spi2-core
\ No newline at end of file
diff --git a/srcpkgs/atk-devel b/srcpkgs/atk-devel
index b9b776926fd4..da1f75dcf9f7 120000
--- a/srcpkgs/atk-devel
+++ b/srcpkgs/atk-devel
@@ -1 +1 @@
-atk
\ No newline at end of file
+at-spi2-core
\ No newline at end of file
diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template
deleted file mode 100644
index 7132b271cb30..000000000000
--- a/srcpkgs/atk/template
+++ /dev/null
@@ -1,32 +0,0 @@
-# Template file for 'atk'
-pkgname=atk
-version=2.36.0
-revision=1
-build_style=meson
-build_helper="gir"
-configure_args="-Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="pkg-config glib-devel gettext"
-makedepends="libglib-devel"
-short_desc="Set of interfaces for accessibility"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="LGPL-2.1-or-later"
-homepage="https://developer.gnome.org/atk/"
-distfiles="${GNOME_SITE}/atk/${version%.*}/atk-${version}.tar.xz"
-checksum=fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788
-
-# Package build options
-build_options="gir"
-build_options_default="gir"
-
-atk-devel_package() {
-	depends="${makedepends} atk>=${version}_${revision}"
-	short_desc+=" - development files"
-	pkg_install() {
-		vmove usr/include
-		vmove usr/lib/pkgconfig
-		vmove "usr/lib/*.so"
-		if [ "$build_option_gir" ]; then
-			vmove "usr/share/gir-*"
-		fi
-	}
-}