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:
parent
b97b47b676
commit
ab43d1f827
|
@ -666,7 +666,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/apr-skip-getservbyname-test.patch \
|
%D%/packages/patches/apr-skip-getservbyname-test.patch \
|
||||||
%D%/packages/patches/aria2-CVE-2019-3500.patch \
|
%D%/packages/patches/aria2-CVE-2019-3500.patch \
|
||||||
%D%/packages/patches/aspell-default-dict-dir.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-binutils.patch \
|
||||||
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
|
%D%/packages/patches/ath9k-htc-firmware-gcc.patch \
|
||||||
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
|
%D%/packages/patches/ath9k-htc-firmware-objcopy.patch \
|
||||||
|
|
|
@ -556,16 +556,15 @@ in the GNOME project.")
|
||||||
(define-public at-spi2-core
|
(define-public at-spi2-core
|
||||||
(package
|
(package
|
||||||
(name "at-spi2-core")
|
(name "at-spi2-core")
|
||||||
(version "2.32.0")
|
(version "2.32.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
(version-major+minor version) "/"
|
(version-major+minor version) "/"
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(patches (search-patches "at-spi2-core-meson-compat.patch"))
|
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"083j1v7kdjrpjsv1b9dl3d8xqj39jyp4cfn8i9gbbm7q2g93b923"))))
|
"0lqd7gsl471v6538iighkvb21gjglcb9pklvas32rjpsxcvsjaiw"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(outputs '("out" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(arguments
|
(arguments
|
||||||
|
|
|
@ -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' ],
|
|
Loading…
Reference in New Issue