gnu: at-spi2-core: Update to 2.32.1.

* gnu/packages/patches/at-spi2-core-meson-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/gtk.scm (at-spi2-core): Update to 2.32.1.
[source](patches): Remove.
This commit is contained in:
Marius Bakke 2019-05-24 11:36:23 +02:00
parent b97b47b676
commit ab43d1f827
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 2 additions and 22 deletions

View file

@ -666,7 +666,6 @@ dist_patch_DATA = \
%D%/packages/patches/apr-skip-getservbyname-test.patch \
%D%/packages/patches/aria2-CVE-2019-3500.patch \
%D%/packages/patches/aspell-default-dict-dir.patch \
%D%/packages/patches/at-spi2-core-meson-compat.patch \
%D%/packages/patches/ath9k-htc-firmware-binutils.patch \
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \

View file

@ -556,16 +556,15 @@ (define-public gdk-pixbuf+svg
(define-public at-spi2-core
(package
(name "at-spi2-core")
(version "2.32.0")
(version "2.32.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(patches (search-patches "at-spi2-core-meson-compat.patch"))
(sha256
(base32
"083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923"))))
"0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments

View file

@ -1,18 +0,0 @@
Fix build with Meson 0.50.0 and above.
Taken from upstream repository:
https://gitlab.gnome.org/GNOME/at-spi2-core/commit/44a812ea51223d82f21a098a2d45fcc5c329ce7a
diff --git a/atspi/meson.build b/atspi/meson.build
index b7a9357df1c4857dffa2ec123cd3073e67a07fea..2a6915d76202dabf923b50e6a8b85cbb83cb43d0 100644
--- a/atspi/meson.build
+++ b/atspi/meson.build
@@ -57,7 +57,7 @@ atspi_headers = [
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' ],