From patchwork Sun May 14 19:52:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 50009 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 0E1E227BBE9; Sun, 14 May 2023 20:53:45 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 455AA27BBE2 for ; Sun, 14 May 2023 20:53:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pyHmV-00031W-K0; Sun, 14 May 2023 15:53:23 -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 1pyHmU-00031M-1k for guix-patches@gnu.org; Sun, 14 May 2023 15:53:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pyHm9-0003cv-Mb for guix-patches@gnu.org; Sun, 14 May 2023 15:53:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pyHm9-0005a4-JC for guix-patches@gnu.org; Sun, 14 May 2023 15:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63435] Add vcmi 1.2.1 to games.scm Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 14 May 2023 19:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Liliana Marie Prikler , 63435@debbugs.gnu.org Cc: iyzsong@envs.net Received: via spool by 63435-submit@debbugs.gnu.org id=B63435.168409397921444 (code B ref 63435); Sun, 14 May 2023 19:53:01 +0000 Received: (at 63435) by debbugs.gnu.org; 14 May 2023 19:52:59 +0000 Received: from localhost ([127.0.0.1]:41633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyHm7-0005Zm-Bq for submit@debbugs.gnu.org; Sun, 14 May 2023 15:52:59 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:54396) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pyHm4-0005Za-0Z for 63435@debbugs.gnu.org; Sun, 14 May 2023 15:52:56 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 79DE91ACF1; Sun, 14 May 2023 12:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1684093967; bh=cyVhpb2KGr17CmTgUz0LkFHQdq+Ye8On7g/ZT7mdpKo=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ZeIVSQZVbZ+5bat78dtgeGP5lnqopzZ+V2uXS6CJkX65hyaiMCB5YGokY2wkm24WY wHvIslHlicSVE0f6bnlpWIt6VDesfvnBODQlOQygqFYptsAaaeQVEGfvnG247pWMRu +OKNYsUIPoBRHRetnpKtRkaHY3vNqiGE9+W7wRq941/OYZteFEdZYKtOudn3UBe5B7 rbAm9A1dmlBQNh0YFjizUCsIi+CvdilvGjABePyhWIS2PznJkIP1c/97thk8Y27mkY q4R4XssgAqhdLjl/gdf3UO5lyEojvz63fu4UTJJjL23EjGRmxdP6DI0xF/jNzpoVEX syW+s2q3lgPRg== From: Vagrant Cascadian In-Reply-To: <210acc39f6c1c114004aa1d79c171b1a255c5747.camel@gmail.com> References: <87a5yb4e41.fsf@wireframe> <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@gmail.com> <873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe> <9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@gmail.com> <87wn1em5ti.fsf@wireframe> <8e04176d6691bdc0996fb473b56ead31be954123.camel@gmail.com> <87ttwhm2vg.fsf@wireframe> <87r0rlm2rn.fsf@wireframe> <210acc39f6c1c114004aa1d79c171b1a255c5747.camel@gmail.com> Date: Sun, 14 May 2023 12:52:44 -0700 Message-ID: <87fs7yn10z.fsf@wireframe> MIME-Version: 1.0 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 On 2023-05-13, Liliana Marie Prikler wrote: > Am Freitag, dem 12.05.2023 um 18:35 -0700 schrieb Vagrant Cascadian: > >> + ;; Test suites do not seem well supported upstream and are >> disabled by default. >> + ;; Pass -DENABLE_TEST to configure to enable. >> + `(#:configure-flags '("-DFORCE_BUNDLED_FL=OFF") >> + #:tests? #f)) > Readjust your comment, it's misaligned now. Fixed. > Also, prefer > (list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=OFF") > #:tests? #f) > so that people after you won't have to convert it to G-Expressions. Thanks! Applied. >> + ;; qtbase and qttools @6 not currently buildable but may >> work ok > Prefer ";; XXX: Build currently fails with qtbase-6 and qttools-6". Also applied. Used "fuzzylite" for XXX... live well, vagrant From 2794eb077c325ad366667927e58cead23924fbc9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 7 May 2023 17:43:33 -0700 Subject: [PATCH 2/2] gnu: Add vcmi 1.2.1. * gnu/packages/games.scm (vcmi): New variable. * gnu/packages/patches/vcmi-disable-privacy-breach.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/games.scm | 49 +++++++++++++++++++ .../patches/vcmi-disable-privacy-breach.patch | 21 ++++++++ 3 files changed, 71 insertions(+) create mode 100644 gnu/packages/patches/vcmi-disable-privacy-breach.patch diff --git a/gnu/local.mk b/gnu/local.mk index dd6e3641a1..6ada6196be 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2031,6 +2031,7 @@ dist_patch_DATA = \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ %D%/packages/patches/vboot-utils-skip-test-workbuf.patch \ + %D%/packages/patches/vcmi-disable-privacy-breach.patch \ %D%/packages/patches/vinagre-newer-freerdp.patch \ %D%/packages/patches/vinagre-newer-rdp-parameters.patch \ %D%/packages/patches/virtuoso-ose-remove-pre-built-jar-files.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 49d1431d99..525e4a1c7b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -201,6 +201,7 @@ (define-module (gnu packages games) #:use-module (gnu packages sqlite) #:use-module (gnu packages squirrel) #:use-module (gnu packages swig) + #:use-module (gnu packages tbb) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) @@ -11218,6 +11219,54 @@ (define-public fheroes2 play; it will look for them at @file{~/.local/share/fheroes2} folder.") (license license:gpl2))) +(define-public vcmi + (package + (name "vcmi") + (version "1.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vcmi/vcmi") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f3fk1fc2wb7f2j4pxz89dzr8zjnrdh435mijia483a3bq59w7pk")) + (patches (search-patches "vcmi-disable-privacy-breach.patch")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=OFF") + ;; Test suites do not seem well supported upstream and are disabled by default. + ;; Pass -DENABLE_TEST to configure to enable. + #:tests? #f)) + (native-inputs + (list boost + ffmpeg + fuzzylite + ;; googletest ; needed for tests, but tests are disabled + libxkbcommon + luajit + minizip + pkg-config + python + ;; fuzzylite: Build currently fails with qtbase-6 and qttools-6 + qtbase-5 + qttools-5 + sdl2 + sdl2-mixer + sdl2-image + sdl2-ttf + tbb + vulkan-headers + zlib)) + (home-page "https://vcmi.eu/") + (synopsis "Turn-based strategy game engine") + (description + "@code{vcmi} is an implementation of the Heroes of Might and +Magic III game engine. It requires assets and game resources to +play; it will look for them at @file{~/.local/share/vcmi} folder.") + (license license:gpl2))) + (define-public apricots (package (name "apricots") diff --git a/gnu/packages/patches/vcmi-disable-privacy-breach.patch b/gnu/packages/patches/vcmi-disable-privacy-breach.patch new file mode 100644 index 0000000000..c03bc66119 --- /dev/null +++ b/gnu/packages/patches/vcmi-disable-privacy-breach.patch @@ -0,0 +1,21 @@ +Origin: https://salsa.debian.org/games-team/vcmi/-/blob/debian/1.1.0+dfsg-1/debian/patches/disable-privacy-breach +From: Johannes Schauer +Subject: do not check remote repositories on startup by default +Forwarded: not-needed + +--- a/config/schemas/settings.json ++++ b/config/schemas/settings.json +@@ -401,11 +401,11 @@ + }, + "autoCheckRepositories" : { + "type" : "boolean", +- "default" : true ++ "default" : false + }, + "updateOnStartup" : { + "type" : "boolean", +- "default" : true ++ "default" : false + }, + "updateConfigUrl" : { + "type" : "string", -- 2.39.2