[bug#58670] [PATCH 1/2] gnu: yoshimi: Update to 2.2.2.1

[bug#58670] [PATCH 1/2] gnu: yoshimi: Update to 2.2.2.1

[Sughosha via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 13 bytes --]

Empty Message

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-yoshimi-Update-to-2.2.2.1.patch --]
[-- Type: text/x-patch; name=0001-gnu-yoshimi-Update-to-2.2.2.1.patch, Size: 1166 bytes --]

From 34e7f49c29c1659b1edbf4bcdeeedd01891c05ec Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Thu, 20 Oct 2022 21:54:32 +0200
Subject: [PATCH 1/2] gnu: yoshimi: Update to 2.2.2.1

* gnu/packages/music.scm (yoshimi): Update to 2.2.2.1.
---
 gnu/packages/music.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 6b37c79389..c1355bfbf4 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3038,7 +3038,7 @@ (define-public zynaddsubfx
 (define-public yoshimi
   (package
     (name "yoshimi")
-    (version "1.7.4")
+    (version "2.2.2.1")
     (source
      (origin
        (method url-fetch)
@@ -3046,7 +3046,7 @@ (define-public yoshimi
                            (version-major+minor version)
                            "/yoshimi-" version ".tar.bz2"))
        (sha256
-        (base32 "0lxfqj4p4njww3n0wa6yfj38zfls16y3wszd47gvc5asmqyg5vjd"))))
+        (base32 "1axrbk1qwsiq77g5957db744481zb2v158psnk2w530wxhls2442"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ; there are no tests
-- 
2.38.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-yoshimi-Fix-preset-paths-and-viewing-manual.patch --]
[-- Type: text/x-patch; name=0002-gnu-yoshimi-Fix-preset-paths-and-viewing-manual.patch, Size: 1641 bytes --]

From 793e0b3abd7460a52c5a8e810f7b45322d3f84ca Mon Sep 17 00:00:00 2001
From: Sughosha <sughosha@proton.me>
Date: Thu, 20 Oct 2022 22:34:24 +0200
Subject: [PATCH 2/2] gnu: yoshimi: Fix preset paths and viewing manual

* gnu/packages/music.scm (yoshimi)
[arguments]: Fix preset paths.
[propagated-inputs]: Add xdg-utils.
---
 gnu/packages/music.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index c1355bfbf4..f69277875a 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3060,6 +3060,13 @@ (define-public yoshimi
          ;; Move SSE compiler optimization flags from generic target to
          ;; athlon64 and core2 targets, because otherwise the build would fail
          ;; on non-Intel machines.
+         (add-after 'unpack 'fix-paths
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* (list "src/Interface/InterChange.cpp"
+                                "src/Misc/Bank.cpp"
+                                "src/Misc/Config.cpp")
+               (("/usr/share") (string-append (assoc-ref outputs "out")
+                                              "/share")))))
          (add-after 'unpack 'remove-sse-flags-from-generic-target
            (lambda _
              (substitute* "src/CMakeLists.txt"
@@ -3083,6 +3090,8 @@ (define-public yoshimi
        ("zlib" ,zlib)))
     (native-inputs
      (list pkg-config))
+    (propagated-inputs
+     (list xdg-utils)) ; to view manual
     (home-page "http://yoshimi.sourceforge.net/")
     (synopsis "Multi-paradigm software synthesizer")
     (description
-- 
2.38.0

bug#58670: [PATCH 1/2] gnu: yoshimi: Update to 2.2.2.1

[Ludovic Courtès]

Hi,

Sughosha <Sughosha@proton.me> skribis:

> From 34e7f49c29c1659b1edbf4bcdeeedd01891c05ec Mon Sep 17 00:00:00 2001
> From: Sughosha <sughosha@proton.me>
> Date: Thu, 20 Oct 2022 21:54:32 +0200
> Subject: [PATCH 1/2] gnu: yoshimi: Update to 2.2.2.1
>
> * gnu/packages/music.scm (yoshimi): Update to 2.2.2.1.

[...]

> From 793e0b3abd7460a52c5a8e810f7b45322d3f84ca Mon Sep 17 00:00:00 2001
> From: Sughosha <sughosha@proton.me>
> Date: Thu, 20 Oct 2022 22:34:24 +0200
> Subject: [PATCH 2/2] gnu: yoshimi: Fix preset paths and viewing manual
>
> * gnu/packages/music.scm (yoshimi)
> [arguments]: Fix preset paths.
> [propagated-inputs]: Add xdg-utils.

Applied both.  However, I removed this bit:

> +    (propagated-inputs
> +     (list xdg-utils)) ; to view manual

Because we wouldn’t, for example, propagate Emacs with a package that
has an Info manual, or propagate IceCat with a package that has an HTML
manual.  It’s similar here IMO.

Thanks,
Ludo’.