From 87d336e20f025275767831d35264ca33bb0a3016 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 2 May 2019 13:49:25 +0200 Subject: gnu: gtk+: Update to 3.24.8. * gnu/packages/gtk.scm (gtk+): Update to 3.24.8. [source](snippet): Remove. --- gnu/packages/gtk.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu/packages/gtk.scm') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6e63ca6614..18d20d7094 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -728,7 +728,7 @@ application suites.") (name "gtk+") ;; NOTE: When updating the version of 'gtk+', the hash of 'mate-themes' in ;; mate.scm will also need to be updated. - (version "3.24.7") + (version "3.24.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -736,18 +736,9 @@ application suites.") name "-" version ".tar.xz")) (sha256 (base32 - "080m925dyhiidlhsxqzx040l4iha2gg38pzbfpnsnjyzl92124jj")) + "16f71bbkhwhndcsrpyhjia3b77cb5ksf5c45lyfgws4pkgg64sb6")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" - "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Version 3.24.2 was released with a typo that broke the build. - ;; See upstream commit 2905fc861acda3d134a198e56ef2f6c962ad3061 - ;; at - (substitute* "docs/tools/shooter.c" - (("gdk_screen_get_dfeault") "gdk_screen_get_default")) - #t)))) + "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) (outputs '("out" "bin" "doc")) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) -- cgit v1.2.3 From ab43d1f827c13c8d2027358653b9deeeec29ff43 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 May 2019 11:36:23 +0200 Subject: 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. --- gnu/local.mk | 1 - gnu/packages/gtk.scm | 5 ++--- gnu/packages/patches/at-spi2-core-meson-compat.patch | 18 ------------------ 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/at-spi2-core-meson-compat.patch (limited to 'gnu/packages/gtk.scm') 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' ], -- cgit v1.2.3