Update vcmi to 1.5.7.

  • Done
  • quality assurance status badge
Details
2 participants
  • Maxim Cournoyer
  • Vagrant Cascadian
Owner
unassigned
Submitted by
Vagrant Cascadian
Severity
normal

Debbugs page

Vagrant Cascadian wrote 6 months ago
(address . guix-patches@gnu.org)
87plpcm7so.fsf@wireframe
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.
---
gnu/packages/games.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

Toggle diff (38 lines)
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
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZt/QBwAKCRDcUY/If5cW
qjXXAP9wdWrj3JyV+Ca3hiTXFqPvdrIqfpW7F65RFqFRsyyyLgEAmoBJgTft3bIV
yuwtd+6Ut/ehqr4ESqEE52fL8IYbWQ8=
=M9bL
-----END PGP SIGNATURE-----

Maxim Cournoyer wrote 6 months ago
(name . Vagrant Cascadian)(address . vagrant@debian.org)
87v7z45avc.fsf@gmail.com
Hi Vagrant,

Vagrant Cascadian <vagrant@debian.org> writes:

Toggle quote (16 lines)
> 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
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 73162@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 73162
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help