From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 CDJdImR1XWTX8AAASxT56A (envelope-from ) for ; Fri, 12 May 2023 01:08:20 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id qKkiImR1XWRBqwAAauVa8A (envelope-from ) for ; Fri, 12 May 2023 01:08:20 +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 940A13D260 for ; Fri, 12 May 2023 01:08:19 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxFOG-0007Jq-F8; Thu, 11 May 2023 19:08:04 -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 1pxFOE-0007JQ-HA for guix-patches@gnu.org; Thu, 11 May 2023 19:08:02 -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 1pxFOE-0002Zd-9A for guix-patches@gnu.org; Thu, 11 May 2023 19:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxFOD-0003FJ-Mi for guix-patches@gnu.org; Thu, 11 May 2023 19:08: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: Thu, 11 May 2023 23:08: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.168384647312461 (code B ref 63435); Thu, 11 May 2023 23:08:01 +0000 Received: (at 63435) by debbugs.gnu.org; 11 May 2023 23:07:53 +0000 Received: from localhost ([127.0.0.1]:53629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxFO5-0003Ev-AP for submit@debbugs.gnu.org; Thu, 11 May 2023 19:07:53 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:47662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxFO1-0003Ea-Bx for 63435@debbugs.gnu.org; Thu, 11 May 2023 19:07:51 -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 F17981ACAB; Thu, 11 May 2023 16:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1683846460; bh=kjh0QM+pZc3BDXTXQ+yCRQ5xo/8zlQkOVlCuaNNHvgg=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=SYAzyU4xcncR5rfg0ccZD7RH9/jDv+ZJHfNTRh33XGHf5G4tf+qBK9ab6nsUp59U0 BnOMEnNDlqeKPvfPu8+AsRq2/CWjTPP5fmKPgHoydBdstAvUsphNhD+IaT7xgmFwvW AEhw28vkdOq7D0jrXMEGMrRLW7c1XFVKKE6sBaOjuDlqZbsE0dckTw4Gy8TYMJSGrc 7Sc5aE2Qyr/CyJsVYChYUc9gUJxIBYZVZpNqeIjj7xKT+avBeVRvDvEN5uiEcekrhw paDdv8s+xedhqKYeaZ9Ml+jB1TEUDrKHQJZm2GbHGLMukYrbBQfXNJdZkA4CTIrSHm oJkBb+HaZ2WFg== From: Vagrant Cascadian In-Reply-To: <873542o7ze.fsf@wireframe> References: <87a5yb4e41.fsf@wireframe> <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@gmail.com> <873542o7ze.fsf@wireframe> Date: Thu, 11 May 2023 16:07:36 -0700 Message-ID: <87zg6ampqf.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-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683846500; a=rsa-sha256; cv=none; b=fc70PyBkUdglfnMGJ74ch3DasiQI8d3vb6Zr5qNNh4I3efZw2wJcsXlkkyDZIDAdC7YSUq lcj4KcKlHgR0RJ1ssq+QSiF3/GoAR8/tMTIk7KstQq9hsXBbtXSCWqXt4NX7Ro1erlw6CD 4UvpK+1Fb9nqs1Ab+kt/2zmA/AwkpOmLW337hfB09cdK6GZ5jT2x4nW3r/BJysycssWDYn JLoIlwusokKdlp0jgw2HhNvjc6uXcWpcuiXyZcUKjeHoEDcB0m3P2H8/Cn7VPIGqcBjGmE uhw/oEbymNAeyanfvMnVQBad2I+3eQN4Lhbfa735G8zHdw92DUZirF23CRNR+w== 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=SYAzyU4x; 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=1683846500; 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=wJ4yW/tk+qO63RUejUZ6lpN6rSS5glFpQIn7OcaKV3Q=; b=gvyrx+AnXe8foKxfrPkbA7CbBtFsaBUHgbxpNwuw6P0eMN8tLHv5FSjcFkLeLEo6s8f/NY DlpjLznbPJab4ZswPcTzB0byzs4UZLOVZEesGFErsyRVB2aoYsV1gMtB5Cof96J3Nilfjy cxWPXzqmxxxIRF/04NbFyHeICDgu7mluTnhn0nnLQ/D92rZZ3PMtR9ncPyY0c4h+4YRiPU 479cTBHM3JjKilG49OBITXk54i1JaNVMG1ULZtb6zfQPcTamJLCPTKqYy07JVlu0DcLzaM A5mA8OO2Cgbt8Oam2usTL0QOuaTl962DETBFlf6Fh0KjnyZ8EH62KN0wqzC9vQ== X-Migadu-Spam-Score: -4.58 X-Spam-Score: -4.58 X-Migadu-Queue-Id: 940A13D260 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=SYAzyU4x; 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-TUID: eOgtgdMvGODH --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain On 2023-05-11, Vagrant Cascadian wrote: > On 2023-05-11, Liliana Marie Prikler wrote: >> Am Mittwoch, dem 10.05.2023 um 22:43 -0700 schrieb Vagrant Cascadian: >>> We probably want to try to apply Debian's "privacy-breach" patch to >>> disable phoning home, as well as the reproducible builds patch and >>> some additional reproducibility patches I am working on, but figured >>> I would submit the package to guix for review now, in case anyone >>> else wants to join me down this rabbit hole... >> Well, it won't be added to Guix without such patches, so someone needs >> to go down this rabbit hole. Applied the privacy-breach patch, the maxu32/minizip patch was no longer relevent, and the reproducible builds patches only affect documentation, which is not currently provided in this package (there are no upstream rules to build vcmimanual.tex into any documentation). >>> + "@code{vcmi} is an implementation of Heroes of Might and >>> +Magic III (aka HOMM3) game engine. It requires assets and game >>> resources to >>> +play; it will look for them at @file{~/.local/share/vcmi} folder.") >> Use an @acronym or just spell it out. > > Presuming you mean "(aka HOMM3)" ... honestly, maybe best to just drop > it entirely; I am not sure it adds much. Dropped it. V2 patch attached. Thanks for reviewing! live well, vagrant --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-vcmi-1.2.1.patch Content-Transfer-Encoding: quoted-printable From=20b46fad945222a64b8d73b35e2c0d57a017987235 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 7 May 2023 17:43:33 -0700 Subject: [PATCH] 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 patches. =2D-- gnu/local.mk | 1 + gnu/packages/games.scm | 47 +++++++++++++++++++ .../patches/vcmi-disable-privacy-breach.patch | 21 +++++++++ 3 files changed, 69 insertions(+) create mode 100644 gnu/packages/patches/vcmi-disable-privacy-breach.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73db48f720..d5034300ef 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -2028,6 +2028,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 bae79ee48b..ace32959b6 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) @@ -11187,6 +11188,52 @@ (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) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nx3i078cxkak2ci514pf4pgi5269mp08njynsg35pin4yp3fn0p")) + (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. + `(#:tests? #f)) + (native-inputs (list boost + ffmpeg + ;; googletest ; needed for tests, but tests are d= isabled + 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 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", base-commit: d07342b16612cfdffad6a7b3504b74e0d95d551f =2D-=20 2.39.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZF11OAAKCRDcUY/If5cW qi9nAQDKxZ4fzMuRulk6PA+QeraYXVcFyYAk/d50Xu4mS/6O3QEA9/U1wOJtnEZm CeyGob5VEkst4yehikVphLoP1q7W1A4= =0xz0 -----END PGP SIGNATURE----- --==-=-=--