From 2545cd935df22c2fb68d596a20eb8562b8a3e770 Mon Sep 17 00:00:00 2001
From: Rasmus Thomsen <oss@cogitri.dev>
Date: Fri, 10 May 2019 17:26:11 +0200
Subject: [PATCH] main/at-spi2-core: upgrade to 2.32.0
* Adopt maintainership
* Modernize APKBUILD
* Remove uneccesarry depends_dev, abuild autodetects it
---
main/at-spi2-core/APKBUILD | 29 ++++++++----------------
main/at-spi2-core/fix-meson-subdir.patch | 11 ---------
2 files changed, 9 insertions(+), 31 deletions(-)
delete mode 100644 main/at-spi2-core/fix-meson-subdir.patch
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index 37e77bfbb439..e293e001cd72 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,40 +1,29 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=at-spi2-core
-pkgver=2.28.0
-pkgrel=1
+pkgver=2.32.0
+pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-url="http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus"
+url="https://www.freedesktop.org/wiki/Accessibility/AT-SPI2/"
arch="all"
options="!check" # Requires running dbus daemon.
license="LGPL-2.0-or-later"
-depends=""
-depends_dev="libxtst-dev"
-makedepends="$depends_dev dbus dbus-dev glib-dev intltool gobject-introspection-dev
- meson"
-install=""
+makedepends="libxtst-dev dbus-dev glib-dev gobject-introspection-dev meson"
subpackages="$pkgname-dbg $pkgname-dev $pkgname-lang"
-source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz
- fix-meson-subdir.patch"
+source="https://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz"
-builddir="$srcdir"/at-spi2-core-$pkgver
build() {
cd "$builddir"
meson \
--buildtype=release \
--prefix=/usr \
. build
- ninja -C "$builddir"/build
-}
-
-check() {
- ninja -C "$builddir"/build test
+ ninja -C build
}
package() {
cd "$builddir"
- DESTDIR="$pkgdir" ninja -C "$builddir"/build install
+ DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="ce5251f234d48f657a5fd5fbd9a85799365e9814235ecff62fa5088611c0c8c0489e17fb27a805453a2864163cb83f8d8d5ed4cdb7e37c4ee9ebb897146e2d1d at-spi2-core-2.28.0.tar.xz
-53a622190785437460383e5b7861469943434ba2949f2e43dbb1c5afb19db33b2fe777bf933c0caf826a1b8a4974b2c0fd08e6357740c63532384f2ba2b4eae3 fix-meson-subdir.patch"
+sha512sums="4c77b4e0d37b559d20e6521107e8f7e03e91392414dc7ffdceb558667f3a7a6137af6895f3a8cd97dc3e85715d7875812d658dcc84277a63a10276992bde2fa6 at-spi2-core-2.32.0.tar.xz"
diff --git a/main/at-spi2-core/fix-meson-subdir.patch b/main/at-spi2-core/fix-meson-subdir.patch
deleted file mode 100644
index 9b07be046d44..000000000000
--- a/main/at-spi2-core/fix-meson-subdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/atspi/meson.build
-+++ b/atspi/meson.build
-@@ -57,7 +57,7 @@
-
- atspi_includedir = join_paths(get_option('prefix'), get_option('includedir'), 'at-spi-2.0', 'atspi')
-
--install_headers(atspi_headers, subdir: atspi_includedir)
-+install_headers(atspi_headers, install_dir: atspi_includedir)
-
- atspi_enums = gnome.mkenums('atspi-enum-types',
- sources: [ 'atspi-constants.h', 'atspi-types.h' ],
--
GitLab