From b6d5a7f5836739dab884b49a64ca354794dd845f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 9 Sep 2024 21:50:15 -0700 Subject: Update vcmi to 1.5.7. [[PGP Signed Part:No public key for DC518FC87F9716AA created at 2024-09-10T13:50:15+0900 using EDDSA]] 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 [2. text/x-diff; 0001-gnu-vcmi-Update-to-1.5.7.patch] From 72c5e9e79d7f9b51508c97d5d9d3b5fda7e02a0f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian 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. Signed-off-by: Maxim Cournoyer --- 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 7f0debac07..26ddde50fe 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11491,7 +11491,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.") (define-public vcmi (package (name "vcmi") - (version "1.5.1") + (version "1.5.7") (source (origin (method git-fetch) (uri (git-reference @@ -11500,7 +11500,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.") (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 @@ -11518,9 +11518,8 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.") 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 -- cgit v1.2.3