From: Vagrant Cascadian <vagrant@debian.org>
To: 73162@debbugs.gnu.org
Cc: iyzsong@envs.net, liliana.prikler@gmail.com, adam.faiz@disroot.org
Subject: [bug#73162] Update vcmi to 1.5.7.
Date: Mon, 09 Sep 2024 21:50:15 -0700 [thread overview]
Message-ID: <87plpcm7so.fsf@wireframe> (raw)
[-- 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 --]
next reply other threads:[~2024-09-10 4:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-10 4:50 Vagrant Cascadian [this message]
2024-09-10 5:35 ` bug#73162: Update vcmi to 1.5.7 Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87plpcm7so.fsf@wireframe \
--to=vagrant@debian.org \
--cc=73162@debbugs.gnu.org \
--cc=adam.faiz@disroot.org \
--cc=iyzsong@envs.net \
--cc=liliana.prikler@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).