Date: Fri, 7 Oct 2022 18:36:11 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: aad793666b9a - main - science/dimod: Update 0.11.5 -> 0.11.6 Message-ID: <202210071836.297IaBpi087150@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=aad793666b9a5393ed258e35ae47fc5982de3531 commit aad793666b9a5393ed258e35ae47fc5982de3531 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2022-10-07 15:17:01 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> 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 <catch2/catch.hpp> /* 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 <iostream> --#include "../Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include <catch2/catch.hpp> #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 <iostream> #include <random> --#include "../Catch2/single_include/catch2/catch.hpp" +-#include "catch2/catch.hpp" +#include <catch2/catch.hpp> #include "dimod/utils.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210071836.297IaBpi087150>