From patchwork Tue Sep 10 04:50:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 67847 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 12CEB27BBEA; Tue, 10 Sep 2024 05:51:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D5EFF27BBE2 for ; Tue, 10 Sep 2024 05:51:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snsqD-0003P9-MT; Tue, 10 Sep 2024 00:51:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snsqA-0003Ou-7O for guix-patches@gnu.org; Tue, 10 Sep 2024 00:50:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snsq9-0002o5-Ur for guix-patches@gnu.org; Tue, 10 Sep 2024 00:50:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=/TnRF5G0YNbvQMY+fIg5dhxpfL6/H0tCyzu/hhWP/E0=; b=APl+gkVwKqfA3b9J3EJAwD2YcXoYwUcWH+Q8zNSOTpa4zxa5bbw+7/6yJQWtQzf9LGt58hbXYgFkf62/7Jel8K8D557Jcfippwq39aF0R7yuX7q7A2IkKlAON7O7Av3KYYE/AvzpofHcpCDOmBKkWSvk2i4xEWvXprJyVLppnfjoVK3BYC4FuiupWhb7eIoAmbqUfMfLypG2407v4tIf/p0Jp5CI5urkF3Q8Wuz5XMTIRaPmArjKYaaMAT+T38RsoLaCu2DU66S6DqFoxIcE8+m2w1rfDfRwtJH0ZFsLsUpqx0wVhBqriBniEFrOrx1lzzhizZB+9KVnp+8rsPOzbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snsqE-0002cz-Cb for guix-patches@gnu.org; Tue, 10 Sep 2024 00:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73162] Update vcmi to 1.5.7. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Sep 2024 04:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73162 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 73162@debbugs.gnu.org Cc: iyzsong@envs.net, liliana.prikler@gmail.com, adam.faiz@disroot.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172594384410074 (code B ref -1); Tue, 10 Sep 2024 04:51:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Sep 2024 04:50:44 +0000 Received: from localhost ([127.0.0.1]:34600 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snspw-0002cQ-1V for submit@debbugs.gnu.org; Tue, 10 Sep 2024 00:50:44 -0400 Received: from lists.gnu.org ([209.51.188.17]:47018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snspv-0002cJ-4e for submit@debbugs.gnu.org; Tue, 10 Sep 2024 00:50:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snspq-0003Nl-E1 for guix-patches@gnu.org; Tue, 10 Sep 2024 00:50:38 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snspo-0002mq-Iw for guix-patches@gnu.org; Tue, 10 Sep 2024 00:50:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1725943831; bh=JtvKWuRalXav2mMrxPhzCUjrm0hr1J4uMwO/7tCQPGY=; h=From:To:Cc:Subject:Date:From; b=G1NRJ7LuK3/PGPmSBqvSQ8wHQsfKQbxwDJjtFtI2XtPT/7vhwOU6l5m04qORhr5vC UDBpGWfF5+yWqDPSbbPjAz0yxbDoywfEKddpjMUIIvXzHhpeh8yATy3meN+DLZ3zOu xT3Ui8O5c/2CXLN0+MUf6MkO8io0O45sYJWX+7pRsRVekiN5CJO+S16uoh56ASvwcE P33wiSb7uF9bU5KgBeumzqb9VDF+Ee7UrKp1SyHPiZ8X1sBnzgOVhSyRmZvWAxxCmm q0Uq4pSD8UPrPbeBysfDji50bovbGbSVgxCdg3ZjwStdRg/V441+jSXxJ0A2tCnGXF ytHr1r875oxsA== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) by cascadia.aikidev.net (Postfix) with ESMTPSA id BB117192A; Mon, 9 Sep 2024 21:50:31 -0700 (PDT) From: Vagrant Cascadian Date: Mon, 09 Sep 2024 21:50:15 -0700 Message-ID: <87plpcm7so.fsf@wireframe> MIME-Version: 1.0 Received-SPF: none client-ip=173.255.214.101; envelope-from=vagrant@debian.org; helo=cascadia.aikidev.net X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.141, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 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