[bug#68144] [PATCH 0/2] gnu: grim: Update to 1.4.1 and fix cross-compiling

[bug#68144] [PATCH 0/2] gnu: grim: Update to 1.4.1 and fix cross-compiling

[Zheng Junjie]

Zheng Junjie (2):
  gnu: grim: Update to 1.4.1.
  gnu: grim: Fix cross-compiling.

 gnu/packages/image.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)


base-commit: f76ca2b0e894c244d5011a32b30dee8fd874e322
-- 
2.41.0

[bug#68144] [PATCH 1/2] gnu: grim: Update to 1.4.1.

[Zheng Junjie]

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

[bug#68144] [PATCH 2/2] gnu: grim: Fix cross-compiling.

[Zheng Junjie]

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

bug#68144: [PATCH 0/2] gnu: grim: Update to 1.4.1 and fix cross-compiling

[Mathieu Othacehe]

> Zheng Junjie (2):
>   gnu: grim: Update to 1.4.1.
>   gnu: grim: Fix cross-compiling.

Applied, thanks,

Mathieu