ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 20:27:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: devhelp: Upgrade to 41.2.

Browse source 
* gnu/packages/gnome.scm (devhelp): Upgrade to 41.2 to upgrade the webkit
dependency to 4.1.
[arguments]: Use meson 0.59.
In 'skip-gtk-update-icon-cache' phase, the post install script has been
moved from meson_post_install.py to build-aux/meson/.
In 'fix-devhelp-gir-inputs' phase, the devhelp GIR still mentions webkit
4.0, use 4.1 instead.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Vivien Kraus 2021-11-13 10:35:26 +00:00 committed by Ludovic Courtès
parent 4b28553e73
commit 04d53fa839
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/gnome.scm
View file

@ -5775,7 +5775,7 @@ (define-public amtk
(define-public devhelp (define-public devhelp
(package (package
(name "devhelp") (name "devhelp")
(version "40.1") (version "41.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -5783,17 +5783,23 @@ (define-public devhelp
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1fvb69l1nyxdrs95ar95rmpfs8nfkpys4x74r8ilid44hhzdk2iy")))) "1lk0gycjvs6gibhy0zs3ffkrkzrkyl5nkp7n60hgpa6syjq91apc"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
'(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
#:meson ,meson-0.59
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache (add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'. ;; Don't create 'icon-theme.cache'.
(lambda _ (lambda _
(substitute* "meson_post_install.py" (substitute* "build-aux/meson/meson_post_install.py"
(("gtk-update-icon-cache") "true"))))))) (("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 (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("itstool" ,itstool) ("itstool" ,itstool)