From patchwork Sat Dec 30 10:52:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58204 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 1A96927BBE9; Sat, 30 Dec 2023 10:54:18 +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=-2.9 required=5.0 tests=BAYES_00,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 A3BD127BBE2 for ; Sat, 30 Dec 2023 10:54:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJWyh-0002w9-T8; Sat, 30 Dec 2023 05:54:03 -0500 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 1rJWyg-0002vo-V3 for guix-patches@gnu.org; Sat, 30 Dec 2023 05:54:02 -0500 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 1rJWyg-0004Vf-NX for guix-patches@gnu.org; Sat, 30 Dec 2023 05:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJWyh-0000FA-4E for guix-patches@gnu.org; Sat, 30 Dec 2023 05:54:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68143] [PATCH 1/2] gnu: slurp: Fix cross-compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 10:54:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68143 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68143@debbugs.gnu.org Received: via spool by 68143-submit@debbugs.gnu.org id=B68143.1703933601861 (code B ref 68143); Sat, 30 Dec 2023 10:54:03 +0000 Received: (at 68143) by debbugs.gnu.org; 30 Dec 2023 10:53:21 +0000 Received: from localhost ([127.0.0.1]:43139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJWy1-0000Dj-2Q for submit@debbugs.gnu.org; Sat, 30 Dec 2023 05:53:21 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:57006 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJWxz-0000DN-0F for 68143@debbugs.gnu.org; Sat, 30 Dec 2023 05:53:20 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowABXX7+K9Y9lnOtMAg--.15253S2; Sat, 30 Dec 2023 18:48:42 +0800 (CST) From: Zheng Junjie Date: Sat, 30 Dec 2023 18:52:02 +0800 Message-ID: <0366ecb010fb23ae757b8ab0552ff49538211d07.1703933263.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: qwCowABXX7+K9Y9lnOtMAg--.15253S2 X-Coremail-Antispam: 1UD129KBjvdXoW7GF48Jw1xuw43uF15uF1UAwb_yoWfZFcE93 9rXr1kAw4FgFWUG3W8ZFn7Grn5Wa1xX3srK3ZrKF1IkF9xXw4fZFyDXFykAF1YgF40qw1S qws5KF1rZr4I9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbFAYjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I 8E87Iv6xkF7I0E14v26r4UJVWxJr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xv F2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r 4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCF x2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14 v26r106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY 67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2 IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_ Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8c6pPUUUUU== X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/image.scm(slurp): [native-inputs]: When cross compiling, add wayland, pkg-config-for-build. Change-Id: I5000d681b1428c5b7d123239c1f1ba00f121fb7e --- gnu/packages/image.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 79f1a293ec..9179cb8b90 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2259,7 +2259,11 @@ (define-public slurp (base32 "1i6g4dfiv2mwkjvvrx3wizb1n05xmd4j9nkhdii4klwd1gdrhjwd")))) (build-system meson-build-system) (native-inputs - (list pkg-config scdoc)) + (append (if (%current-target-system) + ;; for wayland-scanner + (list wayland pkg-config-for-build) + '()) + (list pkg-config scdoc))) (inputs (list cairo libxkbcommon wayland wayland-protocols)) (home-page "https://github.com/emersion/slurp") From patchwork Sat Dec 30 10:52:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58205 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 7402627BBEA; Sat, 30 Dec 2023 10:54:27 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 16F1C27BBE2 for ; Sat, 30 Dec 2023 10:54:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJWyi-0002wX-66; Sat, 30 Dec 2023 05:54:04 -0500 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 1rJWyg-0002vg-Fb for guix-patches@gnu.org; Sat, 30 Dec 2023 05:54:02 -0500 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 1rJWyg-0004VZ-7a for guix-patches@gnu.org; Sat, 30 Dec 2023 05:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJWyg-0000F3-LF for guix-patches@gnu.org; Sat, 30 Dec 2023 05:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68143] [PATCH 2/2] gnu: slurp: Update to 1.5.0. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 10:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68143 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68143@debbugs.gnu.org Received: via spool by 68143-submit@debbugs.gnu.org id=B68143.1703933601854 (code B ref 68143); Sat, 30 Dec 2023 10:54:02 +0000 Received: (at 68143) by debbugs.gnu.org; 30 Dec 2023 10:53:21 +0000 Received: from localhost ([127.0.0.1]:43137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJWy0-0000Dh-Q9 for submit@debbugs.gnu.org; Sat, 30 Dec 2023 05:53:21 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:57008 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJWxz-0000DO-0l for 68143@debbugs.gnu.org; Sat, 30 Dec 2023 05:53:20 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowABXX7+K9Y9lnOtMAg--.15253S3; Sat, 30 Dec 2023 18:48:43 +0800 (CST) From: Zheng Junjie Date: Sat, 30 Dec 2023 18:52:03 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: qwCowABXX7+K9Y9lnOtMAg--.15253S3 X-Coremail-Antispam: 1UD129KBjvdXoW7GF15Jr1fGF1DAw48KFy5twb_yoWftwcEy3 9xZF1ktr4kXrW0gr48CFnxtF90g3Wjvw4SgasrKr40k3Z8uw1fWF1DWrWxAa1YkF40ywna kws09ry5Zr4xujkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3AYjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j6r1xM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4 xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCa FVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC20s026xCaFV Cjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWl x4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r 1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xvaj40_Jr0_ JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJVW8JbIYCT nIWIevJa73UjIFyTuYvjxU23xhDUUUU X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/image.scm (slurp): Update to 1.5.0. Change-Id: I72a60742af26a2544ee21e052963c0a8ad549d0e --- gnu/packages/image.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 9179cb8b90..acf0cc8570 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2247,7 +2247,7 @@ (define-public grim (define-public slurp (package (name "slurp") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -2256,7 +2256,7 @@ (define-public slurp (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1i6g4dfiv2mwkjvvrx3wizb1n05xmd4j9nkhdii4klwd1gdrhjwd")))) + (base32 "0wlml42c3shma50bsvqzll7p3zn251jaf0jm59q2idks8gg1zkyq")))) (build-system meson-build-system) (native-inputs (append (if (%current-target-system)