aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-05-24 11:36:23 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-05-24 23:28:30 +0200
commitab43d1f827c13c8d2027358653b9deeeec29ff43 (patch)
treeedfa6a6bad71a29fe06bcaf47800ec69a4303175
parentb97b47b676d9df2e613450eba68be42852c2b403 (diff)
downloadguix-ab43d1f827c13c8d2027358653b9deeeec29ff43.tar
guix-ab43d1f827c13c8d2027358653b9deeeec29ff43.tar.gz
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.
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/gtk.scm5
-rw-r--r--gnu/packages/patches/at-spi2-core-meson-compat.patch18
3 files changed, 2 insertions, 22 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 2d3b8d32cb..09a165c26e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -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 \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index f40277c716..ea5c0fa11a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -556,16 +556,15 @@ in the GNOME project.")
(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
diff --git a/gnu/packages/patches/at-spi2-core-meson-compat.patch b/gnu/packages/patches/at-spi2-core-meson-compat.patch
deleted file mode 100644
index 168a31b4ed..0000000000
--- a/gnu/packages/patches/at-spi2-core-meson-compat.patch
+++ /dev/null
@@ -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' ],