Attachment 237516 Details for Bug 267262 – update patch

[patch] update patch

0001-devel-cppcheck-update-to-2.9.patch (text/plain), 8.62 KB, created by Dustin Marquess on 2022-10-21 22:28:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dustin Marquess

Created: 2022-10-21 22:28:05 UTC

Size: 8.62 KB

patch

obsolete

>From 36ea691ba884a4f7b5760e4019f902b3e36a394f Mon Sep 17 00:00:00 2001
>From: JailBird <jailbird@fdf.net>
>Date: Fri, 21 Oct 2022 17:22:16 -0500
>Subject: [PATCH] devel/cppcheck: update to 2.9
>
>Changes: https://github.com/danmar/cppcheck/releases/tag/2.9
>
>---
> devel/cppcheck/Makefile                              |  2 +-
> devel/cppcheck/distinfo                              |  6 +++---
> devel/cppcheck/files/patch-cli_CMakeLists.txt        |  6 +++---
> devel/cppcheck/files/patch-gui_CMakeLists.txt        | 10 +++++-----
> .../patch-gui_test_benchmark_simple_CMakeLists.txt   | 12 ++++++------
> .../files/patch-gui_test_xmlreportv2_CMakeLists.txt  |  6 +++---
> devel/cppcheck/files/patch-lib_CMakeLists.txt        | 12 ++++++------
> devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt   |  6 +++---
> devel/cppcheck/files/patch-test_CMakeLists.txt       |  6 +++---
> 9 files changed, 33 insertions(+), 33 deletions(-)
>
>diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
>index 80d376a2abfb..72b36e193ccf 100644
>--- a/devel/cppcheck/Makefile
>+++ b/devel/cppcheck/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	cppcheck
>-PORTVERSION=	2.7.5
>+PORTVERSION=	2.9
> PORTREVISION?=	0	# devel/cppcheck-gui
> CATEGORIES=	devel
> 
>diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
>index 9526af3607b2..39f524bb42eb 100644
>--- a/devel/cppcheck/distinfo
>+++ b/devel/cppcheck/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1650279480
>-SHA256 (danmar-cppcheck-2.7.5_GH0.tar.gz) = 6c7ac29e57fa8b3ac7be224510200e579d5a90217e2152591ef46ffc947d8f78
>-SIZE (danmar-cppcheck-2.7.5_GH0.tar.gz) = 3940968
>+TIMESTAMP = 1661696280
>+SHA256 (danmar-cppcheck-2.9_GH0.tar.gz) = 56aee8b5bdf936ab7adc9ab43903ba2052f088695c80f047682024a1ed0ef3f3
>+SIZE (danmar-cppcheck-2.9_GH0.tar.gz) = 3916529
>diff --git a/devel/cppcheck/files/patch-cli_CMakeLists.txt b/devel/cppcheck/files/patch-cli_CMakeLists.txt
>index d202b9d3a9dd..76469f8fbc4f 100644
>--- a/devel/cppcheck/files/patch-cli_CMakeLists.txt
>+++ b/devel/cppcheck/files/patch-cli_CMakeLists.txt
>@@ -1,11 +1,11 @@
>---- cli/CMakeLists.txt.orig	2022-03-19 11:35:06 UTC
>+--- cli/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
> +++ cli/CMakeLists.txt
>-@@ -35,7 +35,7 @@ if (WIN32 AND NOT BORLAND)
>+@@ -37,7 +37,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
>      endif()
>  endif()
>  if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
> -    target_link_libraries(cppcheck ${tinyxml2_LIBRARIES})
> +    target_link_libraries(cppcheck tinyxml2::tinyxml2)
>  endif()
>+ target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT})
>  
>- add_dependencies(cppcheck copy_cfg)
>diff --git a/devel/cppcheck/files/patch-gui_CMakeLists.txt b/devel/cppcheck/files/patch-gui_CMakeLists.txt
>index 6cc7ac50c7be..48bfc79062c7 100644
>--- a/devel/cppcheck/files/patch-gui_CMakeLists.txt
>+++ b/devel/cppcheck/files/patch-gui_CMakeLists.txt
>@@ -1,15 +1,15 @@
>---- gui/CMakeLists.txt.orig	2022-03-19 11:35:06 UTC
>+--- gui/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
> +++ gui/CMakeLists.txt
>-@@ -36,7 +36,7 @@ if (BUILD_GUI)
>-         target_link_libraries(cppcheck-gui ${Z3_LIBRARIES})
>+@@ -34,7 +34,7 @@ if (BUILD_GUI)
>+         target_link_libraries(cppcheck-gui ${PCRE_LIBRARY})
>      endif()
>      if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
> -        target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES})
> +        target_link_libraries(cppcheck-gui tinyxml2::tinyxml2)
>      endif()
>-     target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)
>+     target_link_libraries(cppcheck-gui ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB})
>      if(WITH_QCHART)
>-@@ -51,7 +51,7 @@ if (BUILD_GUI)
>+@@ -49,7 +49,7 @@ if (BUILD_GUI)
>      endif()
>  
>      install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications)
>diff --git a/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt b/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt
>index 35de39f7ee02..0bc2b678c1ca 100644
>--- a/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt
>+++ b/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt
>@@ -1,11 +1,11 @@
>---- gui/test/benchmark/simple/CMakeLists.txt.orig	2022-03-19 11:35:06 UTC
>+--- gui/test/benchmark/simple/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
> +++ gui/test/benchmark/simple/CMakeLists.txt
>-@@ -20,5 +20,5 @@ if (USE_Z3)
>-     target_link_libraries(benchmark-simple ${Z3_LIBRARIES})
>+@@ -17,7 +17,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
>+     target_link_libraries(benchmark-simple ${PCRE_LIBRARY})
>  endif()
>  if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
> -    target_link_libraries(benchmark-simple ${tinyxml2_LIBRARIES})
>--endif()
>-\ No newline at end of file
> +    target_link_libraries(benchmark-simple tinyxml2::tinyxml2)
>-+endif()
>+ endif()
>+ 
>+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
>diff --git a/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt b/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt
>index 650aecfdad42..de51aaf9da44 100644
>--- a/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt
>+++ b/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt
>@@ -1,7 +1,7 @@
>---- gui/test/xmlreportv2/CMakeLists.txt.orig	2022-03-19 11:35:06 UTC
>+--- gui/test/xmlreportv2/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
> +++ gui/test/xmlreportv2/CMakeLists.txt
>-@@ -24,5 +24,5 @@ if (USE_Z3)
>-     target_link_libraries(test-xmlreportv2 ${Z3_LIBRARIES})
>+@@ -21,5 +21,5 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
>+     target_link_libraries(test-xmlreportv2 ${PCRE_LIBRARY})
>  endif()
>  if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
> -    target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES})
>diff --git a/devel/cppcheck/files/patch-lib_CMakeLists.txt b/devel/cppcheck/files/patch-lib_CMakeLists.txt
>index f2999fceb629..b3bf45f144a5 100644
>--- a/devel/cppcheck/files/patch-lib_CMakeLists.txt
>+++ b/devel/cppcheck/files/patch-lib_CMakeLists.txt
>@@ -1,11 +1,11 @@
>---- lib/CMakeLists.txt.orig	2022-03-19 11:35:06 UTC
>+--- lib/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
> +++ lib/CMakeLists.txt
>-@@ -36,6 +36,8 @@ add_library(lib_objs OBJECT ${srcs_lib} ${hdrs})
>- target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/)
>+@@ -36,6 +36,8 @@ if(USE_BUNDLED_TINYXML2)
>+ target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/)
>  if(USE_BUNDLED_TINYXML2)
>-     target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
>+     target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/)
> +else()
> +    target_link_libraries(lib_objs PRIVATE tinyxml2::tinyxml2)
>  endif()
>- target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
>- target_include_directories(lib_objs PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
>+ target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
>+ target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
>diff --git a/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt b/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt
>index ba9d6741a87d..cb5b20f0ca8f 100644
>--- a/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt
>+++ b/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt
>@@ -1,7 +1,7 @@
>---- oss-fuzz/CMakeLists.txt.orig	2022-03-19 11:35:06 UTC
>+--- oss-fuzz/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
> +++ oss-fuzz/CMakeLists.txt
>-@@ -25,7 +25,7 @@ if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES 
>-         target_link_libraries(fuzz-client PRIVATE ${Z3_LIBRARIES})
>+@@ -22,7 +22,7 @@ if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES 
>+         target_link_libraries(fuzz-client PRIVATE ${PCRE_LIBRARY})
>      endif()
>      if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
> -        target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES})
>diff --git a/devel/cppcheck/files/patch-test_CMakeLists.txt b/devel/cppcheck/files/patch-test_CMakeLists.txt
>index 210d2f9f9b5e..7ad2144b350f 100644
>--- a/devel/cppcheck/files/patch-test_CMakeLists.txt
>+++ b/devel/cppcheck/files/patch-test_CMakeLists.txt
>@@ -1,11 +1,11 @@
>---- test/CMakeLists.txt.orig	2022-03-19 11:35:06 UTC
>+--- test/CMakeLists.txt.orig	2022-08-28 12:43:18 UTC
> +++ test/CMakeLists.txt
>-@@ -26,7 +26,7 @@ if (BUILD_TESTS)
>+@@ -23,7 +23,7 @@ if (BUILD_TESTS)
>          endif()
>      endif()
>      if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2)
> -        target_link_libraries(testrunner ${tinyxml2_LIBRARIES})
> +        target_link_libraries(testrunner tinyxml2::tinyxml2)
>      endif()
>+     target_link_libraries(testrunner ${CMAKE_THREAD_LIBS_INIT})
>  
>-     if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
>-- 
>2.37.0 (Apple Git-136)
>

Actions: View | Diff

Attachments on bug 267262: 237516 | 237978