From patchwork Sun Mar 31 14:48:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 62406 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 10BB027BBE9; Mon, 1 Apr 2024 01:22:40 +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.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 5201027BBE2 for ; Mon, 1 Apr 2024 01:22:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rr5RE-0001Ae-AJ; Sun, 31 Mar 2024 20:22:12 -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 1rr5R7-000198-NN for guix-patches@gnu.org; Sun, 31 Mar 2024 20:22:07 -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 1rr5R4-00033E-RH for guix-patches@gnu.org; Sun, 31 Mar 2024 20:22:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rr5R7-000741-Dl; Sun, 31 Mar 2024 20:22:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70107] [PATCH 2/3] gnu: blueprint-compiler: Update to 0.12.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 01 Apr 2024 00:22:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70107@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, vivien@planete-kraus.eu Received: via spool by 70107-submit@debbugs.gnu.org id=B70107.171193087126850 (code B ref 70107); Mon, 01 Apr 2024 00:22:05 +0000 Received: (at 70107) by debbugs.gnu.org; 1 Apr 2024 00:21:11 +0000 Received: from localhost ([127.0.0.1]:49059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr5QE-0006yz-Qk for submit@debbugs.gnu.org; Sun, 31 Mar 2024 20:21:11 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:44212) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rr5Q8-0006xX-4g for 70107@debbugs.gnu.org; Sun, 31 Mar 2024 20:21:04 -0400 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-56c404da0ebso5169661a12.0 for <70107@debbugs.gnu.org>; Sun, 31 Mar 2024 17:21:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711930855; x=1712535655; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=LB8I1hQyWw2ZmzKr0HMHPzi38QJVkyG5jXY8j8bBi5s=; b=RFfmzQnqODLNwRZQr0OqL4HRb/ebo710x/HzxWQnOtb6Kf+rcjc9vhtVVZ1AaariLU 6AW7WKh3Gpsx7G2cctakogrienkH+AxrXjI7h92H3Gs9sC4Sur7qG1ZRQJj3RlCHed0u A/EOrwllpqwIAEslT/je7zyp6X2IsT8HAQus9PbHwoPcol4+9ODfVkXq09puv0AG3hdF qgTH3GXHBLI2C/3mXzwgb9R9Ss1ZLdMtombpQz4OZgvnPOpsGfihMJ6FI2QnYId8eyMn FWX5/NTwPcqYwiqrW9InE/95DJbAFyK3OfUdhMGIgcdOTwiRXMwnZfmaKFoI5Qs3ttXn TFLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711930855; x=1712535655; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LB8I1hQyWw2ZmzKr0HMHPzi38QJVkyG5jXY8j8bBi5s=; b=Y3NMpuGUuRlGGnCX/SGyNHRnlMEJJSrvyByHhBX5QBel0dvFCv/ewt2p3q79032esb qiMeIA7LVVCkz9YsJ65MwLfoBL0tdxTdjedboHdkhNM27WzST4/z9+3Wslm09J4pyTl4 uFl+AmdRm/zf4DzFOxrRUzqqgC7n1YbPLdmPBPqBgZD9YuzaNmhSeM+d36ARpbTe6Fx7 3Qgtt+dZA7eTrxId8DDh3HP1dbCaeYkGLvK1px3xDhsP8OWtsRswinP5OXSCToaV7UZL HkUpCpR5WcsStIx7lZapzutCoeDEhTniwtzbUE3AzYue67Gi1AM8Y4Tm0BfOorBuZ15h VqxQ== X-Gm-Message-State: AOJu0YxSi4tJ89yXM5kRyqVxc1XBlnMwGCtoceGKZmh/H5ncOIr5RqFI /cRWOfDUdcZiZF99sXzEfbszd+OoFNqSKExUD2Gdv+xy6YmD12S+TECLfMV2kLs= X-Google-Smtp-Source: AGHT+IEiyBZhdzPksS54QIdwg6oB/zqgDpsuRuHYkTvjGP1rjlBnqioH13Pyl6/Ey0reDt0icBl8zg== X-Received: by 2002:a50:d506:0:b0:568:99fb:1db4 with SMTP id u6-20020a50d506000000b0056899fb1db4mr5135631edi.17.1711930855284; Sun, 31 Mar 2024 17:20:55 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q4-20020aa7cc04000000b0056c1c4b870asm4825113edt.16.2024.03.31.17.20.54 for <70107@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Mar 2024 17:20:54 -0700 (PDT) Message-ID: <55d1171e5191a507233c364dec77205c895d4cb9.1711896729.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 31 Mar 2024 16:48:21 +0200 MIME-Version: 1.0 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/gnome.scm (blueprint-compiler): Update to 0.12.0. [arguments]: Remove ‘wrap-gi’ phase, add ‘pre-check’. [native-inputs]: Add libadwaita and xorg-server-for-tests. Reindent. --- gnu/packages/gnome.scm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 42f758f8d8..8cf138b650 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3278,7 +3278,7 @@ (define-public glade3 (define-public blueprint-compiler (package (name "blueprint-compiler") - (version "0.4.0") + (version "0.12.0") (source (origin (method git-fetch) (uri (git-reference @@ -3288,7 +3288,7 @@ (define-public blueprint-compiler (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0hj7f4xhwjc4x32r3lswwclbw37fw3spy806g4plkmym25hz4ydy")))) + "15cm2bksmygf8sifryrawxxblvvw27p4w3m42gvp3jlq50a15xm6")))) (build-system meson-build-system) (arguments (list @@ -3303,13 +3303,15 @@ (define-public blueprint-compiler #~(modify-phases %standard-phases (add-after 'wrap 'wrap-python (assoc-ref python:%standard-phases 'wrap)) - (add-after 'wrap-python 'wrap-gi - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program (string-append out "/bin/blueprint-compiler") - `("GI_TYPELIB_PATH" ":" suffix (,gi-typelib-path))))))))) - (native-inputs (list gtk python-pygobject python)) + (add-before 'check 'pre-check + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) + (native-inputs (list gtk + libadwaita + python + python-pygobject + xorg-server-for-tests)) (inputs (list python)) (synopsis "Template markup language") (description