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 detiHRTpXmQbPwAASxT56A (envelope-from ) for ; Sat, 13 May 2023 03:34:12 +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 IBS1GxTpXmSr5gAAG6o9tA (envelope-from ) for ; Sat, 13 May 2023 03:34:12 +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 95DC811BEB for ; Sat, 13 May 2023 03:34:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pxe97-0002sO-0i; Fri, 12 May 2023 21:34:05 -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 1pxe95-0002rz-3P for guix-patches@gnu.org; Fri, 12 May 2023 21:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxe94-0007vx-QE for guix-patches@gnu.org; Fri, 12 May 2023 21:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pxe94-0006nQ-Fr for guix-patches@gnu.org; Fri, 12 May 2023 21:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63435] Add vcmi 1.2.1 to games.scm Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 13 May 2023 01:34:02 +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.168394163726113 (code B ref 63435); Sat, 13 May 2023 01:34:02 +0000 Received: (at 63435) by debbugs.gnu.org; 13 May 2023 01:33:57 +0000 Received: from localhost ([127.0.0.1]:34434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxe8y-0006n6-Pz for submit@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 ) id 1pxe8w-0006mr-Dv for 63435@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@cascadia.debian.net) 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 In-Reply-To: <8e04176d6691bdc0996fb473b56ead31be954123.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> 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683941652; a=rsa-sha256; cv=none; b=o0o/2aSur3/R4U4df29rxPWudydmudmF2t5qjLP/NQJ86F/DWeXIdcHUheGxHXoshapR2C HoqujUE9Nc6C5C140M+Sau2sx0D9Q92W69ezS2ruDYiQDq4CFWvmHmwodjecNz+k59O4Bn wnxOPRfa++NqgAX9/o3+68ElOMEjg1l+fSws8duWRFw0T6SVW0sr5yQOCoYrhmYurDMddy OrGQaiozUd4f9dAxUlRtAlMCS6bLZu7yEBKFjDOpzdRiTchUQCmUmRhm3D/DKvOsn6I/yB nCsZgKqToIDoOGkl4dsfCe3JJ8bJ6sL8lHMkUczhCe49zIYL3wA4dx9Bs9xl5g== 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=oQH1DRxw; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683941652; 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=qrwXgw92kzDCc0T/mX9lBTG2OUbi6qlOFu2QU3olbMA=; b=JgV3hqg4x8odZMzPLA8xZyyBBpOOSInWRfN92V+aPsSNhjvmtfGZi8g01TSX0XEIO/L8tQ Ki98+5oDrAu85Ln9qwsT7+iTHfIoADInc0VJZPS9xUfmBVgaW/sZEnU2HhDMLeLtrOkS9O Llj3a0FJGVemcAxUyP3fF3Dkcep//s6MgzE6Vq2rwan3acW0SO1+yPoUTkkFbZ4WINTxGs H2aGc1qJVajzj2jMRDngc9qE3r6jnpQVbAJDPM+odn9ZZ+gki/4J4wYPHtFDgDAIbo+TVw xj/m4kd/ZhHDgccTJVhdY/lwTagdzaYgkuy1XEG/WiMW/sjkmPuw6/LHxgCvCQ== X-Migadu-Spam-Score: -4.58 X-Spam-Score: -4.58 X-Migadu-Queue-Id: 95DC811BEB X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debian.org header.s=1.vagrant.user header.b=oQH1DRxw; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: zJw8WKNEWt16 --==-=-= 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 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 Example; + std::vector 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 +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 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 +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----- --==-=-=--