[bug#71155] Update vcmi to 1.5.1

[bug#71155] Update vcmi to 1.5.1

[Vagrant Cascadian]

[-- Attachment #1.1: Type: text/plain, Size: 263 bytes --]

Updated vcmi. Needed to disable a feature that requires an embedded copy
of innoextract via git submodules. Would require significant reworking
to use the guix-shipped innoextract.

Have not actually play-tested yet, but will get to that...

live well,
  vagrant

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-vcmi-Update-to-1.5.1.patch --]
[-- Type: text/x-diff, Size: 1661 bytes --]

From b202245d60130728b861df08a79e2450cd778ad3 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Thu, 23 May 2024 14:23:47 -0700
Subject: [PATCH] gnu: vcmi: Update to 1.5.1.

* gnu/packages/games.scm (vcmi): Update to 1.5.1.
[#:configure-flags]: Disable use of embedded innoextract.
---
 gnu/packages/games.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 03a36a8a6d..73d1ffc008 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11467,7 +11467,7 @@ (define-public fheroes2
 (define-public vcmi
   (package
     (name "vcmi")
-    (version "1.4.5")
+    (version "1.5.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11476,11 +11476,11 @@ (define-public vcmi
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1z4vy3drj6dra8rb243pyryr61jnlw3l7yxsxwl9rddv8cdk69lz"))
+                "1s3a23p9k081ccbkhvifx2rhg6rv82fkrsbjh6allmmsa1lhq6fd"))
               (patches (search-patches "vcmi-disable-privacy-breach.patch"))))
     (build-system cmake-build-system)
     (arguments
-     (list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=OFF")
+     (list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=OFF" "-DENABLE_INNOEXTRACT=OFF")
            ;; Test suites do not seem well supported upstream and are disabled by default.
            ;; Pass -DENABLE_TEST to configure to enable.
            #:tests? #f))

base-commit: 9901416233867233192b63fde7f616751127b189
-- 
2.39.2


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

[bug#71155] Update vcmi to 1.5.1

[宋文武 via Guix-patches via]

Vagrant Cascadian <vagrant@debian.org> writes:

> Updated vcmi. Needed to disable a feature that requires an embedded copy
> of innoextract via git submodules. Would require significant reworking
> to use the guix-shipped innoextract.

Look good to me, please push, thank you!

bug#71155: Update vcmi to 1.5.1

[Vagrant Cascadian]

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

On 2024-05-24, 宋文武 wrote:
> Vagrant Cascadian <vagrant@debian.org> writes:
>
>> Updated vcmi. Needed to disable a feature that requires an embedded copy
>> of innoextract via git submodules. Would require significant reworking
>> to use the guix-shipped innoextract.
>
> Look good to me, please push, thank you!

Thanks for the review!

Pushed as 94c8cec99969fe9f65777637fde1f05e1c576a3f.

live well,
  vagrant

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]