From patchwork Sat Dec 30 11:07:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 58207 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 8E74427BBEA; Sat, 30 Dec 2023 11:09:23 +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,URIBL_BLOCKED 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 EF6AB27BBE2 for ; Sat, 30 Dec 2023 11:09:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJXDD-0005Ry-Bj; Sat, 30 Dec 2023 06:09: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 1rJXDC-0005Rq-Gd for guix-patches@gnu.org; Sat, 30 Dec 2023 06:09: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 1rJXDC-0000Us-8Y for guix-patches@gnu.org; Sat, 30 Dec 2023 06:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJXDC-0003Es-MK for guix-patches@gnu.org; Sat, 30 Dec 2023 06:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68144] [PATCH 1/2] gnu: grim: Update to 1.4.1. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 11:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68144@debbugs.gnu.org Received: via spool by 68144-submit@debbugs.gnu.org id=B68144.170393451612409 (code B ref 68144); Sat, 30 Dec 2023 11:09:02 +0000 Received: (at 68144) by debbugs.gnu.org; 30 Dec 2023 11:08:36 +0000 Received: from localhost ([127.0.0.1]:43192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJXCl-0003E0-Jt for submit@debbugs.gnu.org; Sat, 30 Dec 2023 06:08:35 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:58322 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJXCj-0003Dc-9J for 68144@debbugs.gnu.org; Sat, 30 Dec 2023 06:08:34 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowAC3F0Eb+Y9l_p1NAg--.17063S2; Sat, 30 Dec 2023 19:03:56 +0800 (CST) From: Zheng Junjie Date: Sat, 30 Dec 2023 19:07:19 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: qwCowAC3F0Eb+Y9l_p1NAg--.17063S2 X-Coremail-Antispam: 1UD129KBjvJXoW7tw1ftw4fKrW5WF18tw4xZwb_yoW8GFWUpF savr1UKFn5Kryft348JF409F1YgrZ7GF90y3yqyw48Ca12qF4kCry2vrWrtFsrJFs7Wa98 ua18Za15XF48GaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUySb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVAC Y4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJV W8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l 4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67 AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8I cVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI 8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v2 6r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07j8BMNUUUUU= 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 (grim): Update to 1.4.1. [home-page]: update to new home-page [source]: update url. Change-Id: I8c2e4ebbf198df7cedda7c1c946ecb33a6e92fb1 --- gnu/packages/image.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 79f1a293ec..843181a941 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2225,20 +2225,20 @@ (define-public jp2a (define-public grim (package (name "grim") - (version "1.4.0") + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emersion/grim") + (url "https://git.sr.ht/~emersion/grim") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1b1k5cmmk7gzis0rncyl98lnhdwpjkdsv9pada5mmgxcpka6f0lp")))) + (base32 "1snp4qlj05d0nx4f0qr8kywv0i1xcw5i278ybng1rand2alhkjz5")))) (build-system meson-build-system) (native-inputs (list pkg-config scdoc)) (inputs (list pixman libpng libjpeg-turbo wayland wayland-protocols)) - (home-page "https://github.com/emersion/grim") + (home-page "https://sr.ht/~emersion/grim/") (synopsis "Create screenshots from a Wayland compositor") (description "grim can create screenshots from a Wayland compositor.") ;; MIT license. From patchwork Sat Dec 30 11:07:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 58206 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 F177C27BBEA; Sat, 30 Dec 2023 11:09:08 +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,URIBL_BLOCKED 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 7E0E027BBE2 for ; Sat, 30 Dec 2023 11:09:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJXDE-0005SU-Dy; Sat, 30 Dec 2023 06:09: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 1rJXDC-0005Ri-3n for guix-patches@gnu.org; Sat, 30 Dec 2023 06:09: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 1rJXDB-0000Uk-SN for guix-patches@gnu.org; Sat, 30 Dec 2023 06:09:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJXDC-0003Ek-AH for guix-patches@gnu.org; Sat, 30 Dec 2023 06:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68144] [PATCH 2/2] gnu: grim: Fix cross-compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Dec 2023 11:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68144@debbugs.gnu.org Received: via spool by 68144-submit@debbugs.gnu.org id=B68144.170393451512403 (code B ref 68144); Sat, 30 Dec 2023 11:09:02 +0000 Received: (at 68144) by debbugs.gnu.org; 30 Dec 2023 11:08:35 +0000 Received: from localhost ([127.0.0.1]:43190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJXCl-0003Dx-A9 for submit@debbugs.gnu.org; Sat, 30 Dec 2023 06:08:35 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:58320 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJXCj-0003Db-0l for 68144@debbugs.gnu.org; Sat, 30 Dec 2023 06:08:34 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowAC3F0Eb+Y9l_p1NAg--.17063S3; Sat, 30 Dec 2023 19:03:58 +0800 (CST) From: Zheng Junjie Date: Sat, 30 Dec 2023 19:07:20 +0800 Message-ID: <156951564d68d936010397aa2120529955395da6.1703934201.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: qwCowAC3F0Eb+Y9l_p1NAg--.17063S3 X-Coremail-Antispam: 1UD129KBjvdXoW7GF48Jw4xWryUuF43WFW5Awb_yoWDWwcEka yxGr4kAw4rWrW7Kw1kZFs3C3Z5Ww48J3srK3W7Kr12kF9xWw4fZFyDua4kAFyYkF109w1r tw40kryrZr4j9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb3AYjsxI4VWDJwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I 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(grim): [native-inputs]: When cross compiling, add wayland, pkg-config-for-build. Change-Id: I9dbf99d0bc92a62b17ded36937827dfbc6b29bb2 --- 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 843181a941..8cf6207c57 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2236,7 +2236,11 @@ (define-public grim (sha256 (base32 "1snp4qlj05d0nx4f0qr8kywv0i1xcw5i278ybng1rand2alhkjz5")))) (build-system meson-build-system) - (native-inputs (list pkg-config scdoc)) + (native-inputs (append (if (%current-target-system) + ;; for wayland-scanner + (list pkg-config-for-build wayland) + '()) + (list pkg-config scdoc))) (inputs (list pixman libpng libjpeg-turbo wayland wayland-protocols)) (home-page "https://sr.ht/~emersion/grim/") (synopsis "Create screenshots from a Wayland compositor")