[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
286/402: gnu: malcontent: Update package definition.
From: |
guix-commits |
Subject: |
286/402: gnu: malcontent: Update package definition. |
Date: |
Tue, 18 Aug 2020 16:48:04 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit bc510f7a34b344a2fa165f997e0f29717f2b4b6f
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Wed Aug 5 15:55:06 2020 -0400
gnu: malcontent: Update package definition.
* gnu/packages/freedesktop.scm (malcontent): Update package definition.
[outputs]: New output "help".
[arguments]<#:phases>['skip-gtk-update-icon-cache]: New phase.
['move-help]: New phase.
[native-inputs]: Remove gtk+:bin.
[inputs]: Remove libostree. Move accountsservice, flatpack, glib and
gtk+ to ...
[propagated-inputs]: ... here.
[license]: Modify.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/freedesktop.scm | 41 ++++++++++++++++++++++++++++++-----------
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 900be49..56cb26d 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -154,6 +154,7 @@ tests.")
(sha256
(base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3"))))
(build-system meson-build-system)
+ (outputs '("out" "help"))
(arguments
`(#:glib-or-gtk? #t
#:phases
@@ -163,28 +164,42 @@ tests.")
(lambda _
(substitute* "libmalcontent/tests/app-filter.c"
(("g_test_add_func \\(\"/app-filter/appinfo\",
test_app_filter_appinfo\\);")
- ""))
- #t)))))
+ ""))
+ #t))
+ (add-before 'configure 'skip-gtk-update-icon-cache
+ (lambda _
+ (substitute* "build-aux/meson_post_install.py"
+ (("gtk-update-icon-cache")
+ "true"))
+ #t))
+ (add-after 'install 'move-help
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (help (assoc-ref outputs "help")))
+ (mkdir-p (string-append help "/share"))
+ (rename-file
+ (string-append out "/share/help")
+ (string-append help "/share/help"))
+ #t))))))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
- ("gtk+:bin" ,gtk+ "bin")
("itstool" ,itstool)
("libglib-testing" ,libglib-testing)
- ("libxml2" ,libxml2)
- ("pkg-config" ,pkg-config)))
+ ("pkg-config" ,pkg-config)
+ ("xmllint" ,libxml2)))
(inputs
- `(("accountsservice" ,accountsservice)
- ("appstream-glib" ,appstream-glib)
+ `(("appstream-util" ,appstream-glib)
("dbus" ,dbus)
- ("flatpak" ,flatpak)
- ("glib" ,glib)
- ("gtk+" ,gtk+)
- ("libostree" ,libostree)
("linux-pam" ,linux-pam)
("polkit" ,polkit)))
+ (propagated-inputs
+ `(("accountsservice" ,accountsservice)
+ ("flatpak" ,flatpak)
+ ("glib" ,glib)
+ ("gtk+" ,gtk+)))
(synopsis "Parental controls support")
(description "MalContent implements parental controls support which can
be used by applications to filter or limit the access of child accounts to
@@ -192,7 +207,11 @@ inappropriate content.")
(home-page "https://gitlab.freedesktop.org/pwithnall/malcontent")
(license
(list
+ ;; Documentation
+ license:cc-by-sa3.0
+ ;; Application
license:gpl2+
+ ;; Library
license:lgpl2.1+))))
(define-public xdg-utils
- 255/402: gnu: gnome-boxes: Fix home-page., (continued)
- 255/402: gnu: gnome-boxes: Fix home-page., guix-commits, 2020/08/18
- 264/402: gnu: rust-cssparser: Remove duplicate definition., guix-commits, 2020/08/18
- 265/402: gnu: rust-cssparser-macros@0.6.0: Fix reference to rust-quote., guix-commits, 2020/08/18
- 267/402: gnu: rust-serial-test-derive@0.4.0: Fix reference to rust-quote., guix-commits, 2020/08/18
- 269/402: gnu: rust-peg@0.5.7: Remove duplicate definition., guix-commits, 2020/08/18
- 276/402: gnu: rust-serial-test-derive@0.4.0: Fix reference to rust-syn., guix-commits, 2020/08/18
- 277/402: gnu: rust-rgb@0.8.20: Fix references to rust-bytemuck, rust-serde, rust-serde-json., guix-commits, 2020/08/18
- 279/402: gnu: gnome-desktop: Update package definition., guix-commits, 2020/08/18
- 282/402: gnu: gnome-getting-started-docs: Update package definition., guix-commits, 2020/08/18
- 283/402: gnu: Add fuse@2.9.9., guix-commits, 2020/08/18
- 286/402: gnu: malcontent: Update package definition.,
guix-commits <=
- 291/402: gnu: gnome-music: Update package definition., guix-commits, 2020/08/18
- 293/402: gnu: gnome-screenshot: Update package definition., guix-commits, 2020/08/18
- 296/402: gnu: gnome-shell-extensions: Update package definition., guix-commits, 2020/08/18
- 304/402: gnu: Add liblouis., guix-commits, 2020/08/18
- 305/402: gnu: Add liblouisutdml., guix-commits, 2020/08/18
- 306/402: gnu: Add latex2html., guix-commits, 2020/08/18
- 310/402: gnu: gst-editing-services: Update package definition., guix-commits, 2020/08/18
- 315/402: gnu: totem: Update package definition., guix-commits, 2020/08/18
- 313/402: gnu: libmusicbrainz: Propagate inputs., guix-commits, 2020/08/18
- 316/402: gnu: wayland: Update package definition., guix-commits, 2020/08/18