From fadbf75a7667cfb9e2a25024913373a53310d06c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 13 Nov 2021 10:35:26 +0000 Subject: [PATCH] gnu: devhelp: Upgrade to 41.2. * gnu/packages/gnome.scm (devhelp): Upgrade to 41.2 to upgrade the webkit dependency to 4.1. * gnu/packages/gnome.scm (devhelp) [arguments]: Use meson 0.59. * gnu/packages/gnome.scm (devhelp) [phase skip-gtk-update-icon-cache]: the post install script has been moved from meson_post_install.py to build-aux/meson/. * gnu/packages/gnome.scm (devhelp) [phase fix-devhelp-gir-inputs]: the devhelp GIR still mentions webkit 4.0, use 4.1 instead. --- gnu/packages/gnome.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d097495b1e..3f1eada0c0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5775,7 +5775,7 @@ (define-public amtk (define-public devhelp (package (name "devhelp") - (version "40.1") + (version "41.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -5783,17 +5783,23 @@ (define-public devhelp name "-" version ".tar.xz")) (sha256 (base32 - "1fvb69l1nyxdrs95ar95rmpfs8nfkpys4x74r8ilid44hhzdk2iy")))) + "1lk0gycjvs6gibhy0zs3ffkrkzrkyl5nkp7n60hgpa6syjq91apc")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t + `(#:glib-or-gtk? #t + #:meson ,meson-0.59 #:phases (modify-phases %standard-phases (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true"))))))) + (substitute* "build-aux/meson/meson_post_install.py" + (("gtk-update-icon-cache") "true")))) + (add-after 'unpack 'fix-devhelp-gir-inputs + ;; It still mentions webkitgtk 4.0 + (lambda _ + (substitute* "devhelp/meson.build" + (("'WebKit2-4.0'") "'WebKit2-4.1'"))))))) (native-inputs `(("intltool" ,intltool) ("itstool" ,itstool) -- 2.33.1