aboutsummaryrefslogtreecommitdiffstats
path: root/main/at-spi2-core
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-07-18 09:20:45 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-07-18 09:20:45 +0000
commit4c12791c22af8f11f8c338d3450db9104b46a744 (patch)
tree56fcd7e34907408c261dfd16df30e2c9f8473b91 /main/at-spi2-core
parentfe7a1920fc60dd0c7a2b6516cfa7b6e3555b8f53 (diff)
downloadaports-4c12791c22af8f11f8c338d3450db9104b46a744.tar.bz2
aports-4c12791c22af8f11f8c338d3450db9104b46a744.tar.xz
main/at-spi2-core: upgrade to 2.28.0
Diffstat (limited to 'main/at-spi2-core')
-rw-r--r--main/at-spi2-core/APKBUILD30
-rw-r--r--main/at-spi2-core/fix-buffer-overrun.patch12
2 files changed, 13 insertions, 29 deletions
diff --git a/main/at-spi2-core/APKBUILD b/main/at-spi2-core/APKBUILD
index bfe0bcf7ea..1d81d0b23b 100644
--- a/main/at-spi2-core/APKBUILD
+++ b/main/at-spi2-core/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=at-spi2-core
-pkgver=2.26.2
-pkgrel=1
+pkgver=2.28.0
+pkgrel=0
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
url="http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus"
arch="all"
@@ -10,33 +10,29 @@ 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"
+makedepends="$depends_dev dbus dbus-dev glib-dev intltool gobject-introspection-dev
+ meson"
install=""
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang"
-source="http://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz
- fix-buffer-overrun.patch"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-lang"
+source="http://download.gnome.org/sources/at-spi2-core/${pkgver%.*}/at-spi2-core-$pkgver.tar.xz"
builddir="$srcdir"/at-spi2-core-$pkgver
build() {
cd "$builddir"
- DATADIRNAME="share" ./configure \
- --build=$CBUILD \
- --host=$CHOST \
+ meson \
+ --buildtype=release \
--prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man
- make
+ . build
+ ninja -C "$builddir"/build
}
check() {
- cd "$builddir"
- make check
+ ninja -C "$builddir"/build test
}
package() {
cd "$builddir"
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C "$builddir"/build install
}
-sha512sums="6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255 at-spi2-core-2.26.2.tar.xz
-91065867443172454c02a1246f034f22faeae3c3eef89615fee227a51feb02133496e539c9b25c2b1b5f3fcd9ff960f8c29a64b7b7dee89bf0a3febc9bc40d9d fix-buffer-overrun.patch"
+sha512sums="ce5251f234d48f657a5fd5fbd9a85799365e9814235ecff62fa5088611c0c8c0489e17fb27a805453a2864163cb83f8d8d5ed4cdb7e37c4ee9ebb897146e2d1d at-spi2-core-2.28.0.tar.xz"
diff --git a/main/at-spi2-core/fix-buffer-overrun.patch b/main/at-spi2-core/fix-buffer-overrun.patch
deleted file mode 100644
index 9c434eace7..0000000000
--- a/main/at-spi2-core/fix-buffer-overrun.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru at-spi2-core-2.16.0.orig/bus/at-spi-bus-launcher.c at-spi2-core-2.16.0/bus/at-spi-bus-launcher.c
---- at-spi2-core-2.16.0.orig/bus/at-spi-bus-launcher.c 2015-03-05 06:04:20.000000000 +0200
-+++ at-spi2-core-2.16.0/bus/at-spi-bus-launcher.c 2015-10-25 16:00:32.158127066 +0200
-@@ -104,7 +104,7 @@
- {
- ssize_t bytes_read;
-
-- while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1))))
-+ while (max_bytes > 1 && (bytes_read = read (fd, buf, max_bytes - 1)))
- {
- if (bytes_read < 0)
- return FALSE;