Attachment 234658 Details for Bug 264652 – patch

[patch] patch

catch.patch (text/plain), 11.20 KB, created by Yuri Victorovich on 2022-06-13 04:29:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2022-06-13 04:29:02 UTC

Size: 11.20 KB

patch

obsolete

>diff --git a/devel/catch/Makefile b/devel/catch/Makefile
>index 38fc74acb6de..5455b852a334 100644
>--- a/devel/catch/Makefile
>+++ b/devel/catch/Makefile
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	catch
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	2.13.9
>+DISTVERSION=	3.0.1
> PORTREVISION=	0
> CATEGORIES=	devel
> 
>@@ -12,19 +12,24 @@ COMMENT=	Header-only test framework for C++
> LICENSE=	BSL
> LICENSE_FILE=	${WRKSRC}/LICENSE.txt
> 
>-USES=		cmake compiler:c++14-lang pathfix python:build
>+USES=		cmake:testing compiler:c++14-lang pathfix python:build,test
> USE_GITHUB=	yes
> GH_ACCOUNT=	catchorg
> GH_PROJECT=	Catch2
> 
>-CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
>-PORTDOCS=	*
>+CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \
>+		-DPython3_EXECUTABLE=${PYTHON_CMD}
>+CMAKE_ON=	BUILD_SHARED_LIBS
>+CMAKE_TESTING_ON=	CATCH_DEVELOPMENT_BUILD BUILD_TESTING CATCH_BUILD_TESTING # 5 tests fail, see https://github.com/catchorg/Catch2/issues/2458
> 
>-NO_ARCH=	yes
>+PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS
> 
>-do-test:
>-	${BUILD_WRKSRC}/projects/SelfTest
>+post-install:
>+	# remove empty directories, see https://github.com/catchorg/Catch2/issues/2457
>+	@${RMDIR} \
>+		${STAGEDIR}${PREFIX}/include/catch2/benchmark/internal \
>+		${STAGEDIR}${PREFIX}/include/catch2/generators/internal
> 
> .include <bsd.port.mk>
>diff --git a/devel/catch/distinfo b/devel/catch/distinfo
>index 2ca78806ba31..bcceab0d6159 100644
>--- a/devel/catch/distinfo
>+++ b/devel/catch/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1650035231
>-SHA256 (catchorg-Catch2-v2.13.9_GH0.tar.gz) = 06dbc7620e3b96c2b69d57bf337028bf245a211b3cddb843835bfe258f427a52
>-SIZE (catchorg-Catch2-v2.13.9_GH0.tar.gz) = 661915
>+TIMESTAMP = 1655092825
>+SHA256 (catchorg-Catch2-v3.0.1_GH0.tar.gz) = 8c4173c68ae7da1b5b505194a0c2d6f1b2aef4ec1e3e7463bde451f26bbaf4e7
>+SIZE (catchorg-Catch2-v3.0.1_GH0.tar.gz) = 1020413
>diff --git a/devel/catch/pkg-plist b/devel/catch/pkg-plist
>index a5d29439d3f4..b608cd0f2ab6 100644
>--- a/devel/catch/pkg-plist
>+++ b/devel/catch/pkg-plist
>@@ -1,14 +1,171 @@
>-include/catch2/catch.hpp
>-include/catch2/catch_reporter_automake.hpp
>-include/catch2/catch_reporter_sonarqube.hpp
>-include/catch2/catch_reporter_tap.hpp
>-include/catch2/catch_reporter_teamcity.hpp
>+include/catch2/benchmark/catch_benchmark.hpp
>+include/catch2/benchmark/catch_benchmark_all.hpp
>+include/catch2/benchmark/catch_chronometer.hpp
>+include/catch2/benchmark/catch_clock.hpp
>+include/catch2/benchmark/catch_constructor.hpp
>+include/catch2/benchmark/catch_environment.hpp
>+include/catch2/benchmark/catch_estimate.hpp
>+include/catch2/benchmark/catch_execution_plan.hpp
>+include/catch2/benchmark/catch_optimizer.hpp
>+include/catch2/benchmark/catch_outlier_classification.hpp
>+include/catch2/benchmark/catch_sample_analysis.hpp
>+include/catch2/benchmark/detail/catch_analyse.hpp
>+include/catch2/benchmark/detail/catch_benchmark_function.hpp
>+include/catch2/benchmark/detail/catch_complete_invoke.hpp
>+include/catch2/benchmark/detail/catch_estimate_clock.hpp
>+include/catch2/benchmark/detail/catch_measure.hpp
>+include/catch2/benchmark/detail/catch_repeat.hpp
>+include/catch2/benchmark/detail/catch_run_for_at_least.hpp
>+include/catch2/benchmark/detail/catch_stats.hpp
>+include/catch2/benchmark/detail/catch_timing.hpp
>+include/catch2/catch_all.hpp
>+include/catch2/catch_approx.hpp
>+include/catch2/catch_assertion_info.hpp
>+include/catch2/catch_assertion_result.hpp
>+include/catch2/catch_config.hpp
>+include/catch2/catch_message.hpp
>+include/catch2/catch_section_info.hpp
>+include/catch2/catch_session.hpp
>+include/catch2/catch_tag_alias.hpp
>+include/catch2/catch_tag_alias_autoregistrar.hpp
>+include/catch2/catch_template_test_macros.hpp
>+include/catch2/catch_test_case_info.hpp
>+include/catch2/catch_test_macros.hpp
>+include/catch2/catch_test_spec.hpp
>+include/catch2/catch_timer.hpp
>+include/catch2/catch_tostring.hpp
>+include/catch2/catch_totals.hpp
>+include/catch2/catch_translate_exception.hpp
>+include/catch2/catch_user_config.hpp
>+include/catch2/catch_version.hpp
>+include/catch2/catch_version_macros.hpp
>+include/catch2/generators/catch_generator_exception.hpp
>+include/catch2/generators/catch_generators.hpp
>+include/catch2/generators/catch_generators_adapters.hpp
>+include/catch2/generators/catch_generators_all.hpp
>+include/catch2/generators/catch_generators_random.hpp
>+include/catch2/generators/catch_generators_range.hpp
>+include/catch2/interfaces/catch_interfaces_all.hpp
>+include/catch2/interfaces/catch_interfaces_capture.hpp
>+include/catch2/interfaces/catch_interfaces_config.hpp
>+include/catch2/interfaces/catch_interfaces_enum_values_registry.hpp
>+include/catch2/interfaces/catch_interfaces_exception.hpp
>+include/catch2/interfaces/catch_interfaces_generatortracker.hpp
>+include/catch2/interfaces/catch_interfaces_registry_hub.hpp
>+include/catch2/interfaces/catch_interfaces_reporter.hpp
>+include/catch2/interfaces/catch_interfaces_reporter_factory.hpp
>+include/catch2/interfaces/catch_interfaces_reporter_registry.hpp
>+include/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp
>+include/catch2/interfaces/catch_interfaces_testcase.hpp
>+include/catch2/internal/catch_assertion_handler.hpp
>+include/catch2/internal/catch_case_insensitive_comparisons.hpp
>+include/catch2/internal/catch_case_sensitive.hpp
>+include/catch2/internal/catch_clara.hpp
>+include/catch2/internal/catch_commandline.hpp
>+include/catch2/internal/catch_compiler_capabilities.hpp
>+include/catch2/internal/catch_config_android_logwrite.hpp
>+include/catch2/internal/catch_config_counter.hpp
>+include/catch2/internal/catch_config_uncaught_exceptions.hpp
>+include/catch2/internal/catch_config_wchar.hpp
>+include/catch2/internal/catch_console_colour.hpp
>+include/catch2/internal/catch_console_width.hpp
>+include/catch2/internal/catch_container_nonmembers.hpp
>+include/catch2/internal/catch_context.hpp
>+include/catch2/internal/catch_debug_console.hpp
>+include/catch2/internal/catch_debugger.hpp
>+include/catch2/internal/catch_decomposer.hpp
>+include/catch2/internal/catch_enforce.hpp
>+include/catch2/internal/catch_enum_values_registry.hpp
>+include/catch2/internal/catch_errno_guard.hpp
>+include/catch2/internal/catch_exception_translator_registry.hpp
>+include/catch2/internal/catch_fatal_condition_handler.hpp
>+include/catch2/internal/catch_floating_point_helpers.hpp
>+include/catch2/internal/catch_istream.hpp
>+include/catch2/internal/catch_lazy_expr.hpp
>+include/catch2/internal/catch_leak_detector.hpp
>+include/catch2/internal/catch_list.hpp
>+include/catch2/internal/catch_message_info.hpp
>+include/catch2/internal/catch_meta.hpp
>+include/catch2/internal/catch_move_and_forward.hpp
>+include/catch2/internal/catch_noncopyable.hpp
>+include/catch2/internal/catch_optional.hpp
>+include/catch2/internal/catch_output_redirect.hpp
>+include/catch2/internal/catch_platform.hpp
>+include/catch2/internal/catch_polyfills.hpp
>+include/catch2/internal/catch_preprocessor.hpp
>+include/catch2/internal/catch_preprocessor_remove_parens.hpp
>+include/catch2/internal/catch_random_number_generator.hpp
>+include/catch2/internal/catch_random_seed_generation.hpp
>+include/catch2/internal/catch_reporter_registry.hpp
>+include/catch2/internal/catch_reporter_spec_parser.hpp
>+include/catch2/internal/catch_result_type.hpp
>+include/catch2/internal/catch_reusable_string_stream.hpp
>+include/catch2/internal/catch_run_context.hpp
>+include/catch2/internal/catch_section.hpp
>+include/catch2/internal/catch_sharding.hpp
>+include/catch2/internal/catch_singletons.hpp
>+include/catch2/internal/catch_source_line_info.hpp
>+include/catch2/internal/catch_startup_exception_registry.hpp
>+include/catch2/internal/catch_stdstreams.hpp
>+include/catch2/internal/catch_stream_end_stop.hpp
>+include/catch2/internal/catch_string_manip.hpp
>+include/catch2/internal/catch_stringref.hpp
>+include/catch2/internal/catch_tag_alias_registry.hpp
>+include/catch2/internal/catch_template_test_registry.hpp
>+include/catch2/internal/catch_test_case_info_hasher.hpp
>+include/catch2/internal/catch_test_case_registry_impl.hpp
>+include/catch2/internal/catch_test_case_tracker.hpp
>+include/catch2/internal/catch_test_failure_exception.hpp
>+include/catch2/internal/catch_test_macro_impl.hpp
>+include/catch2/internal/catch_test_registry.hpp
>+include/catch2/internal/catch_test_spec_parser.hpp
>+include/catch2/internal/catch_textflow.hpp
>+include/catch2/internal/catch_to_string.hpp
>+include/catch2/internal/catch_uncaught_exceptions.hpp
>+include/catch2/internal/catch_unique_name.hpp
>+include/catch2/internal/catch_unique_ptr.hpp
>+include/catch2/internal/catch_void_type.hpp
>+include/catch2/internal/catch_wildcard_pattern.hpp
>+include/catch2/internal/catch_windows_h_proxy.hpp
>+include/catch2/internal/catch_xmlwriter.hpp
>+include/catch2/matchers/catch_matchers.hpp
>+include/catch2/matchers/catch_matchers_all.hpp
>+include/catch2/matchers/catch_matchers_container_properties.hpp
>+include/catch2/matchers/catch_matchers_contains.hpp
>+include/catch2/matchers/catch_matchers_exception.hpp
>+include/catch2/matchers/catch_matchers_floating_point.hpp
>+include/catch2/matchers/catch_matchers_predicate.hpp
>+include/catch2/matchers/catch_matchers_quantifiers.hpp
>+include/catch2/matchers/catch_matchers_string.hpp
>+include/catch2/matchers/catch_matchers_templated.hpp
>+include/catch2/matchers/catch_matchers_vector.hpp
>+include/catch2/matchers/internal/catch_matchers_impl.hpp
>+include/catch2/reporters/catch_reporter_automake.hpp
>+include/catch2/reporters/catch_reporter_common_base.hpp
>+include/catch2/reporters/catch_reporter_compact.hpp
>+include/catch2/reporters/catch_reporter_console.hpp
>+include/catch2/reporters/catch_reporter_cumulative_base.hpp
>+include/catch2/reporters/catch_reporter_event_listener.hpp
>+include/catch2/reporters/catch_reporter_helpers.hpp
>+include/catch2/reporters/catch_reporter_junit.hpp
>+include/catch2/reporters/catch_reporter_multi.hpp
>+include/catch2/reporters/catch_reporter_registrars.hpp
>+include/catch2/reporters/catch_reporter_sonarqube.hpp
>+include/catch2/reporters/catch_reporter_streaming_base.hpp
>+include/catch2/reporters/catch_reporter_tap.hpp
>+include/catch2/reporters/catch_reporter_teamcity.hpp
>+include/catch2/reporters/catch_reporter_xml.hpp
>+include/catch2/reporters/catch_reporters_all.hpp
> lib/cmake/Catch2/Catch.cmake
> lib/cmake/Catch2/Catch2Config.cmake
> lib/cmake/Catch2/Catch2ConfigVersion.cmake
>+lib/cmake/Catch2/Catch2Targets-%%CMAKE_BUILD_TYPE%%.cmake
> lib/cmake/Catch2/Catch2Targets.cmake
> lib/cmake/Catch2/CatchAddTests.cmake
> lib/cmake/Catch2/ParseAndAddCatchTests.cmake
>+lib/libCatch2.so
>+lib/libCatch2Main.so
>+libdata/pkgconfig/catch2-with-main.pc
> libdata/pkgconfig/catch2.pc
> share/Catch2/gdbinit
> share/Catch2/lldbinit
>diff --git a/devel/catch/files/patch-src_CMakeLists.txt b/devel/catch/files/patch-src_CMakeLists.txt
>new file mode 100644
>index 000000000000..6e070c831c2d
>--- /dev/null
>+++ b/devel/catch/files/patch-src_CMakeLists.txt
>@@ -0,0 +1,20 @@
>+--- src/CMakeLists.txt.orig	2022-06-13 04:06:52 UTC
>++++ src/CMakeLists.txt
>+@@ -265,7 +265,7 @@ set(REPORTER_FILES ${REPORTER_HEADERS} ${REPORTER_SOUR
>+ 
>+ # Fixme: STATIC because for dynamic, we would need to handle visibility
>+ # and I don't want to do the annotations right now
>+-add_library(Catch2 STATIC
>++add_library(Catch2
>+   ${REPORTER_FILES}
>+   ${INTERNAL_FILES}
>+   ${BENCHMARK_HEADERS}
>+@@ -318,7 +318,7 @@ target_include_directories(Catch2
>+ )
>+ 
>+ 
>+-add_library(Catch2WithMain STATIC
>++add_library(Catch2WithMain
>+     ${SOURCES_DIR}/internal/catch_main.cpp
>+ )
>+ add_build_reproducibility_settings(Catch2WithMain)

Actions: View | Diff

Attachments on bug 264652: 234658 | 234664