From nobody Fri Oct 07 18:36:11 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MkcT76n4kz4VBJp; Fri, 7 Oct 2022 18:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MkcT76MlTz3QPS; Fri, 7 Oct 2022 18:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665167771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIqC0RDG1s4GRCCIGUooljaWmk20BUqfjvQRvB87FI8=; b=kdCAXETdXz6MrMxrenN2YuDFLsolIFgO+UDtDep9Zsb41m13XILQcWCuz1hnVmf1tkBuL8 WHsl1CEBTRvc4i55keBnyzq39L7kGFI5RBrK1YLaAzAxJxz831DpbnfiZaIqiL8D7ndNe1 ZfGdq1YCrlkLvHpetlh2AzLDvfZGi2lZCgGCc/DKoMCKE+mVyMImmaZqCfOGWdEp8owp1D XgRjj22EZy+bk9OgfEr8Eje0LGRaKDO5BucyTOPSa9zp3NWo4jWrnmyUZfE16ickD0cNnj WjfpIPTX1sgYV81TIw2TTS7cMYCpwEa7SjwX1xAgp8HGfXaB9v114QknktcCwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MkcT75Sy9zhBV; Fri, 7 Oct 2022 18:36:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 297IaBgp087151; Fri, 7 Oct 2022 18:36:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 297IaBpi087150; Fri, 7 Oct 2022 18:36:11 GMT (envelope-from git) Date: Fri, 7 Oct 2022 18:36:11 GMT Message-Id: <202210071836.297IaBpi087150@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: aad793666b9a - main - science/dimod: Update 0.11.5 -> 0.11.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aad793666b9a5393ed258e35ae47fc5982de3531 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665167771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JIqC0RDG1s4GRCCIGUooljaWmk20BUqfjvQRvB87FI8=; b=gtHAxv7IO20tApYRfE9yZIkBpPr1yL0CqSVx/UXuXuZ8NOhfdZqJTKZt8EVVGWowQmcWIK XPuUQ5y0ad4BAkRkd4ZeatAhK10evdNXeQ25O6GB+WOowpNj6l1Grki8V5sp3/dnKOZN39 F7K6WmN13Qf3d0avYpMjIdQ7ONrjJGdF2YKqiHOb/hhZFR0o29puLSNJlDk442QRhHJsFh +3HaFFayrJ9oNZWWd4KQxKUqJaB1Nyr9oeBqGPbN6BQzq36+OBIjx6m4v1gVUdIDbkoPxB ePuqDLJUhq6CBFPdo01LTHrwCAxG/o9JV5RdtYHPImoukZFEX8eo/uqcK/ABow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665167771; a=rsa-sha256; cv=none; b=OQcwA1+WyRpOS0Zb9+uRqnaNdoYiY6vhQK4bQXI/QoJ42RoWqxU3nb2E8bllEG14PVGQS0 upvwuc8yPXe3limRv+b1ARpozXo/xQvXCXM9wXvv6zAnFyuPPfHsSdPQRIKCZY0aMDV3bC sdgQWW3bflso0OQobqLIe7i3+H96d/KoghwqgQbZFz/tx7Z5SXhUOOMsv2f5+biBkskVe3 sZloXG0Sgu/zYSFv9FNzKkvj9mBqExougbZNqUJ2KR7SlDhVPySV7GfpFGup4xaLjHLm/O gdv91m4bxAv6m9YiVzmHneQOJTd1VlNszVynJz3jj6It3PfZCEC8pK7mUwmbYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=aad793666b9a5393ed258e35ae47fc5982de3531 commit aad793666b9a5393ed258e35ae47fc5982de3531 Author: Yuri Victorovich AuthorDate: 2022-10-07 15:17:01 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-07 18:36:04 +0000 science/dimod: Update 0.11.5 -> 0.11.6 Reported by: portscout --- science/dimod/Makefile | 2 +- science/dimod/distinfo | 8 +++----- science/dimod/files/patch-testscpp_Makefile | 21 +++++++++++++++------ science/dimod/files/patch-testscpp_test__main.cpp | 4 ++-- .../patch-testscpp_tests_test__quadratic__model.cpp | 4 ++-- .../files/patch-testscpp_tests_test__utils.cpp | 4 ++-- 6 files changed, 25 insertions(+), 18 deletions(-) diff --git a/science/dimod/Makefile b/science/dimod/Makefile index 0d7c47051874..99d9e143f6bc 100644 --- a/science/dimod/Makefile +++ b/science/dimod/Makefile @@ -1,5 +1,5 @@ PORTNAME= dimod -DISTVERSION= 0.11.5 +DISTVERSION= 0.11.6 CATEGORIES= science python MAINTAINER= yuri@FreeBSD.org diff --git a/science/dimod/distinfo b/science/dimod/distinfo index cdecb040478e..3b7c3a46ddaf 100644 --- a/science/dimod/distinfo +++ b/science/dimod/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1661575588 -SHA256 (dwavesystems-dimod-0.11.5_GH0.tar.gz) = 8602da849ed8ae13d48eb0507d4107b2037d072a53652673ab108bb5772f443b -SIZE (dwavesystems-dimod-0.11.5_GH0.tar.gz) = 520765 -SHA256 (catchorg-Catch2-f0dc4d9_GH0.tar.gz) = 2fed775decd4fa7adbfb193d2e80a2937e3eaaeef2f5b0633ec21449995ff77d -SIZE (catchorg-Catch2-f0dc4d9_GH0.tar.gz) = 651357 +TIMESTAMP = 1665166180 +SHA256 (dwavesystems-dimod-0.11.6_GH0.tar.gz) = a6ede2065f13008fe40e2ca9ebf7b0458293c837cf26d97a9ac54ac39ff264ae +SIZE (dwavesystems-dimod-0.11.6_GH0.tar.gz) = 523197 diff --git a/science/dimod/files/patch-testscpp_Makefile b/science/dimod/files/patch-testscpp_Makefile index f0f295b10761..561e51f67e75 100644 --- a/science/dimod/files/patch-testscpp_Makefile +++ b/science/dimod/files/patch-testscpp_Makefile @@ -1,6 +1,15 @@ ---- testscpp/Makefile.orig 2022-08-16 14:45:27 UTC +--- testscpp/Makefile.orig 2022-10-05 22:19:20 UTC +++ testscpp/Makefile -@@ -13,12 +13,12 @@ coverage: +@@ -2,7 +2,7 @@ ROOT := .. + SRC := $(ROOT)/dimod/include/ + CATCH2 := $(ROOT)/testscpp/Catch2/single_include/ + +-all: catch2 test_main tests ++all: test_main tests + + coverage: + $(CXX) -std=c++11 -Wall -c test_main.cpp -I $(CATCH2) --coverage -fno-inline -fno-inline-small-functions -fno-default-inline +@@ -14,12 +14,12 @@ coverage: rm baseline.info test.info lcov --remove coverage.info '/usr/*' --output-file coverage.info @@ -9,10 +18,10 @@ ./test_main test_main: test_main.cpp -- g++ -std=c++11 -Wall -Werror -c test_main.cpp -- g++ -std=c++11 -Wall -Werror test_main.o tests/*.cpp -o test_main -I $(SRC) -+ g++ $(CXXFLAGS) `pkg-config --cflags catch2` -std=c++11 -Wall -c test_main.cpp -+ g++ $(CXXFLAGS) `pkg-config --cflags --libs catch2` -std=c++11 -Wall test_main.o tests/*.cpp -o test_main -I $(SRC) +- $(CXX) -std=c++11 -Wall -Werror -c test_main.cpp -I $(CATCH2) +- $(CXX) -std=c++11 -Wall -Werror test_main.o tests/*.cpp -o test_main -I $(SRC) -I $(CATCH2) ++ $(CXX) -std=c++11 `pkg-config --cflags catch2` -Wall -Werror -c test_main.cpp -I $(CATCH2) ++ $(CXX) -std=c++11 `pkg-config --cflags catch2` -Wall -Werror test_main.o tests/*.cpp -o test_main -I $(SRC) -I $(CATCH2) catch2: git submodule init diff --git a/science/dimod/files/patch-testscpp_test__main.cpp b/science/dimod/files/patch-testscpp_test__main.cpp index bb485e158894..3dcb5a17fc5d 100644 --- a/science/dimod/files/patch-testscpp_test__main.cpp +++ b/science/dimod/files/patch-testscpp_test__main.cpp @@ -1,8 +1,8 @@ ---- testscpp/test_main.cpp.orig 2022-08-27 15:45:50 UTC +--- testscpp/test_main.cpp.orig 2022-10-05 22:19:20 UTC +++ testscpp/test_main.cpp @@ -1,5 +1,5 @@ #define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file --#include "Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include /* diff --git a/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp b/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp index b29152b9e491..22fd876428fe 100644 --- a/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp +++ b/science/dimod/files/patch-testscpp_tests_test__quadratic__model.cpp @@ -1,10 +1,10 @@ ---- testscpp/tests/test_quadratic_model.cpp.orig 2022-08-27 15:54:59 UTC +--- testscpp/tests/test_quadratic_model.cpp.orig 2022-10-05 22:19:20 UTC +++ testscpp/tests/test_quadratic_model.cpp @@ -14,7 +14,7 @@ #include --#include "../Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include #include "dimod/quadratic_model.h" diff --git a/science/dimod/files/patch-testscpp_tests_test__utils.cpp b/science/dimod/files/patch-testscpp_tests_test__utils.cpp index 6283681a7a6b..8848df69fba9 100644 --- a/science/dimod/files/patch-testscpp_tests_test__utils.cpp +++ b/science/dimod/files/patch-testscpp_tests_test__utils.cpp @@ -1,10 +1,10 @@ ---- testscpp/tests/test_utils.cpp.orig 2022-08-27 15:49:35 UTC +--- testscpp/tests/test_utils.cpp.orig 2022-10-05 22:19:20 UTC +++ testscpp/tests/test_utils.cpp @@ -15,7 +15,7 @@ #include #include --#include "../Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include #include "dimod/utils.h"