From patchwork Thu Aug 3 15:30:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kiasoc5 X-Patchwork-Id: 52481 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A8EDE27BBE9; Thu, 3 Aug 2023 16:43:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB7B427BBE2 for ; Thu, 3 Aug 2023 16:43:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRaTg-00070D-T3; Thu, 03 Aug 2023 11:43:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qRaTe-000701-Gf for guix-patches@gnu.org; Thu, 03 Aug 2023 11:43:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qRaTe-0006R9-8D for guix-patches@gnu.org; Thu, 03 Aug 2023 11:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRaTe-0000vM-3Z for guix-patches@gnu.org; Thu, 03 Aug 2023 11:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65040] [PATCH] gnu: malcontent: Update to 0.11.1. Resent-From: kiasoc5 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 15:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65040 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65040@debbugs.gnu.org Cc: kiasoc5 X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16910773513481 (code B ref -1); Thu, 03 Aug 2023 15:43:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2023 15:42:31 +0000 Received: from localhost ([127.0.0.1]:52739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRaT8-0000u5-Jf for submit@debbugs.gnu.org; Thu, 03 Aug 2023 11:42:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:55424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRaT7-0000ts-5W for submit@debbugs.gnu.org; Thu, 03 Aug 2023 11:42:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qRaT1-0006uP-Nq for guix-patches@gnu.org; Thu, 03 Aug 2023 11:42:23 -0400 Received: from pool-108-28-253-132.washdc.fios.verizon.net ([108.28.253.132] helo=localhost.localdomain) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRaT0-0006H5-56 for guix-patches@gnu.org; Thu, 03 Aug 2023 11:42:23 -0400 Received: from brainstorm (uid 1000) (envelope-from brainstorm@localhost.localdomain) id 4259bf by localhost.localdomain (DragonFly Mail Agent v0.13); Thu, 03 Aug 2023 11:30:38 -0400 Date: Thu, 3 Aug 2023 11:30:24 -0400 Message-Id: <20230803153024.124865-1-kiasoc5@disroot.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: none client-ip=108.28.253.132; envelope-from=brainstorm@localhost.localdomain; helo=localhost.localdomain X-Spam_score_int: 27 X-Spam_score: 2.7 X-Spam_bar: ++ X-Spam_report: (2.7 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, KHOP_HELO_FCRDNS=0.001, NO_DNS_FOR_FROM=0.001, RCVD_IN_PBL=3.335, RCVD_IN_SORBS_DUL=0.001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: kiasoc5 X-ACL-Warn: , kiasoc5 via Guix-patches X-Patchwork-Original-From: kiasoc5 via Guix-patches via From: kiasoc5 Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/freedesktop.scm (malcontent): Update to 0.11.1. [inputs]: Remove appstream-glib and gtk+; add appstream, bash-minimal, gtk, libadwaita, and python-pygobject. [native-inputs]: Remove input labels. [arguments]: Use G-expressions, remove trailing #t. [phases]: Add phase to wrap malcontent-client with GI_TYPELIB_PATH. --- gnu/packages/freedesktop.scm | 55 +++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 23 deletions(-) base-commit: 782cf09b84bc72514e89d783460ea98bc353bf6a diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 112ae5afeb..bd1e2f34ee 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -338,7 +338,7 @@ (define-public libglib-testing (define-public malcontent (package (name "malcontent") - (version "0.8.0") + (version "0.11.1") (source (origin (method git-fetch) @@ -347,37 +347,46 @@ (define-public malcontent (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0vnf0pk516fwwh41v96c29l2i7h1pnwhivlkbf53kkx1q35g7lb3")))) + (base32 "0g622ig5ffrzk9184xff3lardk7rnmkvj8y5g6h6s41bfh51b71m")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - ;; AppInfo not available inside build environment. - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "libmalcontent/tests/app-filter.c" - (("g_test_add_func \\(\"/app-filter/appinfo\", test_app_filter_appinfo\\);") - "")) - #t))))) + (list #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + ;; AppInfo not available inside build environment. + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "libmalcontent/tests/app-filter.c" + (("g_test_add_func \\(\"/app-filter/appinfo\", test_app_filter_appinfo\\);") + "")))) + (add-after 'install 'wrap-program + (lambda _ + (wrap-program + (string-append #$output "/bin/malcontent-client") + `("GI_TYPELIB_PATH" ":" prefix + (,(string-append #$output "/lib/girepository-1.0") + ,(getenv "GI_TYPELIB_PATH"))))))))) (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))) + (list desktop-file-utils + gettext-minimal + `(,glib "bin") + gobject-introspection + `(,gtk "bin") + itstool + libglib-testing + libxml2 + pkg-config)) (inputs (list accountsservice - appstream-glib + appstream + bash-minimal ; for wrap-program dbus flatpak glib - gtk+ + gtk + libadwaita libostree + python-pygobject linux-pam polkit)) (synopsis "Parental controls support")