GNU bug report logs - #73162
Update vcmi to 1.5.7.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73162 in the body.
You can then email your comments to 73162 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> debian.org>
To: guix-patches <at> gnu.org
Cc: iyzsong <at> envs.net, liliana.prikler <at> gmail.com, adam.faiz <at> disroot.org
Subject: Update vcmi to 1.5.7.
Date: Mon, 09 Sep 2024 21:50:15 -0700

[Message part 1 (text/plain, inline)]

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

[0001-gnu-vcmi-Update-to-1.5.7.patch (text/x-diff, inline)]

From 72c5e9e79d7f9b51508c97d5d9d3b5fda7e02a0f Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant <at> 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

[signature.asc (application/pgp-signature, inline)]

Message #10 received at 73162-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Vagrant Cascadian <vagrant <at> debian.org>
Cc: 73162-done <at> debbugs.gnu.org, adam.faiz <at> disroot.org,
 liliana.prikler <at> gmail.com, iyzsong <at> envs.net
Subject: Re: bug#73162: Update vcmi to 1.5.7.
Date: Tue, 10 Sep 2024 14:35:51 +0900

Hi Vagrant,

Vagrant Cascadian <vagrant <at> 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 <at> 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.