From patchwork Tue Mar 25 17:30:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Pisemsky X-Patchwork-Id: 40824 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 6649927BBE9; Tue, 25 Mar 2025 17:32:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED 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 F18AB27BBE2 for ; Tue, 25 Mar 2025 17:32:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tx88E-0005p5-2a; Tue, 25 Mar 2025 13:32:06 -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 1tx88C-0005oc-DX for guix-patches@gnu.org; Tue, 25 Mar 2025 13:32:04 -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 1tx88B-0001KA-QQ for guix-patches@gnu.org; Tue, 25 Mar 2025 13:32:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=fzEuEE+Ps3PJK992twz6aS962/lE2SveG80ixZ5OnOI=; b=CwPdsOlXUC0M9cdeJbhqyIvfiiIVn191tyrJ3XG/G/0pFnh0RlQTtt5rLYRJ0n9mdVu5b8g/WCpPyalnXCxv1ZZ3xtSxgYIbbB1UL8E0E98r6hKPwgQS9GyynvLihsPTIuzDRz/92GjjJLmJVSysRWl4WhL0SuVpWjZ1eJgaqfnvDlTxl4Q9+WfevI4b6gRGXzfUIRp9tgbXHsao/hEzKuEh73tlF1qVa7ihKuPuGiNIs49erejF7NUmTBHl3jQsDJuix/VVp/WNuexq9cYE3ui4IceGB8ETmICgqGANEyc10rBNzqPpVpYx3TpNLPAl2i88PbW4GFlJPge8I7XKVA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tx88A-0008NR-Gl; Tue, 25 Mar 2025 13:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77254] [PATCH] gnu: aacircuit: Wrap program properly. Resent-From: Evgeny Pisemsky Original-Sender: "Debbugs-submit" Resent-CC: csantosb@inventati.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 25 Mar 2025 17:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77254@debbugs.gnu.org Cc: Cayetano Santos , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Cayetano Santos , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.174292389732154 (code B ref -1); Tue, 25 Mar 2025 17:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2025 17:31:37 +0000 Received: from localhost ([127.0.0.1]:39875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tx87k-0008MX-Si for submit@debbugs.gnu.org; Tue, 25 Mar 2025 13:31:37 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51236) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tx87h-0008Kw-G5 for submit@debbugs.gnu.org; Tue, 25 Mar 2025 13:31:34 -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 1tx86x-0005d6-BB for guix-patches@gnu.org; Tue, 25 Mar 2025 13:30:48 -0400 Received: from pisemsky.site ([103.54.19.55]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tx86u-0001CB-SI for guix-patches@gnu.org; Tue, 25 Mar 2025 13:30:47 -0400 Received: from localhost.localdomain ( [176.59.36.166]) by pisemsky.site (OpenSMTPD) with ESMTPSA id ae3d3fc3 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Tue, 25 Mar 2025 17:30:32 +0000 (UTC) From: Evgeny Pisemsky Date: Tue, 25 Mar 2025 20:30:26 +0300 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=103.54.19.55; envelope-from=mail@pisemsky.site; helo=pisemsky.site X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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: , 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/engineering.scm (aacircuit): Wrap program properly. [arguments]: Import modules from glib-or-gtk-build-system, add new phases: generate-gdk-pixbuf-loaders-cache-file, glib-or-gtk-wrap, wrap-aacircuit. [propagated-inputs]: Move every input from here... [inputs]: to here, add bash-minimal. Change-Id: Ia9e5b0908b7464a0dfe0fd8ffa4675cad95c0dd9 --- gnu/packages/engineering.scm | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) base-commit: ff019629025871caa2fbc78cf921fb46e96e94de diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8b6bd85293..c55dfe8726 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -195,8 +195,17 @@ (define-public aacircuit (build-system pyproject-build-system) (arguments (list + #:imported-modules `((guix build glib-or-gtk-build-system) + ,@%pyproject-build-system-modules) + #:modules '(((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build pyproject-build-system) + (guix build utils)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file + (assoc-ref glib-or-gtk:%standard-phases + 'generate-gdk-pixbuf-loaders-cache-file)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -208,7 +217,18 @@ (define-public aacircuit "test_import_aacircuit_export_pdf") ",")) (setenv "HOME" "/tmp") - (invoke "xvfb-run" "./testrunner.sh"))))))) + (invoke "xvfb-run" "./testrunner.sh")))) + (add-after 'wrap 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases + 'glib-or-gtk-wrap)) + (add-after 'glib-or-gtk-wrap 'wrap-aacircuit + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/aacircuit") + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH"))))))))) (native-inputs ;; XXX: Test runner may be migrated to Pytest ;; after report to @@ -218,8 +238,9 @@ (define-public aacircuit python-setuptools python-wheel xvfb-run)) - (propagated-inputs - (list gtk+ + (inputs + (list bash-minimal + gtk+ python-bresenham python-platformdirs python-pycairo