From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2HPWKKs3omSUvAAASxT56A (envelope-from ) for ; Mon, 03 Jul 2023 04:51:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YPLfJ6s3omQ0RQEAG6o9tA (envelope-from ) for ; Mon, 03 Jul 2023 04:51:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 066F710335 for ; Mon, 3 Jul 2023 04:51:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qG9ea-0002eZ-0Y; Sun, 02 Jul 2023 22:51:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qG9eY-0002eR-Eb for guix-patches@gnu.org; Sun, 02 Jul 2023 22:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qG9eY-0005oV-6a for guix-patches@gnu.org; Sun, 02 Jul 2023 22:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qG9eX-0001y4-Ka for guix-patches@gnu.org; Sun, 02 Jul 2023 22:51:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63435] Add vcmi 1.2.1 to games.scm Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jul 2023 02:51:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63435 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Liliana Marie Prikler , 63435@debbugs.gnu.org Cc: iyzsong@envs.net Received: via spool by 63435-submit@debbugs.gnu.org id=B63435.16883526437535 (code B ref 63435); Mon, 03 Jul 2023 02:51:01 +0000 Received: (at 63435) by debbugs.gnu.org; 3 Jul 2023 02:50:43 +0000 Received: from localhost ([127.0.0.1]:32985 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qG9eE-0001xS-9H for submit@debbugs.gnu.org; Sun, 02 Jul 2023 22:50:43 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:37314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qG9e8-0001x9-3c for 63435@debbugs.gnu.org; Sun, 02 Jul 2023 22:50:40 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 83BB81AB17; Sun, 2 Jul 2023 19:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1688352626; bh=+iQMwIIvEgE0zk0Y7jIR0pV7+Fk4yMZQW1paeKTlzms=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=huDyvuRSUt9PZ103trV6Cc0HqQcqgmShWiyFmNbQta9ygtgpb1DxfL+37xk8cEx8T 5mI1i9RLabxODt6YYZAx12ejFBtY08y5BsYW0yJfX/uYpDTQhjy8SvLWzJdB2Smh5Z 1QaWDsTL7ZMbF9AyGBhMqKai3y7YctaPNZBdYUSwkU9D6figkdRPuRgB6ZJA8cHN2M 5VVgVDIja+Li7Kx7MbNADoRnVui5Fj/PP7XDwn821r/47OLFklZErd8d8sTbQmIARa Bwe8oawfS/EzGV5FPpeoW3qPcUg5vKDlqNVWdu59PtdTfMIob31OE4ED2PQlTtDIZL ByAnTiInt5LkA== From: Vagrant Cascadian In-Reply-To: <16d133f8d31322aee3bb5cea5baff6fc03fc95ca.camel@gmail.com> References: <87a5yb4e41.fsf@wireframe> <51be2fdd711bf490e3a925334e571ff7871d6cbb.camel@gmail.com> <873542o7ze.fsf@wireframe> <87zg6ampqf.fsf@wireframe> <9ee9b4f47ee7c5af274074da89febdb4df9ca68d.camel@gmail.com> <87wn1em5ti.fsf@wireframe> <8e04176d6691bdc0996fb473b56ead31be954123.camel@gmail.com> <87ttwhm2vg.fsf@wireframe> <87r0rlm2rn.fsf@wireframe> <210acc39f6c1c114004aa1d79c171b1a255c5747.camel@gmail.com> <87fs7yn10z.fsf@wireframe> <16d133f8d31322aee3bb5cea5baff6fc03fc95ca.camel@gmail.com> Date: Sun, 02 Jul 2023 19:50:19 -0700 Message-ID: <87fs65yahg.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1688352683; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=K+na30QuVba1QqkjzmfCtfOeuFR9Et5ibWFV65/vqv0=; b=YoZ9zPj8ircgG8EjALKvZ/3DrQFQlQoka/j5HnECuoLeBKZrwEmlnTOpFBxqUNC3dBsiFU c7AlO8hOEIGaTgq2C77LHKxGN65nKX/AQZM+24a0oZ/LaM12cum5g0IYYUxVl6m3oZhXNz JzQb4pwRHEojNvzjO9q5Z4AZmvabMPLk3zoioCNbo0d28BgaNRTZPquVFIWPHvv86AOKAg m/O53PfgeNHbCIeOJarm6K1Wed0XnsPo3CupStMij7q1qVSUWcVdrPRMnu+kYsW5GLI+rC u5klEpV/r3MxOJl8NYorMXsToVlA/3zCC+bHk11j2ZeTZrQFyupJCwzhpMcoQQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=huDyvuRS; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1688352683; a=rsa-sha256; cv=none; b=Y6pOp/bzA+eqNAutFNphFQVMWpZqT+b8urdTiP6JdfZ/VKLlMDn759bY8MFgmgnEigJ2e8 /AE3/vbgfKnnA5CTQGKjbjkP9lg2ygQt5LpiWeriHcavLQqf/iWGanE8MYaoNF+Yku40FB Kk8gpiAFAu/0mw72AZHhHvzmCw2333qzARARMDYwZaliP5D93MOFrMV/WylkpQJnmiJKaL yowm4vCeEGBpUy3g/IIyyXDY31czqTedZGEw9cSHaU5eRNEtg/n4jVi2fj+z16YiRVaaiT joqdn5zawxnEfeD7icBnvQGW4tljyxNt37BE2dQSfqAuc82h7FtISKLOXZLZtw== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.86 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=huDyvuRS; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 066F710335 X-Spam-Score: -3.86 X-TUID: MUkbqBmUT07o --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain On 2023-05-15, Liliana Marie Prikler wrote: > Am Sonntag, dem 14.05.2023 um 12:52 -0700 schrieb Vagrant Cascadian: >> Also applied. Used "fuzzylite" for XXX... > Is the failure due to fuzzylite? Actually, XXX is a marker for > incomplete code like TODO. I see, not a convention I am used to! Switched to XXX: ... Updated patches attached. 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=202986a66a3bc7044e3c5f33b894a71551b4eef32d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian 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 e65888a044..9ec550355c 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1157,6 +1157,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 83704dd720..d2bd448f99 100644 =2D-- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3643,6 +3643,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 Example; + std::vector 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 +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 +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 +--- 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 +=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 // std::random_shuffle base-commit: 6cdab8fd09ffb1de169ad30f0b4edd4c9c00a201 =2D-=20 2.39.2 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-Add-vcmi-1.2.1.patch Content-Transfer-Encoding: quoted-printable From=20818fb9cc3b8f31009d9c540555c63b4f894d5335 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 7 May 2023 17:43:33 -0700 Subject: [PATCH 2/2] gnu: Add vcmi 1.2.1. * gnu/packages/games.scm (vcmi): New variable. * gnu/packages/patches/vcmi-disable-privacy-breach.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add patch. =2D-- gnu/local.mk | 1 + gnu/packages/games.scm | 49 +++++++++++++++++++ .../patches/vcmi-disable-privacy-breach.patch | 21 ++++++++ 3 files changed, 71 insertions(+) create mode 100644 gnu/packages/patches/vcmi-disable-privacy-breach.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9ec550355c..b421e458c8 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -2053,6 +2053,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 d2bd448f99..c42b68fa58 100644 =2D-- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -202,6 +202,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) @@ -11304,6 +11305,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 + ;; XXX: 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 +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/If5cWqgUCZKI3awAKCRDcUY/If5cW qidEAQDiuS7sXQpa3QQ7eE3/PgDTX3N+uHNru4/figU8MyRr5AEA8VbtRi9t4HNe glE5z3uRgW20nkAYDPbUALIAPP+5Uwo= =VlmQ -----END PGP SIGNATURE----- --==-=-=--