Received: (at 63435) by debbugs.gnu.org; 14 May 2023 19:52:59 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 14 15:52:59 2023
Received: from localhost ([127.0.0.1]:41633 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pyHm7-0005Zm-Bq
for submit <at> 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 <vagrant@HIDDEN>) id 1pyHm4-0005Za-0Z
for 63435 <at> 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@HIDDEN)
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 <vagrant@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 63435 <at> debbugs.gnu.org
Subject: Re: Add vcmi 1.2.1 to games.scm
In-Reply-To: <210acc39f6c1c114004aa1d79c171b1a255c5747.camel@HIDDEN>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
<873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe>
<9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN>
<87wn1em5ti.fsf@wireframe>
<8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN>
<87ttwhm2vg.fsf@wireframe> <87r0rlm2rn.fsf@wireframe>
<210acc39f6c1c114004aa1d79c171b1a255c5747.camel@HIDDEN>
Date: Sun, 14 May 2023 12:52:44 -0700
Message-ID: <87fs7yn10z.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain
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
--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline; filename=0002-gnu-Add-vcmi-1.2.1.patch
Content-Transfer-Encoding: quoted-printable
From=202794eb077c325ad366667927e58cead23924fbc9 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
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 dd6e3641a1..6ada6196be 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2031,6 +2031,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 49d1431d99..525e4a1c7b 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
+ (list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=3DOFF")
+ ;; Test suites do not seem well supported upstream and are disa=
bled 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/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 <josch@HIDDEN>
+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/If5cWqgUCZGE8DAAKCRDcUY/If5cW
qp60AQDpqVTl1JJZMRygwiGA9gq59UCmU+kPx/yvnw4BVP/GxwEApwQctMWaesNh
/905xYRIh2f+Xfw8qIl1/FQFMjmXCAo=
=jzP5
-----END PGP SIGNATURE-----
--==-=-=--
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 14 May 2023 19:50:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 14 15:50:39 2023
Received: from localhost ([127.0.0.1]:41628 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pyHjq-0005Se-03
for submit <at> debbugs.gnu.org; Sun, 14 May 2023 15:50:39 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:52770)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1pyHjn-0005Ru-0q
for 63435 <at> debbugs.gnu.org; Sun, 14 May 2023 15:50:36 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id 8A5DB1ACF1;
Sun, 14 May 2023 12:50:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1684093825;
bh=dJ+caHkDPz+iuYeAmc5rmqO1v1nDNRPr9RGaNNNELFk=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=GAdkn41eS3WYkof32u8g4mgvpxfxnWMyvzo3a7uqLcmFaPbYQ7AzM4jtnJB9iZvNN
fGAG7vnNEEofxd0ZP4ilSLfnefc1j3dch060UzhXLMDcr4ijXvHdAvRsIacZYAoc/f
Q1ydNOe464vMX9wYo+G44+QQEi97c4z1aXwPszR8qshGQzMN+Dc6Gx4I5+o3FNeuSR
DfCcgq6j31mrsUa4cU7r8+kRX76CvTzRbLapCiewtjUCAABd+dKhGUDiczVCc3VSmE
1CVFKz3OW3a1Njnoq9spTLt5JTvUkaKVf6thhl/qsWOqTzV3t/uF10eGk/7iiBNJHW
C61V/Kx4ZlaLg==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 63435 <at> debbugs.gnu.org
Subject: Re: Add vcmi 1.2.1 to games.scm
In-Reply-To: <40512ea5dbdf297cea0d06f7270ee5ac8cb3e34e.camel@HIDDEN>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
<873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe>
<9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN>
<87wn1em5ti.fsf@wireframe>
<8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN>
<87ttwhm2vg.fsf@wireframe>
<40512ea5dbdf297cea0d06f7270ee5ac8cb3e34e.camel@HIDDEN>
Date: Sun, 14 May 2023 12:50:19 -0700
Message-ID: <87ilcun150.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
On 2023-05-13, Liliana Marie Prikler wrote:
> Am Freitag, dem 12.05.2023 um 18:33 -0700 schrieb Vagrant Cascadian:
>
>> + %D%/packages/patches/fuzzylite-relative-path-in-tests.patch \
>> + %D%/packages/patches/fuzzylite-use-catch2.patch \
>> + %D%/packages/patches/fuzzylite-when-testing-large-float-numbers-
>> for-equ.patch=09
> Prefer names that don't blow up the file name, e.g. "fuzzylite-fix-
> test", "fuzzylite-soften-float-equality", or "fuzzylite-workaround-
> issue-N" =E2=80=93 although I'm not sure whether we have a precedent for =
the
> latter.
Went with fuzzylite-soften-float-equality. Thanks!
>> + (patches (search-patches "fuzzylite-use-catch2.patch"
>> + "fuzzylite-when-testing-large-float-numbers-
>> for-equ.patch"
>> + "fuzzylite-relative-path-in-tests.patch"))))
> This doesn't appear properly indented.
guix style strikes again! Fixed.
>> + (synopsis "fuzzy logic control binary")
> Capitalize the first word. IIRC we also allow title case for proper
> names and such, but I don't think that'd be necessary here.
Fixed.
>> + "fuzzylite is a fuzzy logic control library which allows one
>> +to easily create fuzzy logic controllers in a few steps utilizing
>> +object-oriented programming.")
> Proper sentences start with an uppercase letter. The convention is to
> use @-constructs when the package name prohibits that. You can also
> cheat via "This package provides ..."
Went with the cheat. :)
>> + (license license:gpl3)))
> No +?
I do not see any "or any later version" or similar wording anywhere, no.
>> fuzzylite is a registered trademark of FuzzyLite Limited.
> Perhaps also look into their trademark policy then, if they have any.
Have not found one...
>> +-#include "test/catch.hpp"
>> ++#include "catch2/catch.hpp"
> Use <catch2/catch.hpp> to signal that this is a system header.
I tried applying this, but it failed to build... left it out of this
revision.
live well,
vagrant
--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline; filename=0001-gnu-Add-fuzzylite-6.0.patch
Content-Transfer-Encoding: quoted-printable
From=20e17f53eaf5f5ff1e347686e96a403501f2386737 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Fri, 12 May 2023 16:18:18 -0700
Subject: [PATCH 1/2] gnu: Add fuzzylite 6.0.
* gnu/packages/games.scm (fuzzylite): New variable.
* gnu/packages/patches/fuzzylite-relative-path-in-tests.patch: New patch.
* gnu/packages/patches/fuzzylite-use-catch2.patch: New patch.
* gnu/packages/patches/fuzzylite-soften-float-equality.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Add patches.
=2D--
gnu/local.mk | 3 +
gnu/packages/games.scm | 31 +++
.../fuzzylite-relative-path-in-tests.patch | 15 ++
.../fuzzylite-soften-float-equality.patch | 30 +++
.../patches/fuzzylite-use-catch2.patch | 184 ++++++++++++++++++
5 files changed, 263 insertions(+)
create mode 100644 gnu/packages/patches/fuzzylite-relative-path-in-tests.p=
atch
create mode 100644 gnu/packages/patches/fuzzylite-soften-float-equality.pa=
tch
create mode 100644 gnu/packages/patches/fuzzylite-use-catch2.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 012ce84d2d..dd6e3641a1 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1149,6 +1149,9 @@ dist_patch_DATA =3D \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-glibc-2.34.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \
+ %D%/packages/patches/fuzzylite-relative-path-in-tests.patch \
+ %D%/packages/patches/fuzzylite-use-catch2.patch \
+ %D%/packages/patches/fuzzylite-soften-float-equality.patch \
%D%/packages/patches/fxdiv-system-libraries.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d1e2248588..49d1431d99 100644
=2D-- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3557,6 +3557,37 @@ (define-public freedink
("bash" ,bash)))
(native-inputs '())))
=20
+(define-public fuzzylite
+ (package
+ (name "fuzzylite")
+ (version "6.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fuzzylite/fuzzylite")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0yay0qc81x0irlvxqpy7jywjxpkmpjabdhq2hdh28r9z85wp2nwb"))
+ (patches (search-patches "fuzzylite-use-catch2.patch"
+ "fuzzylite-soften-float-equality.pa=
tch"
+ "fuzzylite-relative-path-in-tests.p=
atch"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'switch-to-fuzzylite-dir
+ (lambda _
+ (chdir "fuzzylite"))))))
+ (native-inputs (list catch2))
+ (home-page "https://www.fuzzylite.com/")
+ (synopsis "Fuzzy logic control binary")
+ (description
+ "This package provides fuzzylite, a fuzzy logic control library which
+allows one to easily create fuzzy logic controllers in a few steps utilizi=
ng
+object-oriented programming.")
+ (license license:gpl3)))
+
(define-public xboard
(package
(name "xboard")
diff --git a/gnu/packages/patches/fuzzylite-relative-path-in-tests.patch b/=
gnu/packages/patches/fuzzylite-relative-path-in-tests.patch
new file mode 100644
index 0000000000..1a03238246
=2D-- /dev/null
+++ b/gnu/packages/patches/fuzzylite-relative-path-in-tests.patch
@@ -0,0 +1,15 @@
+Workaround https://github.com/fuzzylite/fuzzylite/issues/85
+
+diff --git a/fuzzylite/test/BenchmarkTest.cpp b/fuzzylite/test/BenchmarkTe=
st.cpp
+index f868ec29..464d394d 100644
+--- a/fuzzylite/test/BenchmarkTest.cpp
++++ b/fuzzylite/test/BenchmarkTest.cpp
+@@ -30,7 +30,7 @@ namespace fl {
+ }
+=20
+ TEST_CASE("Benchmarks from FLD files", "[benchmark][fld]") {
+- std::string path =3D "../../examples/";
++ std::string path =3D "../examples/";
+ typedef std::pair<std::string, int > Example;
+ std::vector<Example> examples;
+ examples.push_back(Example("mamdani/AllTerms", int(1e4)));
diff --git a/gnu/packages/patches/fuzzylite-soften-float-equality.patch b/g=
nu/packages/patches/fuzzylite-soften-float-equality.patch
new file mode 100644
index 0000000000..47403605dd
=2D-- /dev/null
+++ b/gnu/packages/patches/fuzzylite-soften-float-equality.patch
@@ -0,0 +1,30 @@
+Origin: https://salsa.debian.org/debian/fuzzylite/-/blob/debian/6.0+dfsg-6=
/debian/patches/when-testing-large-float-numbers-for-equ.patch
+From: Johannes 'josch' Schauer <josch@HIDDEN>
+Date: Sun, 3 Feb 2019 10:33:22 +0100
+X-Dgit-Generated: 6.0+dfsg-2 80960ae38da9db032dfbfec6405398653e8205ff
+Subject: when testing large float numbers for equality, use a larger epsil=
on
+
+
+---
+
+--- fuzzylite-6.0+dfsg.orig/fuzzylite/test/BenchmarkTest.cpp
++++ fuzzylite-6.0+dfsg/fuzzylite/test/BenchmarkTest.cpp
+@@ -96,7 +96,17 @@ namespace fl {
+ CHECK(Op::isEq(1.0, Benchmark::convert(1000.0, Benchmark::MilliSe=
conds, Benchmark::Seconds)));
+ FL_LOG(Benchmark::convert(1000.0, Benchmark::MilliSeconds, Benchm=
ark::Seconds));
+=20
+- CHECK(Op::isEq(35e9, Benchmark::convert(35, Benchmark::Seconds, B=
enchmark::NanoSeconds)));
++ scalar eps =3D
++#ifndef __i386__
++ fuzzylite::macheps();
++#else
++ // on i386, due to the 80bit x87 register, double floating po=
int
++ // numbers are handled differently and thus the difference be=
tween
++ // 35e9 and the result of Benchmark::convert() will be 2.179e=
-6,
++ // which is greater than the default epsilon of 1e-6.
++ 1e-5;
++#endif
++ CHECK(Op::isEq(35e9, Benchmark::convert(35, Benchmark::Seconds, B=
enchmark::NanoSeconds), eps));
+ CHECK(Op::isEq(35, Benchmark::convert(35e9, Benchmark::NanoSecond=
s, Benchmark::Seconds)));
+ }
+=20
diff --git a/gnu/packages/patches/fuzzylite-use-catch2.patch b/gnu/packages=
/patches/fuzzylite-use-catch2.patch
new file mode 100644
index 0000000000..e4aa13a98b
=2D-- /dev/null
+++ b/gnu/packages/patches/fuzzylite-use-catch2.patch
@@ -0,0 +1,184 @@
+Origin: https://salsa.debian.org/debian/fuzzylite/-/blob/debian/6.0+dfsg-6=
/debian/patches/fix-tests2.patch
+From: Ferdinand Thiessen <rpm@HIDDEN>
+Date: Mon, 31 Jan 2022 16:06:19 GMT
+Subject: Replace Catch with Catch2 and require C++11 for tests
+Origin: vendor, https://github.com/fuzzylite/fuzzylite/issues/94
+Bug-Debian: http://bugs.debian.org/1017155
+
+--- a/fuzzylite/CMakeLists.txt
++++ b/fuzzylite/CMakeLists.txt
+@@ -194,7 +194,9 @@ if(FL_BUILD_BINARY)
+ endif(FL_BUILD_BINARY)
+=20
+ if(FL_BUILD_TESTS)
++ find_package(Catch2)
+ add_executable(fl-test ${fl-headers} ${fl-tests})
++ target_link_libraries(fl-test Catch2::Catch2)
+ set_target_properties(fl-test PROPERTIES OUTPUT_NAME fuzzylite-tests)
+ set_target_properties(fl-test PROPERTIES OUTPUT_NAME fuzzylite-tests =
IMPORT_PREFIX tmp-) #To prevent LNK1149 in Windows
+ set_target_properties(fl-test PROPERTIES DEBUG_POSTFIX -debug)
+--- a/fuzzylite/test/activation/ThresholdTest.cpp
++++ b/fuzzylite/test/activation/ThresholdTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/BenchmarkTest.cpp
++++ b/fuzzylite/test/BenchmarkTest.cpp
+@@ -16,7 +16,7 @@
+=20
+ #include "fl/Benchmark.h"
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ #include <vector>
+--- a/fuzzylite/test/hedge/HedgeFunctionTest.cpp
++++ b/fuzzylite/test/hedge/HedgeFunctionTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/imex/FldExporterTest.cpp
++++ b/fuzzylite/test/imex/FldExporterTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/imex/FllImporterTest.cpp
++++ b/fuzzylite/test/imex/FllImporterTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/imex/RScriptExporterTest.cpp
++++ b/fuzzylite/test/imex/RScriptExporterTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+ #include <fstream>
+=20
+--- a/fuzzylite/test/MainTest.cpp
++++ b/fuzzylite/test/MainTest.cpp
+@@ -16,7 +16,7 @@
+=20=20
+ #define CATCH_CONFIG_RUNNER
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+=20
+ #include "fl/Headers.h"
+=20
+--- a/fuzzylite/test/norm/NormFunctionTest.cpp
++++ b/fuzzylite/test/norm/NormFunctionTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/QuickTest.cpp
++++ b/fuzzylite/test/QuickTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/AggregatedTest.cpp
++++ b/fuzzylite/test/term/AggregatedTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/DiscreteTest.cpp
++++ b/fuzzylite/test/term/DiscreteTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/FunctionTest.cpp
++++ b/fuzzylite/test/term/FunctionTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/TrapezoidTest.cpp
++++ b/fuzzylite/test/term/TrapezoidTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/TriangleTest.cpp
++++ b/fuzzylite/test/term/TriangleTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/variable/VariableTest.cpp
++++ b/fuzzylite/test/variable/VariableTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ #include <algorithm> // std::random_shuffle
base-commit: b3adba7b5ef3bb56509710b1596225017f1342cc
=2D-=20
2.39.2
--=-=-=--
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZGE7ewAKCRDcUY/If5cW
qrt4AQDqk46kPa9/0eWc5NFOUyqv4pHKd0JcAeyAD9ffiV/MNgEA61d4nb84upIH
SoHXwfwzKomPUWndHRc99ovJtaWCywM=
=zeVj
-----END PGP SIGNATURE-----
--==-=-=--
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 13 May 2023 06:16:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 13 02:16:27 2023
Received: from localhost ([127.0.0.1]:35492 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxiYN-0000rT-2R
for submit <at> debbugs.gnu.org; Sat, 13 May 2023 02:16:27 -0400
Received: from mail-ed1-f65.google.com ([209.85.208.65]:47550)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1pxiYL-0000rD-Fs
for 63435 <at> debbugs.gnu.org; Sat, 13 May 2023 02:16:25 -0400
Received: by mail-ed1-f65.google.com with SMTP id
4fb4d7f45d1cf-50db7f0a1b4so8481057a12.3
for <63435 <at> debbugs.gnu.org>; Fri, 12 May 2023 23:16:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1683958580; x=1686550580;
h=mime-version:user-agent:content-transfer-encoding:references
:in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject
:date:message-id:reply-to;
bh=ihCNdz+VomJeSHGRQ5sLQCC5e8HVq76i6aSWNSbGnhs=;
b=LGpFmWZ4rSn77DvT3Sp2onaxOEJOFN3lvsRcPpsxlbBR4Va+lKBR06w6iNQ13QVRt/
phhpAnleMFAbc3d0FgtgvYjtW23wrvoP7pdEZT/wRspv7DomhKP1g4kh9QEE2+bIAAI3
qRtY46tRQNeWi4KXDUKMqSoSgk+Ck89/vaRFNUOgeXgw+DMRho9LBw2eiE/6G/QOxGoN
Ptt7mLy2+IpE0Fv8/LCOnUkvtflD0SsOHTMDJL6KTEj9byWyxoC/bYd6aFEexuBx+tCW
JS5udt4lE8elYsqLOGb+YEjMExiJurL3eToYVYmcQmfh4lUE0KR6Kj6lDFQbcG+qiVTT
6G3Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1683958580; x=1686550580;
h=mime-version:user-agent:content-transfer-encoding:references
:in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=ihCNdz+VomJeSHGRQ5sLQCC5e8HVq76i6aSWNSbGnhs=;
b=hVvfw3GWJxAvtRcProF9241RuNPzBkzOMFzT18t9ygU+KP96uVxBljP8+vr7/JJ8/O
LgMQbPYkhs8QnfQoQaMkfCBdRq2Ter0piZHL27sRhSc7FyUz2W5b7N62bG5V13HOjJJT
ge/FGXmybxCnkzZ1AoeS1W3GG4MiPHycaA63G+Dj/gZvML0DB4LEvL/TRihJFN0tX6Is
8Mw19z3ygtBnZ2tE6/WGKLedJfYIssOYXgBlhV+h/vgx/KIHZlQ1Q+mn5Px3Vmf5BcoH
BYQgIKJyVNCfH369PjTS1Y+C6F6MBaeSrT05kPnNtrT0kDmyq8/WsTkNMGV8B7sOi200
jDdA==
X-Gm-Message-State: AC+VfDzozYm0KlOkJ/mL80Ec6dUG2Sk7OriwEzv/bouKkFzvekx3s/AI
Rh25v8DKA8BClXnpoF8OfuY=
X-Google-Smtp-Source: ACHHUZ5Z9YUO4A8O3qDB2hx007S7tCk38XTVm/ls8PHOLceL9qJjls7Md0cfPfGuAaM/CPazhijvKA==
X-Received: by 2002:a17:907:2d0e:b0:969:b86c:f2c4 with SMTP id
gs14-20020a1709072d0e00b00969b86cf2c4mr18115234ejc.40.1683958579618;
Fri, 12 May 2023 23:16:19 -0700 (PDT)
Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
m24-20020a1709062b9800b009686a7dc71csm6437792ejg.30.2023.05.12.23.16.19
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 12 May 2023 23:16:19 -0700 (PDT)
Message-ID: <210acc39f6c1c114004aa1d79c171b1a255c5747.camel@HIDDEN>
Subject: Re: Add vcmi 1.2.1 to games.scm
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Vagrant Cascadian <vagrant@HIDDEN>, 63435 <at> debbugs.gnu.org
Date: Sat, 13 May 2023 08:16:18 +0200
In-Reply-To: <87r0rlm2rn.fsf@wireframe>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
<873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe>
<9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN>
<87wn1em5ti.fsf@wireframe>
<8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN>
<87ttwhm2vg.fsf@wireframe> <87r0rlm2rn.fsf@wireframe>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.4
MIME-Version: 1.0
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: 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? [...]
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (liliana.prikler[at]gmail.com)
1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL,
https://senderscore.org/blocklistlookup/
[209.85.208.65 listed in bl.score.senderscore.com]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
-0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2)
[209.85.208.65 listed in wl.mailspike.net]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [209.85.208.65 listed in list.dnswl.org]
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
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=3DOFF")
> + #:tests? #f))
Readjust your comment, it's misaligned now. Also, prefer
(list #:configure-flags #~(list "-DFORCE_BUNDLED_FL=3DOFF")
#:tests? #f)
so that people after you won't have to convert it to G-Expressions.
> + ;; qtbase and qttools @6 not currently buildable but may
> work ok
Prefer ";; XXX: Build currently fails with qtbase-6 and qttools-6".
Cheers
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.Received: (at 63435) by debbugs.gnu.org; 13 May 2023 06:12:32 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat May 13 02:12:32 2023 Received: from localhost ([127.0.0.1]:35483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pxiUa-0000lJ-DI for submit <at> debbugs.gnu.org; Sat, 13 May 2023 02:12:32 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:45133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1pxiUY-0000l6-TY for 63435 <at> debbugs.gnu.org; Sat, 13 May 2023 02:12:31 -0400 Received: by mail-ej1-f66.google.com with SMTP id a640c23a62f3a-96aadfb19d7so267443166b.2 for <63435 <at> debbugs.gnu.org>; Fri, 12 May 2023 23:12:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683958345; x=1686550345; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=KVSsEMi+Ach75huxMMUCP6lg1S5l6LNFY/H79ggagZU=; b=dFv1/e2htDJOdIHMI2wn7QeFFJRoxhDV211F8dOe7fmDvTYNwdgIm9ba4BgOo3Bp4a dJA/upweIovMk4PEGkCROudQB5GSXYkWLNmjly3Mh4rAqDl4DAyyH5QmhavVQpWZWMuS oiSUzwpDXvLlHNuwVvmz040bowzbMCEO3fqQL6POZKWsctmxkAUJCfkWP4tqirwmyGYd TxMygiEyq3BExCJEppRA2uDZQEp5wFQaJdqtbLmap5TwqUI/cIeMbuZhX14X15QI4X+W VUgsqNO7Ox1j/c8vh7vQ6nwxdTgF8S9qJlZWPQfdTRA1tqH48bRbM8FAgXUikwEiH6Tw WvzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683958345; x=1686550345; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KVSsEMi+Ach75huxMMUCP6lg1S5l6LNFY/H79ggagZU=; b=iKWWOgu6Z+64CppwBkMNH00ladStHwMS8/h3cvhNDEAlSxDiZoBJOpkze5c0vwmWVG CDXPn+iYc5AtHTKa/7pGZesU+bhGO3cPXJg1HtZ6JFd4zYIu+3jWWtXu79BjGD9Hrm/5 ro4fhLw2u8B2ZodV5HxlPnv2SNBMnF1IDvyIeOW2pNTnhxXCIljQc/taUe8EBSj5AeCN KIPVMcjsWnCJ7yqDfXosuMCfdZQsRajkkJet9U9rBnCjNWmXCFnkG4shXWUg86XyJuwP Z4FfK9D6aApwIMseEifrxSAWVabV4wSASYTz9uCOBw/zvFIA4qzuYWBnQNiHyodXMiSR 3DHg== X-Gm-Message-State: AC+VfDwg7Tg46Z43E8jgG+3KVK1/prkcbV0mdA9GfYGUG2ULiI98tU+r LYJErqfoHeoQ4ADucHPGp4o= X-Google-Smtp-Source: ACHHUZ7xSk4J+bQ9uEGvkr5SWsBU+TYobRm9HD3vQJBfHplbVQ06eYeqveL1xXbn7iNCe7Ol6QuQtQ== X-Received: by 2002:a17:907:3e88:b0:969:f0bd:5649 with SMTP id hs8-20020a1709073e8800b00969f0bd5649mr16479825ejc.60.1683958344926; Fri, 12 May 2023 23:12:24 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id eq19-20020a170907291300b0096739e10659sm6341110ejc.163.2023.05.12.23.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 23:12:24 -0700 (PDT) Message-ID: <40512ea5dbdf297cea0d06f7270ee5ac8cb3e34e.camel@HIDDEN> Subject: Re: Add vcmi 1.2.1 to games.scm From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Vagrant Cascadian <vagrant@HIDDEN>, 63435 <at> debbugs.gnu.org Date: Sat, 13 May 2023 08:12:23 +0200 In-Reply-To: <87ttwhm2vg.fsf@wireframe> References: <87a5yb4e41.fsf@wireframe> <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN> <873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe> <9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN> <87wn1em5ti.fsf@wireframe> <8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN> <87ttwhm2vg.fsf@wireframe> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63435 Cc: iyzsong@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Am Freitag, dem 12.05.2023 um 18:33 -0700 schrieb Vagrant Cascadian: > + %D%/packages/patches/fuzzylite-relative-path-in-tests.patch \ > + %D%/packages/patches/fuzzylite-use-catch2.patch \ > + %D%/packages/patches/fuzzylite-when-testing-large-float-numbers- > for-equ.patch=09 Prefer names that don't blow up the file name, e.g. "fuzzylite-fix- test", "fuzzylite-soften-float-equality", or "fuzzylite-workaround- issue-N" =E2=80=93 although I'm not sure whether we have a precedent for th= e latter. > + (patches (search-patches "fuzzylite-use-catch2.patch" > + "fuzzylite-when-testing-large-float-numbers- > for-equ.patch" > + "fuzzylite-relative-path-in-tests.patch")))) This doesn't appear properly indented. > + (synopsis "fuzzy logic control binary") Capitalize the first word. IIRC we also allow title case for proper names and such, but I don't think that'd be necessary here. > + "fuzzylite is a fuzzy logic control library which allows one > +to easily create fuzzy logic controllers in a few steps utilizing > +object-oriented programming.") Proper sentences start with an uppercase letter. The convention is to use @-constructs when the package name prohibits that. You can also cheat via "This package provides ..." > + (license license:gpl3))) No +? > fuzzylite is a registered trademark of FuzzyLite Limited. Perhaps also look into their trademark policy then, if they have any. > +-#include "test/catch.hpp" > ++#include "catch2/catch.hpp" Use <catch2/catch.hpp> to signal that this is a system header. Cheers
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 13 May 2023 01:36:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 12 21:36:12 2023
Received: from localhost ([127.0.0.1]:34454 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxeB9-0006r1-TI
for submit <at> 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 <vagrant@HIDDEN>) id 1pxeB8-0006qp-OE
for 63435 <at> 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@HIDDEN)
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 <vagrant@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 63435 <at> debbugs.gnu.org
Subject: Re: Add vcmi 1.2.1 to games.scm
In-Reply-To: <87ttwhm2vg.fsf@wireframe>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
<873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe>
<9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN>
<87wn1em5ti.fsf@wireframe>
<8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN>
<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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--==-=-=
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 <vagrant@HIDDEN>
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 <josch@HIDDEN>
+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-----
--==-=-=--
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 13 May 2023 01:33:57 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 12 21:33:57 2023
Received: from localhost ([127.0.0.1]:34434 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxe8y-0006n6-Pz
for submit <at> debbugs.gnu.org; Fri, 12 May 2023 21:33:57 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:55146)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1pxe8w-0006mr-Dv
for 63435 <at> debbugs.gnu.org; Fri, 12 May 2023 21:33:55 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id 597F41A982;
Fri, 12 May 2023 18:33:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1683941625;
bh=CGOqkY/4QDn7U+AWRqTBocAgL+a76UShqGHxYVv1xNU=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=oQH1DRxwz4Wdvw6pJHdbGNJN1ug7l43wi03AR3saqxROoeMsj7vg9C6G8DSxGBV+r
Idt7rEvZLIeC8zz/QfAkKAodX9GOX6o20VJLBpFJJpHW+0htiKhrn5NmBZOyoNqxUN
hVZN5h+IM2IN90zf13qp6PYPzQ2W5soD2z7iDLyqPMcbIEHadpJqU763ThH+NKMYJ+
0n2LAdvqSv3bCzncMH/ChREl52YjKPXZR1r8Z602RYFF5v+pemcDL1YBGDjUQmqGkg
Rh2xn9sHbu6dE7QBarHq83bVm1TUS0Nv84gIpaMsPZhc/W02rrVKqCayhZhhs6vZr8
MIqBNydoQ4qRA==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 63435 <at> debbugs.gnu.org
Subject: Re: Add vcmi 1.2.1 to games.scm
In-Reply-To: <8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
<873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe>
<9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN>
<87wn1em5ti.fsf@wireframe>
<8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN>
Date: Fri, 12 May 2023 18:33:39 -0700
Message-ID: <87ttwhm2vg.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
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:
>> >=20
>> > > +(define-public vcmi
>> > > +=C2=A0 (package
>> > > +=C2=A0=C2=A0=C2=A0 (name "vcmi")
>> > > +=C2=A0=C2=A0=C2=A0 (version "1.2.1")
>> > > +=C2=A0=C2=A0=C2=A0 (source (origin
>> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 (method git-fetch)
>> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 (uri (git-reference
>> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (url "https://github.com/v=
cmi/vcmi")
>> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (commit version)
>> > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (recursive? #t)))
>> > Can we do without the recursive checkout?
>>=20
>> There is one component still used with the recursive
>> checkout. ... AI/Fuzzy* I think? I do not know if it could be built
>> independently, but I have not seriously looked into it.
> fuzzylite can be taken from the system which is the preferred approach.
Attached is fuzzylite as it's own package.
>> > > +=C2=A0=C2=A0=C2=A0 (native-inputs (list boost
>> > Guix style is, like, a suggestion that can be wrong.=C2=A0 You are
>> > allowed
>> > to fight it when the result of doing so is demonstrably better.
...
>> I am also not strongly opinionated (it goes both ways, I guess!)...
>> so for clarity, are you saying you would prefer:
>>=20
>> =C2=A0 (native-inputs
>> =C2=A0=C2=A0=C2=A0 (list
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 boost
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ...
>> or:
>>=20
>> =C2=A0 (native-inputs
>> =C2=A0=C2=A0=C2=A0 (list boost
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ...
>>=20
>> or something else?
> The latter. If it ever comes to needing (list on its own line you
> better have a good explanation for that or fix your comments so that
> they don't go overboard.
...and will send an updated vcmi with this depending on fuzzylite
shortly.
live well,
vagrant
--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline; filename=0001-gnu-Add-fuzzylite-6.0.patch
Content-Transfer-Encoding: quoted-printable
From=206514e69a082ca9c268677d7c04d858d0fdf07a11 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Fri, 12 May 2023 16:18:18 -0700
Subject: [PATCH 1/2] gnu: Add fuzzylite 6.0.
* gnu/packages/games.scm (fuzzylite): New variable.
* gnu/packages/patches/fuzzylite-relative-path-in-tests.patch: New patch.
* gnu/packages/patches/fuzzylite-use-catch2.patch: New patch.
* gnu/packages/patches/fuzzylite-when-testing-large-float-numbers-for-equ.p=
atch: New patch.
* gnu/local.mk (dist_patch_DATA): Add patches.
=2D--
gnu/local.mk | 3 +
gnu/packages/games.scm | 31 +++
.../fuzzylite-relative-path-in-tests.patch | 15 ++
.../patches/fuzzylite-use-catch2.patch | 184 ++++++++++++++++++
...-testing-large-float-numbers-for-equ.patch | 30 +++
5 files changed, 263 insertions(+)
create mode 100644 gnu/packages/patches/fuzzylite-relative-path-in-tests.p=
atch
create mode 100644 gnu/packages/patches/fuzzylite-use-catch2.patch
create mode 100644 gnu/packages/patches/fuzzylite-when-testing-large-float=
-numbers-for-equ.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index d31b40f3bf..89791bea69 100644
=2D-- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1149,6 +1149,9 @@ dist_patch_DATA =3D \
%D%/packages/patches/freeimage-unbundle.patch \
%D%/packages/patches/fuse-glibc-2.34.patch \
%D%/packages/patches/fuse-overlapping-headers.patch \
+ %D%/packages/patches/fuzzylite-relative-path-in-tests.patch \
+ %D%/packages/patches/fuzzylite-use-catch2.patch \
+ %D%/packages/patches/fuzzylite-when-testing-large-float-numbers-for-equ.=
patch \
%D%/packages/patches/fxdiv-system-libraries.patch \
%D%/packages/patches/gajim-honour-GAJIM_PLUGIN_PATH.patch \
%D%/packages/patches/ganeti-disable-version-symlinks.patch \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index bae79ee48b..4395476af3 100644
=2D-- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3557,6 +3557,37 @@ (define-public freedink
("bash" ,bash)))
(native-inputs '())))
=20
+(define-public fuzzylite
+ (package
+ (name "fuzzylite")
+ (version "6.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fuzzylite/fuzzylite")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0yay0qc81x0irlvxqpy7jywjxpkmpjabdhq2hdh28r9z85wp2nwb"))
+ (patches (search-patches "fuzzylite-use-catch2.patch"
+ "fuzzylite-when-testing-large-float-numbers-for-eq=
u.patch"
+ "fuzzylite-relative-path-in-tests.patch"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-before 'configure 'switch-to-fuzzylite-dir
+ (lambda _
+ (chdir "fuzzylite"))))))
+ (native-inputs (list catch2))
+ (home-page "https://www.fuzzylite.com/")
+ (synopsis "fuzzy logic control binary")
+ (description
+ "fuzzylite is a fuzzy logic control library which allows one
+to easily create fuzzy logic controllers in a few steps utilizing
+object-oriented programming.")
+ (license license:gpl3)))
+
(define-public xboard
(package
(name "xboard")
diff --git a/gnu/packages/patches/fuzzylite-relative-path-in-tests.patch b/=
gnu/packages/patches/fuzzylite-relative-path-in-tests.patch
new file mode 100644
index 0000000000..1a03238246
=2D-- /dev/null
+++ b/gnu/packages/patches/fuzzylite-relative-path-in-tests.patch
@@ -0,0 +1,15 @@
+Workaround https://github.com/fuzzylite/fuzzylite/issues/85
+
+diff --git a/fuzzylite/test/BenchmarkTest.cpp b/fuzzylite/test/BenchmarkTe=
st.cpp
+index f868ec29..464d394d 100644
+--- a/fuzzylite/test/BenchmarkTest.cpp
++++ b/fuzzylite/test/BenchmarkTest.cpp
+@@ -30,7 +30,7 @@ namespace fl {
+ }
+=20
+ TEST_CASE("Benchmarks from FLD files", "[benchmark][fld]") {
+- std::string path =3D "../../examples/";
++ std::string path =3D "../examples/";
+ typedef std::pair<std::string, int > Example;
+ std::vector<Example> examples;
+ examples.push_back(Example("mamdani/AllTerms", int(1e4)));
diff --git a/gnu/packages/patches/fuzzylite-use-catch2.patch b/gnu/packages=
/patches/fuzzylite-use-catch2.patch
new file mode 100644
index 0000000000..e4aa13a98b
=2D-- /dev/null
+++ b/gnu/packages/patches/fuzzylite-use-catch2.patch
@@ -0,0 +1,184 @@
+Origin: https://salsa.debian.org/debian/fuzzylite/-/blob/debian/6.0+dfsg-6=
/debian/patches/fix-tests2.patch
+From: Ferdinand Thiessen <rpm@HIDDEN>
+Date: Mon, 31 Jan 2022 16:06:19 GMT
+Subject: Replace Catch with Catch2 and require C++11 for tests
+Origin: vendor, https://github.com/fuzzylite/fuzzylite/issues/94
+Bug-Debian: http://bugs.debian.org/1017155
+
+--- a/fuzzylite/CMakeLists.txt
++++ b/fuzzylite/CMakeLists.txt
+@@ -194,7 +194,9 @@ if(FL_BUILD_BINARY)
+ endif(FL_BUILD_BINARY)
+=20
+ if(FL_BUILD_TESTS)
++ find_package(Catch2)
+ add_executable(fl-test ${fl-headers} ${fl-tests})
++ target_link_libraries(fl-test Catch2::Catch2)
+ set_target_properties(fl-test PROPERTIES OUTPUT_NAME fuzzylite-tests)
+ set_target_properties(fl-test PROPERTIES OUTPUT_NAME fuzzylite-tests =
IMPORT_PREFIX tmp-) #To prevent LNK1149 in Windows
+ set_target_properties(fl-test PROPERTIES DEBUG_POSTFIX -debug)
+--- a/fuzzylite/test/activation/ThresholdTest.cpp
++++ b/fuzzylite/test/activation/ThresholdTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/BenchmarkTest.cpp
++++ b/fuzzylite/test/BenchmarkTest.cpp
+@@ -16,7 +16,7 @@
+=20
+ #include "fl/Benchmark.h"
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ #include <vector>
+--- a/fuzzylite/test/hedge/HedgeFunctionTest.cpp
++++ b/fuzzylite/test/hedge/HedgeFunctionTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/imex/FldExporterTest.cpp
++++ b/fuzzylite/test/imex/FldExporterTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/imex/FllImporterTest.cpp
++++ b/fuzzylite/test/imex/FllImporterTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/imex/RScriptExporterTest.cpp
++++ b/fuzzylite/test/imex/RScriptExporterTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+ #include <fstream>
+=20
+--- a/fuzzylite/test/MainTest.cpp
++++ b/fuzzylite/test/MainTest.cpp
+@@ -16,7 +16,7 @@
+=20=20
+ #define CATCH_CONFIG_RUNNER
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+=20
+ #include "fl/Headers.h"
+=20
+--- a/fuzzylite/test/norm/NormFunctionTest.cpp
++++ b/fuzzylite/test/norm/NormFunctionTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/QuickTest.cpp
++++ b/fuzzylite/test/QuickTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/AggregatedTest.cpp
++++ b/fuzzylite/test/term/AggregatedTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/DiscreteTest.cpp
++++ b/fuzzylite/test/term/DiscreteTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/FunctionTest.cpp
++++ b/fuzzylite/test/term/FunctionTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/TrapezoidTest.cpp
++++ b/fuzzylite/test/term/TrapezoidTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/term/TriangleTest.cpp
++++ b/fuzzylite/test/term/TriangleTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ namespace fl {
+--- a/fuzzylite/test/variable/VariableTest.cpp
++++ b/fuzzylite/test/variable/VariableTest.cpp
+@@ -14,7 +14,7 @@
+ fuzzylite is a registered trademark of FuzzyLite Limited.
+ */
+=20
+-#include "test/catch.hpp"
++#include "catch2/catch.hpp"
+ #include "fl/Headers.h"
+=20
+ #include <algorithm> // std::random_shuffle
diff --git a/gnu/packages/patches/fuzzylite-when-testing-large-float-number=
s-for-equ.patch b/gnu/packages/patches/fuzzylite-when-testing-large-float-n=
umbers-for-equ.patch
new file mode 100644
index 0000000000..47403605dd
=2D-- /dev/null
+++ b/gnu/packages/patches/fuzzylite-when-testing-large-float-numbers-for-e=
qu.patch
@@ -0,0 +1,30 @@
+Origin: https://salsa.debian.org/debian/fuzzylite/-/blob/debian/6.0+dfsg-6=
/debian/patches/when-testing-large-float-numbers-for-equ.patch
+From: Johannes 'josch' Schauer <josch@HIDDEN>
+Date: Sun, 3 Feb 2019 10:33:22 +0100
+X-Dgit-Generated: 6.0+dfsg-2 80960ae38da9db032dfbfec6405398653e8205ff
+Subject: when testing large float numbers for equality, use a larger epsil=
on
+
+
+---
+
+--- fuzzylite-6.0+dfsg.orig/fuzzylite/test/BenchmarkTest.cpp
++++ fuzzylite-6.0+dfsg/fuzzylite/test/BenchmarkTest.cpp
+@@ -96,7 +96,17 @@ namespace fl {
+ CHECK(Op::isEq(1.0, Benchmark::convert(1000.0, Benchmark::MilliSe=
conds, Benchmark::Seconds)));
+ FL_LOG(Benchmark::convert(1000.0, Benchmark::MilliSeconds, Benchm=
ark::Seconds));
+=20
+- CHECK(Op::isEq(35e9, Benchmark::convert(35, Benchmark::Seconds, B=
enchmark::NanoSeconds)));
++ scalar eps =3D
++#ifndef __i386__
++ fuzzylite::macheps();
++#else
++ // on i386, due to the 80bit x87 register, double floating po=
int
++ // numbers are handled differently and thus the difference be=
tween
++ // 35e9 and the result of Benchmark::convert() will be 2.179e=
-6,
++ // which is greater than the default epsilon of 1e-6.
++ 1e-5;
++#endif
++ CHECK(Op::isEq(35e9, Benchmark::convert(35, Benchmark::Seconds, B=
enchmark::NanoSeconds), eps));
+ CHECK(Op::isEq(35, Benchmark::convert(35e9, Benchmark::NanoSecond=
s, Benchmark::Seconds)));
+ }
+=20
=2D-=20
2.39.2
--=-=-=--
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZF7o8wAKCRDcUY/If5cW
qv/LAQCVDo3NwQ0HLkrBwRbtLV+9SJi5V/gXGqYxcd4gldUBWQEAoMBT/J+cTl62
kXonVJ4qHDf7DZNm0xTWMCIY+OGkRQI=
=cw9I
-----END PGP SIGNATURE-----
--==-=-=--
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.Received: (at 63435) by debbugs.gnu.org; 12 May 2023 20:53:38 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 12 16:53:38 2023 Received: from localhost ([127.0.0.1]:33656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pxZlh-0007MQ-S1 for submit <at> debbugs.gnu.org; Fri, 12 May 2023 16:53:38 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:60910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1pxZlf-0007M6-PQ for 63435 <at> debbugs.gnu.org; Fri, 12 May 2023 16:53:36 -0400 Received: by mail-ed1-f67.google.com with SMTP id 4fb4d7f45d1cf-50bd875398dso15719409a12.1 for <63435 <at> debbugs.gnu.org>; Fri, 12 May 2023 13:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683924810; x=1686516810; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=bHxSWNKxZYH6U0CqkAa35B7MOdf9EKeaHtYtWHG/YPE=; b=AN1y1CJSGLOU5uxuP87JioPUBJL2iJ/4TVuUeJb0WRyjVfDknSlc3C5Nqoca31qctP rTf8aCa2LpiIyLJJsyprfnIt7V23e8wUH/cDYyECiHQ4F8EVz29SMLAj3HgM2JPxgnHf bUlFo9VmBIzgflS75jYwwIC+b2d1rXDXPv6rA/r6m5SSlmBGN/s86qPRBZNjysofunFv wmjW57HAAZuIKhPc9zk9Kr/N9o32lmlJw5Ey/VFYBTKavjMN6vd0SlHcuDov/zjQU/1k PL/FPAWrX+retWXj517EyKYkqaSCgiofMiK+hB19FG/k/IZECFhM8RBkKxn4kIfYAexH 41Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683924810; x=1686516810; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=bHxSWNKxZYH6U0CqkAa35B7MOdf9EKeaHtYtWHG/YPE=; b=biK8T5qPVtP8uuAyGIJ5+WlIIZbWC9UHkm8K6I5dwRsgMA13dR485fSm1wVCfF9t5Z /Q+Vas219ycbXVfDIcRjIY4Gd6CtBYPvFn8qYhzKQxnzTINm/DZ4GXUbl/NN2vFCC1Zv muD8g/cllBZbFnESJZKDIVrYAujNn5LcWWJmaFy3wUgRkm7CtXLsQA4AfkihryMwhQbW Iu4usfSxBo4hh1DDABlW2ebegv0xt47Fn0e8AILeaCjKnXUuiirXtg0BmBZm7XZQT6Wg sWQl5gEGsN86iROmi84lNNv4KMnX62WCCzEel8VS7VugfNeZiiguP7OHKGJXjPF8eHWM X0nw== X-Gm-Message-State: AC+VfDyKwAKTfNnmAlkCW1pUSQcs/rxkM339+YWv2u0mzYj7V/hQEMMc Py+bVv6jZPGsL4CyQxkCrsXEg0nRsGZI7A== X-Google-Smtp-Source: ACHHUZ60gXwbgKPKWpnEX5v/gHHPZqPnR4yvqpQWzn+Spvvz/ueTagEjh9JXGSQeSUUAM2xeC0t+Mw== X-Received: by 2002:a17:907:86a7:b0:96a:42de:1cd5 with SMTP id qa39-20020a17090786a700b0096a42de1cd5mr9833611ejc.4.1683924809620; Fri, 12 May 2023 13:53:29 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id qo28-20020a170907213c00b00965ddf2e221sm5841773ejb.93.2023.05.12.13.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 May 2023 13:53:29 -0700 (PDT) Message-ID: <8e04176d6691bdc0996fb473b56ead31be954123.camel@HIDDEN> Subject: Re: Add vcmi 1.2.1 to games.scm From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Vagrant Cascadian <vagrant@HIDDEN>, 63435 <at> debbugs.gnu.org Date: Fri, 12 May 2023 22:53:28 +0200 In-Reply-To: <87wn1em5ti.fsf@wireframe> References: <87a5yb4e41.fsf@wireframe> <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN> <873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe> <9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN> <87wn1em5ti.fsf@wireframe> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63435 Cc: iyzsong@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) 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: > >=20 > > > +(define-public vcmi > > > +=C2=A0 (package > > > +=C2=A0=C2=A0=C2=A0 (name "vcmi") > > > +=C2=A0=C2=A0=C2=A0 (version "1.2.1") > > > +=C2=A0=C2=A0=C2=A0 (source (origin > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (method git-fetch) > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (uri (git-reference > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (url "https://github.com/v= cmi/vcmi") > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (commit version) > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (recursive? #t))) > > Can we do without the recursive checkout? >=20 > There is one component still used with the recursive > checkout. ... AI/Fuzzy* I think? I do not know if it could be built > independently, but I have not seriously looked into it. fuzzylite can be taken from the system which is the preferred approach. >=20 > If tests were enabled, the googletest stuff might be needed; it was a > bit unclear to me if the googletest packaged in guix could > work. Regardless, tests are disabled upstream... so if there is a way > to only download one and not the other, I guess that would save some > bandwith. >=20 > I *think* those are the only two things pulled in. Not that it matters if we aren't building tests, but googletest can and should be unbundled. There's a fair number of packages already setting a precedent. > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (file-name (git-file-name name version)) > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (sha256 > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (base32 > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=20 > > > "1nx3i078cxkak2ci514pf4pgi5269mp08njynsg35pin4yp3fn0p")) > > > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0 (patches (search-patches "vcmi-disable-privacy- > > > breach.patch")))) > > IIRC the reproducible builds patch is still missing, right? >=20 > The Debian package implements building man pages and documentation > outside of the upstream build system... >=20 > It did not seem worth patching something that was not used to build > anything... the reproducible builds patch(es) only apply to > documentation which is not part of the upstream build process, so I > left it out of this iteration. >=20 > That said... >=20 > Building vcmimanual.tex appears to be a one-liner, pulling in some > tex related dependencies: >=20 > =C2=A0 > https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/rules#L56 >=20 > And generating manpages used help2man and some templates debian > ships: >=20 > =C2=A0 > https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/rules#L46-4= 8 >=20 > Not sure if the manpages are worth the effort, or if the manual is > worth the larger dependency tree... Fair enough, if it can be left without, let's do without (unless you really want to build the manpage). Alternatively, you can pull the inputs in, but phrase the (build-documentation ...) phase in a way that those inputs can be dropped if someone values their disk space. > > > +=C2=A0=C2=A0=C2=A0 (native-inputs (list boost > > Guix style is, like, a suggestion that can be wrong.=C2=A0 You are > > allowed > > to fight it when the result of doing so is demonstrably better. >=20 > I get that ... but I also like just being able to run guix style and > not having to make those judgement calls. Because other things guix > style may change that are a good idea and it is really difficult to > pick and choose which things to revert and which to keep over time... >=20 > There are some things I think guix style does wrong(in particular, I > always prefer one input per line to make diffs easier to read), but I > do not hold strong opinions on guile coding style and just prefer to > concede to guix style and bear with the results. >=20 > I am also not strongly opinionated (it goes both ways, I guess!)... > so for clarity, are you saying you would prefer: >=20 > =C2=A0 (native-inputs > =C2=A0=C2=A0=C2=A0 (list > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 boost > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ... > or: >=20 > =C2=A0 (native-inputs > =C2=A0=C2=A0=C2=A0 (list boost > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ... >=20 > or something else? The latter. If it ever comes to needing (list on its own line you better have a good explanation for that or fix your comments so that they don't go overboard. Cheers
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 12 May 2023 06:18:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri May 12 02:18:02 2023
Received: from localhost ([127.0.0.1]:53810 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxM6L-0006wA-Ew
for submit <at> debbugs.gnu.org; Fri, 12 May 2023 02:18:02 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:46836)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1pxM6J-0006vo-NU
for 63435 <at> debbugs.gnu.org; Fri, 12 May 2023 02:18:00 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id 278371ACEF;
Thu, 11 May 2023 23:17:50 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1683872270;
bh=OFYMPSExDE9xpYCnpW3lmLcdbpcQ+ljfpHELpaxRs5E=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=WwGXiOoj8GX70fpW6ZWsNiMDC+3qPoy+ZHg0cEGyjXK3JeRGsJeEUcVC5FElf3A57
njpUY5807NTaN3P8+XLCOxfHKmuOA9Pj6kRnlZ2LbNOb8+DLL9HMVbMFWpgTB/sy3y
dSFKDiCm7LX5sh76+JULfeHZPj2xTDp8w211jathY94T+jRzuCGAfSBnlVNbS/xCXh
+Twln8mAfLUAJpoWeRlH3lMx3rV6TG11peEcVoAsOByq0bMnWm9oBlOR0ls0I6dRB4
baXxaP7LUOAJ0p9s4RPnDQOharSGyT98gns9a4cqZBtndWKmyd7PgqTPVcYr2gXtS6
8P1AeKf2x+C9g==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 63435 <at> debbugs.gnu.org
Subject: Re: Add vcmi 1.2.1 to games.scm
In-Reply-To: <9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
<873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe>
<9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN>
Date: Thu, 11 May 2023 23:17:45 -0700
Message-ID: <87wn1em5ti.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-05-12, Liliana Marie Prikler wrote:
> Am Donnerstag, dem 11.05.2023 um 16:07 -0700 schrieb Vagrant Cascadian:
>
>> +(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)))
> Can we do without the recursive checkout?
There is one component still used with the recursive
checkout. ... AI/Fuzzy* I think? I do not know if it could be built
independently, but I have not seriously looked into it.
If tests were enabled, the googletest stuff might be needed; it was a
bit unclear to me if the googletest packaged in guix could
work. Regardless, tests are disabled upstream... so if there is a way to
only download one and not the other, I guess that would save some
bandwith.
I *think* those are the only two things pulled in.
>> + (file-name (git-file-name name version))
>> + (sha256
>> + (base32
>> +=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20
>> "1nx3i078cxkak2ci514pf4pgi5269mp08njynsg35pin4yp3fn0p"))
>> + (patches (search-patches "vcmi-disable-privacy-
>> breach.patch"))))
> IIRC the reproducible builds patch is still missing, right?
The Debian package implements building man pages and documentation
outside of the upstream build system...
It did not seem worth patching something that was not used to build
anything... the reproducible builds patch(es) only apply to
documentation which is not part of the upstream build process, so I left
it out of this iteration.
That said...
Building vcmimanual.tex appears to be a one-liner, pulling in some tex
related dependencies:
https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/rules#L56
And generating manpages used help2man and some templates debian ships:
https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/rules#L46-48
Not sure if the manpages are worth the effort, or if the manual is worth
the larger dependency tree...
>> + (native-inputs (list boost
> Guix style is, like, a suggestion that can be wrong. You are allowed
> to fight it when the result of doing so is demonstrably better.
I get that ... but I also like just being able to run guix style and not
having to make those judgement calls. Because other things guix style
may change that are a good idea and it is really difficult to pick and
choose which things to revert and which to keep over time...
There are some things I think guix style does wrong(in particular, I
always prefer one input per line to make diffs easier to read), but I do
not hold strong opinions on guile coding style and just prefer to
concede to guix style and bear with the results.
I am also not strongly opinionated (it goes both ways, I guess!)... so
for clarity, are you saying you would prefer:
(native-inputs
(list
boost
...
or:
(native-inputs
(list boost
...
or something else?
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZF3aCQAKCRDcUY/If5cW
qslcAQDH7HIRNz8C/aVtGfZIJpFcGlyThKWYz2IallcXklEM0gD+P0Dr71hiaAuU
YS3/ERY+rCu5vRIbqNrtYvED7dgl5gc=
=qR6j
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.Received: (at 63435) by debbugs.gnu.org; 12 May 2023 01:47:36 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 11 21:47:36 2023 Received: from localhost ([127.0.0.1]:53681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pxHsd-0007cg-Tv for submit <at> debbugs.gnu.org; Thu, 11 May 2023 21:47:36 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:44222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <liliana.prikler@HIDDEN>) id 1pxHsb-0007c7-GT for 63435 <at> debbugs.gnu.org; Thu, 11 May 2023 21:47:34 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-94a342f7c4cso1671301466b.0 for <63435 <at> debbugs.gnu.org>; Thu, 11 May 2023 18:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683856047; x=1686448047; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=BGVbpl9jFxrNacY10hSSdXuZs3GsC+zlKzimACeXDqA=; b=T5cEVNS73KrecVu022x6EV6Hi73+twU4c3HEvyVC+SAfxKuDTl+7ITLAb2FIMx+zAD mUH6RusnILdiHm7I7DHQ2896xiRrDs8bwcbWtApUjeFUVuen0SrgdqG9eSuGE+jJvQH5 +jFmpIk06fp0ATyRZS/CFIR1MR7D5yxnxuzzwTyjq0rMrDX11SbYAyiPP5QsiQOuAFqA xBDSibK2uzvJtM0zQguXbeY6hnKKC14J8EY3kLc9IPd8wvZt/cfAdXQn5ZWfrwpRassE AeTvrIybV2MsU5SHPMO4LzBhuAK8ThZAu0K00HhcYmaJu3q5kWWodyCkfcdqPYCOv5qQ YPqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683856047; x=1686448047; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BGVbpl9jFxrNacY10hSSdXuZs3GsC+zlKzimACeXDqA=; b=LR7rQiB6Ibr8W+1RQ2zwsJxD8gKIy0e691syL9b5sJXm7M9kmpxuP8kjI7UgTphr/O 3m+caUTWnb4IiMvPxPEEdEqNt6JBd0FJDZH7Gau2qk6BsQ4C3efT6Md1SoYyMWn3cE7o 6F+NdqERzygJ+FUxQQmUNXB38hjed/P3+DDstTA0JqGSHpPpDnHa9R+LGktTjpPFToHl B7na/RXjmz4VQIcF+oiWzMrC3hiIyK7/+E7gzdkfZNXA8Jt6jEGU1wVfguU7+nB7iQ5B 4JrQV/jW0fRO99WXeCu+FonpY41JjgW9T5n5EcD3dcCck8n8DBeYLojZ3g+cviY0tAzn v5Pg== X-Gm-Message-State: AC+VfDxH/5sSYakrAAUuEJXNH8SUGbGI1DbG5AZBT08xkBWuDoxUvtCG oNVKICrPPEVe6/0MuFike24= X-Google-Smtp-Source: ACHHUZ71IuyH4RvqpEdCY4UsQt1fNMgdqcIRnoRnWUbs/7UITQEN5HQU1/Fg+wuooKQHXkT2vndhJA== X-Received: by 2002:a17:906:dc93:b0:965:9602:1f07 with SMTP id cs19-20020a170906dc9300b0096596021f07mr22341625ejc.39.1683856047469; Thu, 11 May 2023 18:47:27 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id s15-20020a056402164f00b0050d56dffc93sm3540856edx.12.2023.05.11.18.47.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 18:47:27 -0700 (PDT) Message-ID: <9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@HIDDEN> Subject: Re: Add vcmi 1.2.1 to games.scm From: Liliana Marie Prikler <liliana.prikler@HIDDEN> To: Vagrant Cascadian <vagrant@HIDDEN>, 63435 <at> debbugs.gnu.org Date: Fri, 12 May 2023 03:47:26 +0200 In-Reply-To: <87zg6ampqf.fsf@wireframe> References: <87a5yb4e41.fsf@wireframe> <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN> <873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63435 Cc: iyzsong@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Am Donnerstag, dem 11.05.2023 um 16:07 -0700 schrieb Vagrant Cascadian: > +(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))) Can we do without the recursive checkout? > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + =20 > "1nx3i078cxkak2ci514pf4pgi5269mp08njynsg35pin4yp3fn0p")) > + (patches (search-patches "vcmi-disable-privacy- > breach.patch")))) IIRC the reproducible builds patch is still missing, right? > + (native-inputs (list boost Guix style is, like, a suggestion that can be wrong. You are allowed to fight it when the result of doing so is demonstrably better. Cheers
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 11 May 2023 23:07:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 11 19:07:53 2023
Received: from localhost ([127.0.0.1]:53629 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxFO5-0003Ev-AP
for submit <at> 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 <vagrant@HIDDEN>) id 1pxFO1-0003Ea-Bx
for 63435 <at> 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@HIDDEN)
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 <vagrant@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 63435 <at> debbugs.gnu.org
Subject: Re: Add vcmi 1.2.1 to games.scm
In-Reply-To: <873542o7ze.fsf@wireframe>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
<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-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--==-=-=
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 <vagrant@HIDDEN>
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 <josch@HIDDEN>
+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-----
--==-=-=--
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 11 May 2023 21:48:24 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 11 17:48:24 2023
Received: from localhost ([127.0.0.1]:53589 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pxE99-0000o5-JJ
for submit <at> debbugs.gnu.org; Thu, 11 May 2023 17:48:23 -0400
Received: from cascadia.aikidev.net ([173.255.214.101]:41184)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1pxE97-0000nI-EH
for 63435 <at> debbugs.gnu.org; Thu, 11 May 2023 17:48:22 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id E002F1ACAB;
Thu, 11 May 2023 14:48:11 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1683841692;
bh=uXS5xUW1Oq4ryHEMoZkpkFHYzaB6W65re8x/3dgcPa4=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=alzZFxjtcVijdauTbefHR9BNTkFO2LuewkbSmsM+BoOd8aJ0gG7iYmCaN1fF2oeo3
p0kxtHAW74TCzjhmN8HgwBB+Yd7t/oMp//yy8m9OhH9zTR73FWPawynYNTU1pK9uOZ
px85fzcDOvQOk9sQh5cxMhDF0CBBPKwXNtoFi1phb5/k48K9Tau/Xb8scU5sSprMsQ
4qxiO9ha8cM/FtBtVL8NwgJYWPgc3Z+MfS9Ru7PZnzm1SoK6ouDKqY/Kwvs+VbgWW5
Zve/M0wDVHbNBFcFRI1WBzU9aL5VBU2mNYkxCT+esad/NLQ+mTvT5mPV3pA5rsqEGZ
FIzvAzCJlqk3g==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: Liliana Marie Prikler <liliana.prikler@HIDDEN>, 63435 <at> debbugs.gnu.org
Subject: Re: Add vcmi 1.2.1 to games.scm
In-Reply-To: <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
References: <87a5yb4e41.fsf@wireframe>
<51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
Date: Thu, 11 May 2023 14:48:05 -0700
Message-ID: <873542o7ze.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
On 2023-05-11, Liliana Marie Prikler wrote:
> Am Mittwoch, dem 10.05.2023 um 22:43 -0700 schrieb Vagrant Cascadian:
>> I had successfully built with various qt*@6 packages, but they are
>> not currently building; it seems to support qt*@5 too.
>>=20
>> Some things failed to build with gcc-11, so I tried gcc-12 and it
>> worked!
> Can you elaborate what things? I doubt it makes elaborate use of
> C++20/23 features, does it?
Well, just retried with the default gcc, and it worked this time! so I
guess I will just switch the next patch iteration back to the default
gcc...
>> 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.
Will try applying some of those patches now...
>> + (native-inputs (list boost
> The following lines get very long, consider breaking before (list
>> + ffmpeg
>> + ;; Build errors with gcc-11
>> + gcc-12
>> + ;; googletest ; needed for tests, but tests
...
>> + zlib))
While I share your opinion, I tried changing it in various ways, and
"guix style" changed it right back. I do not really want to fight with
"guix style" too much... even if I disagree a bit with the results.
>> + "@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.
Thanks for the review!
live well,
vagrant
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZF1ilQAKCRDcUY/If5cW
qvMdAP4xLMP/VSGL4aO+LUBgTUOx6VgwSCQyQVo8JMoU9Sf17QEA6wC9dCnbQVGi
me7o5ch+bZXp6Ov/enRDGc+V3GfiCQo=
=oGY7
-----END PGP SIGNATURE-----
--=-=-=--
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at 63435) by debbugs.gnu.org; 11 May 2023 17:17:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 11 13:17:29 2023
Received: from localhost ([127.0.0.1]:53290 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1px9uz-0007Wb-0R
for submit <at> debbugs.gnu.org; Thu, 11 May 2023 13:17:29 -0400
Received: from mail-ej1-f67.google.com ([209.85.218.67]:58600)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <liliana.prikler@HIDDEN>) id 1px9uw-0007WL-JA
for 63435 <at> debbugs.gnu.org; Thu, 11 May 2023 13:17:27 -0400
Received: by mail-ej1-f67.google.com with SMTP id
a640c23a62f3a-966400ee79aso1155702766b.0
for <63435 <at> debbugs.gnu.org>; Thu, 11 May 2023 10:17:26 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1683825440; x=1686417440;
h=mime-version:user-agent:content-transfer-encoding:references
:in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject
:date:message-id:reply-to;
bh=RB/GAJZDw/dkpXwdkVfhJPTGbR7MdBKJ7MeT2A9NB14=;
b=o/S0bqiHwMi2FKWl/6OWq53T06XNr5fVl7c1IxhjjaK3pxEkX0tqRHTqU5ezX0jCaC
gIo3z0MQtGwNSm2wfoBzh5CX2rWIIfi06oCCkDUjiE82ilk83rTiJTVQVmyc+kZpvw5a
k3J39+oMJUW5ltlS+I8vee46Hc9AJNfGGvJuTL7uY+DDfTFY8zT5xuckVjLtehmnvrO7
LyB9KxsmaC5bYtLkAlaR1WnArGsmUevOhodFxxvXy7jN6jHw2sLrGFa2l8MU4dZzMFkS
7vkEmcSFcqYd5Mz2b+wrhyFTn1B61K2ZQWKiAs/hiDcsKQa0g8W5WXqfyxLPO1fGOWcL
Z6Og==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1683825440; x=1686417440;
h=mime-version:user-agent:content-transfer-encoding:references
:in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=RB/GAJZDw/dkpXwdkVfhJPTGbR7MdBKJ7MeT2A9NB14=;
b=ArXrKrfa1cRYOeC8JWt8CRQCBDXEkuIcLhDYAsOiwV3EPJaGJLb8tz6z9LUzolXRz/
9HQgfdf6XDcrKg5po2r9GknVNFDIZlNq8Md7YpKZ36inJTqwSQtoU4vaFf43zV9ZQjfy
dqblcdFk2OLii4k7+mMGpJ3xLjnOes1cAIquQ72INdkxFqQB0EtQkPaIuEcGEt58xmL8
T76diard5fvR170Et09KzM7YpqPuDcsXdRCijRAJmQ6HbIs6Z7zC/NX+rTRTgW9boWAT
kZX/Eq39+oqarA0gu3dLGT2NQi/2HAFi/NMmeeqMpgbbgksiwLULdmrL6myI+qYrsQCN
Zw2w==
X-Gm-Message-State: AC+VfDziU6FlTgtWIairrpPhYkik763xx9I7qadjwfV31bKzwApBlM+S
WKeuXNROrFfEfFpCt+ARiHw=
X-Google-Smtp-Source: ACHHUZ4wvHXJWR6eeP1Ux3nOP4TAppMpJpRIOjUlPIyBxPluMvHwdOeZ+oN8oxjAw5yB6pWBr1hK+Q==
X-Received: by 2002:a17:907:36c8:b0:95e:d74b:d171 with SMTP id
bj8-20020a17090736c800b0095ed74bd171mr17230242ejc.28.1683825440339;
Thu, 11 May 2023 10:17:20 -0700 (PDT)
Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at.
[85.127.52.93]) by smtp.gmail.com with ESMTPSA id
w21-20020a170907271500b00969dfd160aesm3934181ejk.109.2023.05.11.10.17.19
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 11 May 2023 10:17:19 -0700 (PDT)
Message-ID: <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@HIDDEN>
Subject: Re: Add vcmi 1.2.1 to games.scm
From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
To: Vagrant Cascadian <vagrant@HIDDEN>, 63435 <at> debbugs.gnu.org
Date: Thu, 11 May 2023 19:17:18 +0200
In-Reply-To: <87a5yb4e41.fsf@wireframe>
References: <87a5yb4e41.fsf@wireframe>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.4
MIME-Version: 1.0
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Am Mittwoch, dem 10.05.2023 um 22:43 -0700 schrieb Vagrant
Cascadian: > X-Debbugs-Cc: liliana.prikler@HIDDEN, iyzsong@HIDDEN >
> The attached patch adds "vcmi", which is in many ways very similar [...]
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (liliana.prikler[at]gmail.com)
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [209.85.218.67 listed in list.dnswl.org]
1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL,
https://senderscore.org/blocklistlookup/
[209.85.218.67 listed in bl.score.senderscore.com]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[209.85.218.67 listed in wl.mailspike.net]
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
X-Debbugs-Envelope-To: 63435
Cc: iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.3 (/)
Am Mittwoch, dem 10.05.2023 um 22:43 -0700 schrieb Vagrant Cascadian:
> X-Debbugs-Cc: liliana.prikler@HIDDEN, iyzsong@HIDDEN
>=20
> The attached patch adds "vcmi", which is in many ways very similar to
> the "fheroes2" package, in that it (currently) requires external
> non-free assets, but the game engine itself is GPL2. They also both
> use assets from the same game lineage (heroes of might and magic).
Not my favourite kind of game, I must say, but under crapitalism you
get what you pay for.
> I struggled to get the tests to work, and they do not seem to be
> terribly well maintained upstream. They are even disabled by default
> by upstream. I did some very brief manual "testing" that it actually
> works, at least!
The comment you put in the source is fine for me.
> I had successfully built with various qt*@6 packages, but they are
> not currently building; it seems to support qt*@5 too.
>=20
> Some things failed to build with gcc-11, so I tried gcc-12 and it
> worked!
Can you elaborate what things? I doubt it makes elaborate use of
C++20/23 features, does it?
> 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.
> + (native-inputs (list boost
The following lines get very long, consider breaking before (list
> + ffmpeg
> + ;; Build errors with gcc-11
> + gcc-12
> + ;; 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))
> + "@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.
Cheers
guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 11 May 2023 05:44:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu May 11 01:44:04 2023
Received: from localhost ([127.0.0.1]:49465 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1pwz5w-0001Ao-Cf
for submit <at> debbugs.gnu.org; Thu, 11 May 2023 01:44:04 -0400
Received: from lists.gnu.org ([209.51.188.17]:37212)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <vagrant@HIDDEN>) id 1pwz5r-00019m-Ng
for submit <at> debbugs.gnu.org; Thu, 11 May 2023 01:44:03 -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 <vagrant@HIDDEN>)
id 1pwz5r-0007TR-Dh
for guix-patches@HIDDEN; Thu, 11 May 2023 01:43:59 -0400
Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <vagrant@HIDDEN>)
id 1pwz5p-0000SZ-3c
for guix-patches@HIDDEN; Thu, 11 May 2023 01:43:59 -0400
Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50])
(Authenticated sender: vagrant@HIDDEN)
by cascadia.aikidev.net (Postfix) with ESMTPSA id C31171ACA7;
Wed, 10 May 2023 22:43:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org;
s=1.vagrant.user; t=1683783825;
bh=3FQVM0qUNFWT9vXPfHU+SAjSvDmsDLf37uKR0rYsSpg=;
h=From:To:Cc:Subject:Date:From;
b=Wt1P2yaGVRS+oS19GM7Afe6P9QVf87aQOiQDrxOkhDtrfd+w8yrtcIJhAkNSi+WbC
10eQC9sI58mZTg6uyXWBDxo90agerdSZoSGgMAbcsTI+eNm3xlABE2hiEypv5JbfdG
GzO6GrLNJV20aTYcaBYUhdArx6bwtUx4N6bA8OBFcA54JXEr8BXtcgzVkHmvd9+MqN
aQqZfQYm+akKi0/ZxK2/TpPJzS5vbOZaiuET15NJtZan4LXy7AQWO+FRnkmBiqRtyf
PzUXB3GaoE0ifLOeyZnMXo//bkBlAQoT6xDZbF2nboYjF9fhLX6lDdSy0gAmbyRNVj
GRh0RGTIgNiLQ==
From: Vagrant Cascadian <vagrant@HIDDEN>
To: guix-patches@HIDDEN
Subject: Add vcmi 1.2.1 to games.scm
Date: Wed, 10 May 2023 22:43:42 -0700
Message-ID: <87a5yb4e41.fsf@wireframe>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="==-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: none client-ip=2600:3c01:e000:267:0:a171:de7:c;
envelope-from=vagrant@HIDDEN; helo=cascadia.aikidev.net
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,
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,
T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: submit
Cc: liliana.prikler@HIDDEN, iyzsong@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
--==-=-=
Content-Type: multipart/mixed; boundary="=-=-="
--=-=-=
Content-Type: text/plain
X-Debbugs-Cc: liliana.prikler@HIDDEN, iyzsong@HIDDEN
The attached patch adds "vcmi", which is in many ways very similar to
the "fheroes2" package, in that it (currently) requires external
non-free assets, but the game engine itself is GPL2. They also both use
assets from the same game lineage (heroes of might and magic).
I struggled to get the tests to work, and they do not seem to be
terribly well maintained upstream. They are even disabled by default by
upstream. I did some very brief manual "testing" that it actually works,
at least!
I had successfully built with various qt*@6 packages, but they are not
currently building; it seems to support qt*@5 too.
Some things failed to build with gcc-11, so I tried gcc-12 and it
worked!
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...
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=2094eabedcac6fb61ae1ddd77c6c28f89594586017 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@HIDDEN>
Date: Sun, 7 May 2023 17:43:33 -0700
Subject: [PATCH] gnu: Add vcmi 1.2.1.
FIXME review debian patches:
https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/patches/dis=
able-privacy-breach
https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/patches/rep=
roducible.patch
...and secrent as-yet-unsubmitted reproducibility patches...
https://salsa.debian.org/games-team/vcmi/-/blob/master/debian/patches/min=
izip_maxu32
X-Debbugs-Cc: liliana.prikler@HIDDEN, iyzsong@HIDDEN
* gnu/packages/games.scm (vcmi): New variable.
=2D--
gnu/packages/games.scm | 48 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 2e3994543a..c2b60037cc 100644
=2D-- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -199,6 +199,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)
@@ -11169,6 +11170,53 @@ (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"))))
+ (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
+ ;; Build errors with gcc-11
+ gcc-12
+ ;; 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 (aka HOMM3) 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")
base-commit: e2eb43f945fd467e9b55a4b3c91cd186cf32e268
=2D-=20
2.39.2
--=-=-=--
--==-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZFyAjgAKCRDcUY/If5cW
qj2UAP9TxhALfTuXxXxS/w8IBxC9TsNqOhg6lgzJGIdCINzdUAD9Fq9n3KJcyoOA
vLOP+HSv2htpEdKqHjbzmOAx03gwbww=
=HDPT
-----END PGP SIGNATURE-----
--==-=-=--
Vagrant Cascadian <vagrant@HIDDEN>:liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN.
Full text available.liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#63435; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.