Subject: bug#68928: closed (Re: [bug#68928] [PATCH] gnu: guile-ics: Update to 0.6.0 and fix cross-compilation.)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 05 Feb 2024 07:44:02 +0000

Your bug report

#68928: [PATCH] gnu: guile-ics: Update to 0.6.0 and fix cross-compilation.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
68928: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68928
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#68928] [PATCH] gnu: guile-ics: Update to 0.6.0 and fix cross-compilation.
From: Hilton Chain <[email-masked]>
To: "Artyom V. Poptsov" <[email-masked]>
Cc: [email-masked]
Date: Mon, 05 Feb 2024 15:43:07 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi Artyom,

On Mon, 05 Feb 2024 03:24:47 +0800,
Artyom V. Poptsov wrote:
>
> [1  <multipart/mixed (7bit)>]
> [1.1  <text/plain (7bit)>]
> Hello,
>
> this patch set updates Guile-ICS to 0.6.0 and fixes cross-compilation of
> the package.

Applied as 81660f9a10f0...bab883b981c4, thank you!

Subject: [PATCH] gnu: guile-ics: Update to 0.6.0 and fix cross-compilation.
From: "Artyom V. Poptsov" <[email-masked]>
To: [email-masked]
Date: Sun, 04 Feb 2024 22:24:47 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

this patch set updates Guile-ICS to 0.6.0 and fixes cross-compilation of
the package.
From 51bdaa4af22b98de6d0dc3d79860868809d78df8 Mon Sep 17 00:00:00 2001
Message-ID: <51bdaa[email-masked]>
From: "Artyom V. Poptsov" <[email-masked]>
Date: Sun, 4 Feb 2024 22:12:28 +0300
Subject: [PATCH 1/2] gnu: guile-ics: Update to 0.6.0.

* gnu/packages/guile-xyz.scm (guile-ics): Update to 0.6.0.
  [inputs]: Remove "which".
  (guile2.2-ics) [inputs]: Remove "which".

Change-Id: I969b2dfe7f3007001930ba132821f6427a367e9e
---
 gnu/packages/guile-xyz.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index d773313636..57a4b84efe 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -38,7 +38,7 @@
 ;;; Copyright © 2021 Leo Le Bouter <[email-masked]>
 ;;; Copyright © 2021 Zelphir Kaltstahl <[email-masked]>
 ;;; Copyright © 2021 Oleg Pykhalov <[email-masked]>
-;;; Copyright © 2021, 2022 Artyom V. Poptsov <[email-masked]>
+;;; Copyright © 2021, 2022, 2024 Artyom V. Poptsov <[email-masked]>
 ;;; Copyright © 2022 Maxime Devos <[email-masked]>
 ;;; Copyright © 2022 Zhu Zihao <[email-masked]>
 ;;; Copyright © 2022 Antero Mejr <[email-masked]>
@@ -2175,7 +2175,7 @@ (define-public guile-hall
 (define-public guile-ics
   (package
     (name "guile-ics")
-    (version "0.5.0")
+    (version "0.6.0")
     (source
      (origin
        (method git-fetch)
@@ -2185,7 +2185,7 @@ (define-public guile-ics
        (file-name (string-append name "-" version "-checkout"))
        (sha256
         (base32
-         "1ipryn69ad4viqai9pnwhkqqpf9wgw0m2qxrwkfrpm1bfdyilw9w"))))
+         "1gkz19iz3ncf9ddr731lsaw12ca7ygj3dxziz54s9xpp5cw19r0v"))))
     (build-system gnu-build-system)
     (arguments
      (list #:phases #~(modify-phases %standard-phases
@@ -2197,7 +2197,7 @@ (define-public guile-ics
            gettext-minimal ;Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
            help2man
            pkg-config))
-    (inputs (list guile-3.0 which))
+    (inputs (list guile-3.0))
     (propagated-inputs (list guile-lib guile-smc guile-dsv))
     (home-page "https://github.com/artyom-poptsov/guile-ics")
     (synopsis "Guile parser library for the iCalendar format")
@@ -2213,7 +2213,7 @@ (define-public guile2.2-ics
   (package
     (inherit guile-ics)
     (name "guile2.2-ics")
-    (inputs (list guile-2.2 which))
+    (inputs (list guile-2.2))
     (propagated-inputs (list guile2.2-lib guile2.2-dsv guile2.2-smc))))
 
 (define-public guile-imanifest

base-commit: abeffc82379c4f9bd2e6226ea27453b22cb4e0c8
-- 
2.41.0

From d9c6763db49ba99c69d866d556a1dbabd53f2264 Mon Sep 17 00:00:00 2001
Message-ID: <d9c676[email-masked]>
In-Reply-To: <51bdaa[email-masked]>
References: <51bdaa[email-masked]>
From: "Artyom V. Poptsov" <[email-masked]>
Date: Sun, 4 Feb 2024 22:22:10 +0300
Subject: [PATCH 2/2] gnu: guile-ics: Fix cross-compilation.

* gnu/packages/guile-xyz.scm (guile-ics): Fix cross-compilation.
  [native-inputs]: Add "guile-3.0", "guile-lib" and "guile-smc".
  (guile2.2-ics) [native-inputs]: Replace the inputs needed for
  cross-compilation with the same ones but for Guile 2.2.

Change-Id: Ie35f8087b1db30992f63edac8d303f854139ecbf
---
 gnu/packages/guile-xyz.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 57a4b84efe..ce0affdaea 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2196,7 +2196,11 @@ (define-public guile-ics
            texinfo
            gettext-minimal ;Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
            help2man
-           pkg-config))
+           pkg-config
+           ;; needed when cross-compiling.
+           guile-3.0
+           guile-lib
+           guile-smc))
     (inputs (list guile-3.0))
     (propagated-inputs (list guile-lib guile-smc guile-dsv))
     (home-page "https://github.com/artyom-poptsov/guile-ics")
@@ -2213,6 +2217,11 @@ (define-public guile2.2-ics
   (package
     (inherit guile-ics)
     (name "guile2.2-ics")
+    (native-inputs
+     (modify-inputs (package-native-inputs guile-ics)
+       (replace "guile" guile-2.2)
+       (replace "guile-lib" guile2.2-lib)
+       (replace "guile-smc" guile2.2-smc)))
     (inputs (list guile-2.2))
     (propagated-inputs (list guile2.2-lib guile2.2-dsv guile2.2-smc))))
 
-- 
2.41.0

Thanks,
- avp

-- 
Artyom "avp" Poptsov <[email-masked]>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F