science/dwave-preprocessing: Update 0.5.4 → 0.6.2

Reported by:	portscout

5 files changed, 23 insertions, 45 deletions

diff --git a/science/dwave-preprocessing/Makefile b/science/dwave-preprocessing/Makefile
index 59b943e612d6..72d49e260fb0 100644
--- a/science/dwave-preprocessing/Makefile
+++ b/science/dwave-preprocessing/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dwave-preprocessing
-DISTVERSION=	0.5.4
+DISTVERSION=	0.6.2
 CATEGORIES=	science # quantum-computing
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/science/dwave-preprocessing/distinfo b/science/dwave-preprocessing/distinfo
index 3856873fccd3..c37a7fdd4f11 100644
--- a/science/dwave-preprocessing/distinfo
+++ b/science/dwave-preprocessing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687113085
-SHA256 (dwavesystems-dwave-preprocessing-0.5.4_GH0.tar.gz) = 864ec18a8f14a83f0439d3cb6a9006c0d9577012f2cab14b622dc715bac17b24
-SIZE (dwavesystems-dwave-preprocessing-0.5.4_GH0.tar.gz) = 104138
+TIMESTAMP = 1689134786
+SHA256 (dwavesystems-dwave-preprocessing-0.6.2_GH0.tar.gz) = e73f9fcb9210351f02d3982cd497b7fcd2eb935275ba1f2ef798fb87805ef699
+SIZE (dwavesystems-dwave-preprocessing-0.6.2_GH0.tar.gz) = 125568
diff --git a/science/dwave-preprocessing/files/patch-dwave_preprocessing_include_dwave_presolve.h b/science/dwave-preprocessing/files/patch-dwave_preprocessing_include_dwave_presolve.h
deleted file mode 100644
index 729aad02ae68..000000000000
--- a/science/dwave-preprocessing/files/patch-dwave_preprocessing_include_dwave_presolve.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dwave/preprocessing/include/dwave/presolve.h.orig	2023-06-18 18:36:53 UTC
-+++ dwave/preprocessing/include/dwave/presolve.h
-@@ -19,7 +19,7 @@
- #include <utility>
- #include <vector>
- 
--#include "spdlog/spdlog.h"
-+#include <spdlog/spdlog.h>
- #include "dimod/constrained_quadratic_model.h"
- 
- namespace dwave {
diff --git a/science/dwave-preprocessing/files/patch-testscpp_Makefile b/science/dwave-preprocessing/files/patch-testscpp_Makefile
index e8c4e6997413..4abca62bdf8c 100644
--- a/science/dwave-preprocessing/files/patch-testscpp_Makefile
+++ b/science/dwave-preprocessing/files/patch-testscpp_Makefile
@@ -1,32 +1,21 @@
---- testscpp/Makefile.orig	2022-12-19 19:58:20 UTC
+--- testscpp/Makefile.orig	2023-07-06 22:19:16 UTC
 +++ testscpp/Makefile
-@@ -1,10 +1,10 @@
+@@ -1,15 +1,15 @@
  ROOT := ..
- SRC := $(ROOT)/dwave/preprocessing/
- CATCH2 := $(ROOT)/testscpp/Catch2/single_include/
+ INCLUDE := $(ROOT)/dwave/preprocessing/include
+ SRC := $(ROOT)/dwave/preprocessing/src
 -DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())')
 +#DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())')
+ CATCH2 := $(ROOT)/testscpp/Catch2/single_include/
  SPDLOG := $(ROOT)/extern/spdlog/include/
- INCLUDES := -I $(SRC)/include/ -I $(DIMOD) -I $(CATCH2) -I $(SPDLOG)
--FLAGS := -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations -fcompare-debug-second -O3 
-+FLAGS := ${CXXFLAGS} -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations
- 
- all: update test_main test_main_parallel tests tests_parallel
- 
-@@ -15,12 +15,12 @@ tests_parallel: test_main_parallel.out
- 	./test_main_parallel
+-FLAGS := -std=c++17 -Wall -Wno-unknown-pragmas -fcompare-debug-second -O3
++FLAGS := ${CXXFLAGS} -std=c++17 -Wall -Wno-unknown-pragmas
  
- test_main: test_main.cpp
--	g++ $(FLAGS) -c test_main.cpp
--	g++ $(FLAGS) test_main.o tests/*.cpp -o test_main $(INCLUDES)
-+	${CXX} $(FLAGS) -c test_main.cpp
-+	${CXX} $(FLAGS) ${LDFLAGS} test_main.o tests/*.cpp -o test_main $(INCLUDES)
+ all: update tests
  
- test_main_parallel: test_main.cpp
--	g++ $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o
--	g++ $(FLAGS) -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES)
-+	${CXX} $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o
-+	${CXX} $(FLAGS) ${LDFLAGS} -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES)
+ test_main.o:
+-	$(CXX) test_main.cpp -c
++	$(CXX) $(FLAGS) test_main.cpp -c
  
- update:
- 	git submodule init
+ # Developer note: we could make this more generic, but because the package structure
+ # is not at all consistent and because we have so few test files I think it's clearer to
diff --git a/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp b/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp
index e679ab3df1c0..33d657fdb02c 100644
--- a/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp
+++ b/science/dwave-preprocessing/files/patch-testscpp_tests_test__roof__duality.cpp
@@ -1,11 +1,11 @@
---- testscpp/tests/test_roof_duality.cpp.orig	2022-12-19 19:58:20 UTC
+--- testscpp/tests/test_roof_duality.cpp.orig	2023-07-06 22:19:16 UTC
 +++ testscpp/tests/test_roof_duality.cpp
-@@ -12,7 +12,7 @@
- // See the License for the specific language governing permissions and
- // limitations under the License.
+@@ -14,7 +14,7 @@
  
--#include "catch2/catch.hpp"
-+#include <catch2/catch.hpp>
  #include <dimod/quadratic_model.h>
  
+-#include "catch2/catch.hpp"
++#include <catch2/catch.hpp>
  #include "dwave-preprocessing/fix_variables.hpp"
+ 
+ namespace fix_variables_ {