X-Loop: help-debbugs@HIDDEN
Subject: [bug#77254] [PATCH] gnu: aacircuit: Wrap program properly.
Resent-From: Evgeny Pisemsky <mail@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: csantosb@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 25 Mar 2025 17:32:02 +0000
Resent-Message-ID: <handler.77254.B.174292389732154 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 77254
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77254 <at> debbugs.gnu.org
Cc: Cayetano Santos <csantosb@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
X-Debbugs-Original-Xcc: Cayetano Santos <csantosb@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Received: via spool by submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tx87k-0008MX-Si
for submit <at> 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 <mail@HIDDEN>)
id 1tx87h-0008Kw-G5
for submit <at> 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 <mail@HIDDEN>)
id 1tx86x-0005d6-BB
for guix-patches@HIDDEN; 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 <mail@HIDDEN>)
id 1tx86u-0001CB-SI
for guix-patches@HIDDEN; Tue, 25 Mar 2025 13:30:47 -0400
Received: from localhost.localdomain (<unknown> [176.59.36.166])
by pisemsky.site (OpenSMTPD) with ESMTPSA id ae3d3fc3
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <guix-patches@HIDDEN>;
Tue, 25 Mar 2025 17:30:32 +0000 (UTC)
From: Evgeny Pisemsky <mail@HIDDEN>
Date: Tue, 25 Mar 2025 20:30:26 +0300
Message-ID: <ec5bcfbc83dec004ba413d4bbf8418537c93960c.1742923826.git.mail@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=103.54.19.55; envelope-from=mail@HIDDEN;
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-Spam-Score: 1.0 (+)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
* 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(-)
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
;; <https://docs.pytest.org/en/7.1.x/how-to/nose.html> 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
base-commit: ff019629025871caa2fbc78cf921fb46e96e94de
--
2.49.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Evgeny Pisemsky <mail@HIDDEN> Subject: bug#77254: Acknowledgement ([PATCH] gnu: aacircuit: Wrap program properly.) Message-ID: <handler.77254.B.174292389732154.ack <at> debbugs.gnu.org> References: <ec5bcfbc83dec004ba413d4bbf8418537c93960c.1742923826.git.mail@HIDDEN> X-Gnu-PR-Message: ack 77254 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 77254 <at> debbugs.gnu.org Date: Tue, 25 Mar 2025 17:32:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. As you requested using X-Debbugs-CC, your message was also forwarded to Cayetano Santos <csantosb@HIDDEN>, Maxim Cournoyer <maxim.cournoye= r@HIDDEN> (after having been given a bug report number, if it did not have one). Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 77254 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 77254: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77254 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
Received: (at control) by debbugs.gnu.org; 27 Mar 2025 12:21:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 27 08:21:03 2025 Received: from localhost ([127.0.0.1]:47977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1txmEJ-0001SA-ES for submit <at> debbugs.gnu.org; Thu, 27 Mar 2025 08:21:03 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:57569) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1txmEG-0001QO-B2 for control <at> debbugs.gnu.org; Thu, 27 Mar 2025 08:21:01 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-224100e9a5cso17584295ad.2 for <control <at> debbugs.gnu.org>; Thu, 27 Mar 2025 05:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743078054; x=1743682854; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=TgvB+6yKXf5IGVf62TW/iiuUeTSZoh6BrHRnj6F6mf8=; b=mU+6VAcjU7N/NMi/vMxDbEmmD+3JqrM7sxkWhhbH5sSJXy/P0UEv9IGgskiZVopDd/ VWanwsSklN0unv9bPmArpJOdyuOVLpu8Zx09T8FHtTMWKtv8rxYlPWFzmjnjbLLOpf+p YNYehNq69qcJXp0pxw69bBS50CvEQvozg/KoquMhyHLN3wk4NYDA7zLJS5lvZ1G0Jkzh lyWs6VMp++dxdPYwBpYyDkk2LUs6sl1W0uc5Ay0eMkNcM2i/eKayie+GTuRaZbCBqvBD CXRAESnmFNbfnJTz50LDOfMAT32jdiz+SGHVog68I8dQiJqwfTK+n4LtyXrFbT9DkTlW 2TTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743078054; x=1743682854; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TgvB+6yKXf5IGVf62TW/iiuUeTSZoh6BrHRnj6F6mf8=; b=OIActc8/MV5e+0QHY/FdkT/uo6XqBldeF91SmC4zDDAw2bkfHOHHNOTVFDIpndOk0A 8GOerMUqRBb87zAQ9J7Wpy65oZqtZBJPh2YsCuYsK/ny8qeNKlMRggngeIb0CAWdOoAT rNtufgXf/Za31QQwKqyWQJd8J/Swc7vjgoTGmmxd2h6quF36sgrrZGJQxU8aRspqd3N8 iArAo/6K1sCvCb7rqXbFrvzq1Iu7D8XcIYtn+/wz++hhkZn1XP7SAd/tjQCrZm2fgd2R R6d6Pty36MpCSD+3S3gZKJhSBgy9dbrAxxMXgox0v28ZS1T/Ig2xm+em/kb4KfOdhoUz BiDA== X-Gm-Message-State: AOJu0YyeoDwS+Od8kr9du5bvEKbog2kVTdNsgjgPLoV4YC1wPBAIDNJ3 itKD7/qO2oAbDZLc99+X6Bfbmi7DcwuwQfRkZrIsh2djKGqSiFedzjUMRA== X-Gm-Gg: ASbGncttwtZLgtG0u/mLjX383djLQyEJ4guZrvDXaoSpmP6gNBMfY8GD4wDBKR1SFQ4 66k/EnovS2kEzAWJZTtTx0Gsr/gFO3VE4ATPrf30ypWPyYuysZUSVx6rlRNv/EmC0naSXPPM3RL xDKcDQPFgfr8F7r0xwQG3zHp0VtwNdzk+gQUtWeZQ95PYdURTUF5PUucC+2Z8nlNk2f9IC0s7Da 5f7xqkV00R5mBR7PXbK/2YkqFJAfpoimXNH8b9EjA1mlz+/z/xlEYiHWlAsS+4qU15Sj49WVIQY zNDCpzokLAnGqwoYgnEJVsU3F4stu+JdvivD5sL6P8ybr9gO3t+F2g== X-Google-Smtp-Source: AGHT+IGLVNVvywkjBG1oip+b+OuI6RrL9ZLgQjC8C8/a0ribK640ThEdOWZUUya2mhapJIFsJBWh1Q== X-Received: by 2002:a05:6a20:12d4:b0:1f5:8605:9530 with SMTP id adf61e73a8af0-1fea2f41b07mr5994918637.28.1743078053664; Thu, 27 Mar 2025 05:20:53 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7390611cacbsm14557060b3a.102.2025.03.27.05.20.52 for <control <at> debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 05:20:53 -0700 (PDT) Date: Thu, 27 Mar 2025 21:20:37 +0900 Message-Id: <87semywtpm.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: control message for bug #77254 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) close 77254 quit
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.