unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#68143] [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling.
@ 2023-12-30 10:49 Zheng Junjie
  2023-12-30 10:52 ` [bug#68143] [PATCH 1/2] gnu: slurp: Fix cross-compiling Zheng Junjie
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-12-30 10:49 UTC (permalink / raw)
  To: 68143

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





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#68143] [PATCH 1/2] gnu: slurp: Fix cross-compiling.
  2023-12-30 10:49 [bug#68143] [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling Zheng Junjie
@ 2023-12-30 10:52 ` Zheng Junjie
  2023-12-30 10:52 ` [bug#68143] [PATCH 2/2] gnu: slurp: Update to 1.5.0 Zheng Junjie
  2024-01-03 14:28 ` bug#68143: [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling Mathieu Othacehe
  2 siblings, 0 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-12-30 10:52 UTC (permalink / raw)
  To: 68143

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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [bug#68143] [PATCH 2/2] gnu: slurp: Update to 1.5.0.
  2023-12-30 10:49 [bug#68143] [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling Zheng Junjie
  2023-12-30 10:52 ` [bug#68143] [PATCH 1/2] gnu: slurp: Fix cross-compiling Zheng Junjie
@ 2023-12-30 10:52 ` Zheng Junjie
  2024-01-03 14:28 ` bug#68143: [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling Mathieu Othacehe
  2 siblings, 0 replies; 4+ messages in thread
From: Zheng Junjie @ 2023-12-30 10:52 UTC (permalink / raw)
  To: 68143

* 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





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* bug#68143: [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling.
  2023-12-30 10:49 [bug#68143] [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling Zheng Junjie
  2023-12-30 10:52 ` [bug#68143] [PATCH 1/2] gnu: slurp: Fix cross-compiling Zheng Junjie
  2023-12-30 10:52 ` [bug#68143] [PATCH 2/2] gnu: slurp: Update to 1.5.0 Zheng Junjie
@ 2024-01-03 14:28 ` Mathieu Othacehe
  2 siblings, 0 replies; 4+ messages in thread
From: Mathieu Othacehe @ 2024-01-03 14:28 UTC (permalink / raw)
  To: Zheng Junjie; +Cc: 68143-done


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

Applied, thanks,

Mathieu




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-01-03 14:29 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-30 10:49 [bug#68143] [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling Zheng Junjie
2023-12-30 10:52 ` [bug#68143] [PATCH 1/2] gnu: slurp: Fix cross-compiling Zheng Junjie
2023-12-30 10:52 ` [bug#68143] [PATCH 2/2] gnu: slurp: Update to 1.5.0 Zheng Junjie
2024-01-03 14:28 ` bug#68143: [PATCH 0/2] slurp: Update to 1.5.0 and fix cross-compiling Mathieu Othacehe

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).