GNU bug report logs - #68143
[PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68143 in the body.
You can then email your comments to 68143 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling.
Date: Sat, 30 Dec 2023 18:49:11 +0800

Zheng Junjie (2):
  gnu: slurp: Fix cross-compiling.
  gnu: slurp: Update to 1.5.0.

 gnu/packages/image.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


base-commit: f76ca2b0e894c244d5011a32b30dee8fd874e322
-- 
2.41.0

Message #8 received at 68143 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 68143 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: slurp: Update to 1.5.0.
Date: Sat, 30 Dec 2023 18:52:03 +0800

* 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)
-- 
2.41.0

Message #11 received at 68143 <at> debbugs.gnu.org (full text, mbox):

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: 68143 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: slurp: Fix cross-compiling.
Date: Sat, 30 Dec 2023 18:52:02 +0800

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")
-- 
2.41.0

Message #16 received at 68143-done <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 68143-done <at> debbugs.gnu.org
Subject: Re: [bug#68143] [PATCH 0/2] slurp: Update to 1.5.0 and fix
 cross-compiling.
Date: Wed, 03 Jan 2024 15:28:26 +0100

> Zheng Junjie (2):
>   gnu: slurp: Fix cross-compiling.
>   gnu: slurp: Update to 1.5.0.

Applied, thanks,

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.