Archived
1
0
Fork 0

gnu: devhelp: Update to 41.3.

* gnu/packages/gnome.scm (devhelp): Update to 41.3.
[phases]{fix-devhelp-gir-inputs}: Delete phase.
[native-inputs]: Remove labels.
[inputs]: Remove gsettings-desktop-schemas.
(devhelp-with-libsoup2)[arguments]: Remove field.
[inputs]: Express via modify-inputs.
This commit is contained in:
Maxim Cournoyer 2022-09-09 07:41:19 -04:00
parent a13849dc55
commit 7ae62f9ddf
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -5976,7 +5976,7 @@ both a traditional UI or a modern UI with a GtkHeaderBar.")
(define-public devhelp (define-public devhelp
(package (package
(name "devhelp") (name "devhelp")
(version "41.2") (version "41.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/" (uri (string-append "mirror://gnome/sources/" name "/"
@ -5984,7 +5984,7 @@ both a traditional UI or a modern UI with a GtkHeaderBar.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1lk0gycjvs6gibhy0zs3ffkrkzrkyl5nkp7n60hgpa6syjq91apc")))) "1rxn6kciyfdhnjrcjyf02cn3rki2xgwb4wrg5plbzjvpqasq66ml"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:glib-or-gtk? #t `(#:glib-or-gtk? #t
@ -5994,22 +5994,18 @@ both a traditional UI or a modern UI with a GtkHeaderBar.")
;; Don't create 'icon-theme.cache'. ;; Don't create 'icon-theme.cache'.
(lambda _ (lambda _
(substitute* "build-aux/meson/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'")))))))
(propagated-inputs (propagated-inputs
(list gsettings-desktop-schemas)) (list gsettings-desktop-schemas))
(native-inputs (native-inputs
`(("intltool" ,intltool) (list gettext-minimal
("itstool" ,itstool) gobject-introspection
("gobject-introspection" ,gobject-introspection) `(,glib "bin") ; for glib-mkmenus
("glib:bin" ,glib "bin") ; for glib-mkmenus itstool
("pkg-config" ,pkg-config))) pkg-config))
(inputs (inputs
(list amtk gsettings-desktop-schemas webkitgtk)) (list amtk
webkitgtk))
(home-page "https://wiki.gnome.org/Apps/Devhelp") (home-page "https://wiki.gnome.org/Apps/Devhelp")
(synopsis "API documentation browser for GNOME") (synopsis "API documentation browser for GNOME")
(description (description
@ -6020,19 +6016,8 @@ throughout GNOME for API documentation).")
(define-public devhelp-with-libsoup2 (define-public devhelp-with-libsoup2
(package/inherit devhelp (package/inherit devhelp
(arguments (inputs (modify-inputs (package-inputs devhelp)
(substitute-keyword-arguments (package-arguments devhelp) (replace "webkitgtk" webkitgtk-with-libsoup2)))))
((#:phases phases '%standard-phases)
`(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
(lambda _
(substitute* "build-aux/meson/meson_post_install.py"
(("gtk-update-icon-cache") "true"))))))))
(inputs
`(("amtk" ,amtk)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("webkitgtk" ,webkitgtk-with-libsoup2)))))
(define-public cogl (define-public cogl
(package (package