From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0lXaKtLpXmQRYwEASxT56A (envelope-from ) for ; Sat, 13 May 2023 03:37:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id QMb3KdLpXmTT2gAA9RJhRA (envelope-from ) for ; Sat, 13 May 2023 03:37:22 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 309F3129DC for ; Sat, 13 May 2023 03:37:22 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxeC2-0003I5-94; Fri, 12 May 2023 21:37:06 -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 1pxeBz-0003Hw-AJ for guix-patches@gnu.org; Fri, 12 May 2023 21:37:03 -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 1pxeBz-0000Y8-1d for guix-patches@gnu.org; Fri, 12 May 2023 21:37:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxeBx-0006sP-Sp for guix-patches@gnu.org; Fri, 12 May 2023 21:37: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: Sat, 13 May 2023 01:37: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.168394177226356 (code B ref 63435); Sat, 13 May 2023 01:37:01 +0000 Received: (at 63435) by debbugs.gnu.org; 13 May 2023 01:36:12 +0000 Received: from localhost ([127.0.0.1]:34454 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxeB9-0006r1-TI for submit@debbugs.gnu.org; Fri, 12 May 2023 21:36:12 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:35944) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxeB8-0006qp-OE for 63435@debbugs.gnu.org; Fri, 12 May 2023 21:36:11 -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 36DDC1A982; Fri, 12 May 2023 18:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1683941762; bh=2fauigSxJdZkSe23M022wE7UUmXc774ueWIVa7LNqXM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=PfN7b7fu25XqKoK5+mz+/9H/skEFfrSpKIM/U4JTbfwu/Lw0d8NWi8Vkd4rzhZYan 35yF9rDdPD0e00sm6rceuCOHK4E+7Gs50F3P7CIws9ssLQgbZOk+wvjEJBTmhfOZdk Tqm/715qvpRH1HNsDfkViWiIyRu3qsLKThN3tXoQSfAeux5vZeEbRC0oD4HtuUKyOD VvfL4nSQXcqf1/vTfY4Qt5QP8SjaiC6X7ItLg5dJz7CM/QhojhFLcOpB3uqIkBNMfc O7Utpapf6UCrAC54hgVr7djXxEmyUEqatE3HNjhzEz2KDGVNv+ZlVTHTwQhVdREAeJ wufojlGg80X5g== From: Vagrant Cascadian In-Reply-To: <87ttwhm2vg.fsf@wireframe> 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> Date: Fri, 12 May 2023 18:35:56 -0700 Message-ID: <87r0rlm2rn.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683941842; a=rsa-sha256; cv=none; b=j/Xy/4r3i9/e/6NDkWWR7X4N4EB9QF0UVRWzyacXfa59b2/T4ImaTulgmHfQUgVA7PvHZ0 Tw/EWDU6bntymooLBK9Arj4PSLFXz3M18tY8pcc4v4m+GvQWP6CyYSkSOlkwUt55pg6CnC gFCstGKXTtn+ymEvNA466qGLdGWihhArkTJ8RtL/r7GWCD6WyWESBW6+Qaq0l2dPh1Mjk0 mn6tOOB74qo6Gfjv67xWWSoN+fNEyY4be+QVxQp3kXmihfgBgyuEfW+PVY3rCsfkiKML17 USsNEXOZx2MUlVj20L8IpdWSFM/xdU7daSwZzzMCA/8/DfyIkL4Ay5Li5ybHeQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=PfN7b7fu; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683941842; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=vou3ZOaYEqUiiLyZjLO07zta/er7Z6LDsRLoOo5knLM=; b=PEm0aT7RVL1UTHQYXi8vKMgy1xazH8CIZoUOEKH9fYKn9tMtH8DEQ2HYLotVFO7Zcg1TwI dZi+YJzkQy/8AfRChhHDfw8KE5b47JrttRrylwekFv0I58RmFyX0j5d8H4Euo+EfqXO3A6 jZJxGkDWS+O+wkURAMmNqgNt9BzUyUz/QC4K0UO6ysmk4HSgI1cb8kTr2lbDTyke1Onx1R sqaCGxNhw4D9vX28wcWpdIICMtJKBfPaZUNYtVimwPQlXiJdfL4BLmDK+u9rmkV4WGIpBm rZJrXZyvFnIkK9d/S0NK05qGQ2uCQ5VZZSgzfCHJDO0z2LXBpvKxhVXD8kBRHg== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=PfN7b7fu; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.78 X-Spam-Score: -0.78 X-Migadu-Queue-Id: 309F3129DC X-TUID: hs+7PVjmsu+A --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain On 2023-05-12, Vagrant Cascadian wrote: > On 2023-05-12, Liliana Marie Prikler wrote: >> Am Donnerstag, dem 11.05.2023 um 23:17 -0700 schrieb Vagrant Cascadian: >>> On 2023-05-12, Liliana Marie Prikler wrote: >>> > Am Donnerstag, dem 11.05.2023 um 16:07 -0700 schrieb Vagrant >>> > Cascadian: ... > ...and will send an updated vcmi with this depending on fuzzylite > shortly. And the updated vcmi attached. live well, vagrant --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-Add-vcmi-1.2.1.patch Content-Transfer-Encoding: quoted-printable From=20813871d233700f7d9662aa9108b8dfc1e12e4d91 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. =2D-- 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 89791bea69..ac0137290d 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -2032,6 +2032,7 @@ dist_patch_DATA =3D \ %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 4395476af3..d6a663abc6 100644 =2D-- 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))) =20 +(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 + ;; Test suites do not seem well supported upstream and are disabled b= y default. + ;; Pass -DENABLE_TEST to configure to enable. + `(#:configure-flags '("-DFORCE_BUNDLED_FL=3DOFF") + #:tests? #f)) + (native-inputs + (list boost + ffmpeg + fuzzylite + ;; googletest ; needed for tests, but tests are disabled + libxkbcommon + luajit + minizip + pkg-config + python + ;; qtbase and qttools @6 not currently buildable but may work ok + 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/p= ackages/patches/vcmi-disable-privacy-breach.patch new file mode 100644 index 0000000000..c03bc66119 =2D-- /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", =2D-=20 2.39.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZF7pfAAKCRDcUY/If5cW qlyvAP0dYN8FxUqZOrCvkJtG71MLKrAobBMwSyVHCGetgGnw+gD+PfOfjBXIrsOn Wr7F7t+pQdKGAguXNLI7jXFYPiLVnAk= =6pB5 -----END PGP SIGNATURE----- --==-=-=--