[bug#73162] Update vcmi to 1.5.7.

[bug#73162] Update vcmi to 1.5.7.

[Vagrant Cascadian]

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

The attached patch updates vcmi to 1.5.7 and works with QT6 instead of
QT5 (maybe due to fixes in vcmi, maybe due to core-updates merge).

Did more play testing that I had planned...

live well,
  vagrant

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

From 72c5e9e79d7f9b51508c97d5d9d3b5fda7e02a0f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
Date: Mon, 9 Sep 2024 17:02:02 -0700
Subject: [PATCH] gnu: vcmi: Update to 1.5.7.

* gnu/packages/games.scm (vcmi): Update to 1.5.7.
[native-inputs]: Use qtbase and qtools instead of the QT5 variants.
---
 gnu/packages/games.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 30057a4f4a..1a55516a68 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11513,7 +11513,7 @@ (define-public fheroes2
 (define-public vcmi
   (package
     (name "vcmi")
-    (version "1.5.1")
+    (version "1.5.7")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -11522,7 +11522,7 @@ (define-public vcmi
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1s3a23p9k081ccbkhvifx2rhg6rv82fkrsbjh6allmmsa1lhq6fd"))
+                "0jgxhq6rz43ild16lmpcf6xbzdhilxpbvknlxy92sxfazyarcg07"))
               (patches (search-patches "vcmi-disable-privacy-breach.patch"))))
     (build-system cmake-build-system)
     (arguments
@@ -11540,9 +11540,8 @@ (define-public vcmi
            minizip
            pkg-config
            python
-           ;; XXX: Build currently fails with qtbase-6 and qttools-6
-           qtbase-5
-           qttools-5
+           qtbase
+           qttools
            sdl2
            sdl2-mixer
            sdl2-image

base-commit: b7d845c18fbadb8bd2e0b6bbd3b4ddfa0416a3ab
-- 
2.39.2


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

bug#73162: Update vcmi to 1.5.7.

[Maxim Cournoyer]

Hi Vagrant,

Vagrant Cascadian <vagrant@debian.org> writes:

> The attached patch updates vcmi to 1.5.7 and works with QT6 instead of
> QT5 (maybe due to fixes in vcmi, maybe due to core-updates merge).
>
> Did more play testing that I had planned...
>
> live well,
>   vagrant
>
> From 72c5e9e79d7f9b51508c97d5d9d3b5fda7e02a0f Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagrant@debian.org>
> Date: Mon, 9 Sep 2024 17:02:02 -0700
> Subject: [PATCH] gnu: vcmi: Update to 1.5.7.
>
> * gnu/packages/games.scm (vcmi): Update to 1.5.7.
> [native-inputs]: Use qtbase and qtools instead of the QT5 variants.

Well done! I've built it and applied it locally, will push shortly.

-- 
Thanks,
Maxim

Re: bug#73162: Update vcmi to 1.5.7.

[Maxim Cournoyer]

+CC guix-devel

Hi Vagrant,

Vagrant Cascadian <vagrant@debian.org> writes:

> On 2024-09-10, Maxim Cournoyer wrote:
>> Vagrant Cascadian <vagrant@debian.org> writes:
>>> From 72c5e9e79d7f9b51508c97d5d9d3b5fda7e02a0f Mon Sep 17 00:00:00 2001
>>> From: Vagrant Cascadian <vagrant@debian.org>
>>> Date: Mon, 9 Sep 2024 17:02:02 -0700
>>> Subject: [PATCH] gnu: vcmi: Update to 1.5.7.
>>>
>>> * gnu/packages/games.scm (vcmi): Update to 1.5.7.
>>> [native-inputs]: Use qtbase and qtools instead of the QT5 variants.
>>
>> Well done! I've built it and applied it locally, will push shortly.
>
> Thanks for the swift review! :)
>
> Marking it as done seems a bit premature; it does not appear to have
> landed in master yet. I usually send the -done emails *after* I have
> successfully pushed. :)

Sorry, I was holding the commits while attempting to bundle more
together, and it took more time than expected. I look forward to have
that auto-close feature added, the one discussed before that would use
the Change-Id to infer series fully merged [0], and close them
automatically :-).

[0]  https://yhetil.org/guix/87a5tszust.fsf@gmail.com/

-- 
Thanks,
Maxim