[PR PATCH] at-spi2-core: update to 2.46.0.

[PR PATCH] at-spi2-core: update to 2.46.0.

[joey-commits]

[-- Attachment #1: Type: text/plain, Size: 538 bytes --]

There is a new pull request by joey-commits against master on the void-packages repository

https://github.com/joey-commits/void-packages at-spi
https://github.com/void-linux/void-packages/pull/41429

at-spi2-core: update to 2.46.0.
at-spi2-atk and atk were merged into this project upstream.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES


A patch file from https://github.com/void-linux/void-packages/pull/41429.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-at-spi-41429.patch --]
[-- Type: text/x-diff, Size: 6408 bytes --]

From 2920338b7d321cbedb94694f16ea7ba50f193db8 Mon Sep 17 00:00:00 2001
From: Joey <joey@imap.cc>
Date: Mon, 2 Jan 2023 20:26:21 -0500
Subject: [PATCH] at-spi2-core: update to 2.46.0.

at-spi2-atk and atk were merged into this project upstream.
---
 common/shlibs                 |  4 ++--
 srcpkgs/at-spi2-atk           |  1 +
 srcpkgs/at-spi2-atk-devel     |  2 +-
 srcpkgs/at-spi2-atk/template  | 28 ----------------------------
 srcpkgs/at-spi2-core/template | 30 +++++++++++++++++++++++++++---
 srcpkgs/atk                   |  1 +
 srcpkgs/atk-devel             |  2 +-
 srcpkgs/atk/template          | 32 --------------------------------
 8 files changed, 33 insertions(+), 67 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/common/shlibs b/common/shlibs
index 52a6d3e6d5fb..9c53b440649e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -97,7 +97,7 @@ libglib-2.0.so.0 glib-2.74.0_1
 libgmodule-2.0.so.0 glib-2.74.0_1
 libgio-2.0.so.0 glib-2.74.0_1
 libgobject-2.0.so.0 glib-2.74.0_1
-libatk-1.0.so.0 atk-1.26.0_1
+libatk-1.0.so.0 at-spi2-core-2.46.0_1
 libpangocairo-1.0.so.0 pango-1.24.0_1
 libpangoft2-1.0.so.0 pango-1.24.0_1
 libpangoxft-1.0.so.0 pango-xft-1.36.3_2
@@ -833,7 +833,7 @@ libvpx.so.6 libvpx6-1.8.0_1
 libvpx.so.7 libvpx7-1.11.0_1
 libXevie.so.1 libXevie-1.0.2_1
 libatspi.so.0 at-spi2-core-1.91.91_1
-libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
+libatk-bridge-2.0.so.0 at-spi2-core-2.46.0_1
 libvte-2.91.so.0 vte3-0.68.0_1
 libvte-2.91-gtk4.so.0 vte3-gtk4-0.70.0_1
 libpipeline.so.1 libpipeline-1.2.0_1
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..492a8aee0d61 100644
--- a/srcpkgs/at-spi2-core/template
+++ b/srcpkgs/at-spi2-core/template
@@ -1,17 +1,17 @@
 # Template file for 'at-spi2-core'
 pkgname=at-spi2-core
-version=2.44.0
+version=2.46.0
 revision=1
 build_style=meson
 build_helper="gir"
 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
+checksum=aa0c86c79f7a8d67bae49a5b7a5ab08430c608cffe6e33bf47a72f41ab03c3d0
 make_check=no # non-trivial dbus setup
 
 # Package build options
@@ -31,3 +31,27 @@ at-spi2-core-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+atk_package() {
+	depends="at-spi2-core>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+atk-devel_package() {
+	depends="at-spi2-core-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+at-spi2-atk_package() {
+	depends="at-spi2-core>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
+
+at-spi2-atk-devel_package() {
+	depends="at-spi2-core-devel>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}
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
-	}
-}

Re: at-spi2-core: update to 2.46.0.

[CameronNemo]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/41429#issuecomment-1374383641

Comment:
Looks pretty good to me

Re: [PR REVIEW] at-spi2-core: update to 2.46.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41429#discussion_r1063994022

Comment:
```suggestion
distfiles="${GNOME_SITE}/at-spi2-core/${version%.*}/at-spi2-core-${version}.tar.xz"
```

Re: at-spi2-core: update to 2.46.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41429#issuecomment-1500918305

Comment:
#43337

Re: [PR PATCH] [Closed]: at-spi2-core: update to 2.46.0.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

There's a closed pull request on the void-packages repository

at-spi2-core: update to 2.46.0.
https://github.com/void-linux/void-packages/pull/41429

Description:
at-spi2-atk and atk were merged into this project upstream.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES