From 055678f7d2739456e9c38d6f7707851bbba78cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Fri, 25 Mar 2022 21:31:10 +0100 Subject: [PATCH] Update to 2.7.4 - Remove patch: cppcheck-2.7.3-tinyxml2.patch --- .gitignore | 1 + cppcheck-2.7.3-tinyxml2.patch | 51 ----------------------------------- cppcheck.spec | 20 +++++--------- sources | 2 +- 4 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 cppcheck-2.7.3-tinyxml2.patch diff --git a/.gitignore b/.gitignore index 163a216..fe00c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ cppcheck-1.44.tar.bz2 /cppcheck-2.6.tar.gz /cppcheck-2.7.tar.gz /cppcheck-2.7.3.tar.gz +/cppcheck-2.7.4.tar.gz diff --git a/cppcheck-2.7.3-tinyxml2.patch b/cppcheck-2.7.3-tinyxml2.patch deleted file mode 100644 index 7dd6a97..0000000 --- a/cppcheck-2.7.3-tinyxml2.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 4ae07fe4859108638e244912a21245c2156eb8f9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= -Date: Tue, 22 Mar 2022 21:41:44 +0100 -Subject: [PATCH] Set tinyxml2_LIBRARIES after find_package() - -If tinyxml2 is found by find_package(), then tinyxml2_LIBRARIES -is empty. Set tinyxml2_LIBRARIES to "tinyxml2::tinyxml2" in this case. - -- Fixes "undefined reference to `tinyxml2::" -- printInfo.cmake: Fix indentation of tinyxml2_LIBRARIES ---- - cmake/findDependencies.cmake | 5 +++-- - cmake/printInfo.cmake | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake -index 4d5b9efc5e..b8c181763e 100644 ---- a/cmake/findDependencies.cmake -+++ b/cmake/findDependencies.cmake -@@ -48,12 +48,13 @@ endif() - - if (NOT USE_BUNDLED_TINYXML2) - find_package(tinyxml2 QUIET) -- if (NOT tinyxml2_FOUND) -+ if (TARGET tinyxml2::tinyxml2) -+ set(tinyxml2_LIBRARIES "tinyxml2::tinyxml2") -+ else() - find_library(tinyxml2_LIBRARIES tinyxml2) - if (NOT tinyxml2_LIBRARIES) - message(FATAL_ERROR "tinyxml2 has not been found") - else() -- message(STATUS "tinyxml2_LIBRARY: ${tinyxml2_LIBRARY}") - set(tinyxml2_FOUND 1) - endif() - endif() -diff --git a/cmake/printInfo.cmake b/cmake/printInfo.cmake -index 2fd971b1de..da5d15c211 100644 ---- a/cmake/printInfo.cmake -+++ b/cmake/printInfo.cmake -@@ -52,9 +52,10 @@ if (USE_Z3) - message( STATUS "Z3_LIBRARIES = ${Z3_LIBRARIES}" ) - message( STATUS "Z3_CXX_INCLUDE_DIRS = ${Z3_CXX_INCLUDE_DIRS}" ) - endif() -+message( STATUS ) - message( STATUS "USE_BUNDLED_TINYXML2 = ${USE_BUNDLED_TINYXML2}" ) - if (NOT USE_BUNDLED_TINYXML2) -- message(STATUS "tinyxml2_LIBRARIES = ${tinyxml2_LIBRARIES}") -+ message(STATUS "tinyxml2_LIBRARIES = ${tinyxml2_LIBRARIES}") - endif() - message( STATUS ) - diff --git a/cppcheck.spec b/cppcheck.spec index 32bb65c..98ff3eb 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,15 +1,8 @@ %undefine __cmake_in_source_build -%ifarch i686 -# i686 build fails since z3-4.8.15-1 -%define use_z3 no -%else -%define use_z3 yes -%endif - Name: cppcheck -Version: 2.7.3 -Release: 2%{?dist} +Version: 2.7.4 +Release: 1%{?dist} Summary: Tool for static C/C++ code analysis License: GPLv3+ URL: http://cppcheck.wiki.sourceforge.net/ @@ -19,9 +12,6 @@ Source0: https://github.com/danmar/%{name}/archive/%{version}.tar.gz#/%{n Patch0: cppcheck-2.2-translations.patch # Select python3 explicitly Patch1: cppcheck-1.88-htmlreport-python3.patch -# Fix undefined reference to tinyxml2 -# https://github.com/danmar/cppcheck/pull/3932 -Patch2: cppcheck-2.7.3-tinyxml2.patch BuildRequires: gcc-c++ BuildRequires: pcre-devel @@ -68,7 +58,6 @@ from xml files first generated using cppcheck. %setup -q %patch0 -p1 -b .translations %patch1 -p1 -b .python3 -%patch2 -p1 -b .tinyxml2 # Make sure bundled tinyxml2 is not used rm -r externals/tinyxml2 # Generate the Qt online-help file @@ -83,7 +72,7 @@ pandoc man/reference-cfg-format.md -o man/reference-cfg-format.html -s --number- # Binaries # Upstream doesn't support shared libraries (unversioned solib) -%cmake -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DUSE_Z3=%{use_z3} -DHAVE_RULES=yes -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck -DUSE_BUNDLED_TINYXML2=OFF -DENABLE_OSS_FUZZ=OFF +%cmake -DCMAKE_BUILD_TYPE=Release -DUSE_MATCHCOMPILER=yes -DUSE_Z3=yes -DHAVE_RULES=yes -DBUILD_GUI=1 -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_TESTS=yes -DFILESDIR=%{_datadir}/Cppcheck -DUSE_BUNDLED_TINYXML2=OFF -DENABLE_OSS_FUZZ=OFF %cmake_build %install @@ -124,6 +113,9 @@ cd %{_vpath_builddir}/bin %{_bindir}/cppcheck-htmlreport %changelog +* Fri Mar 25 2022 Wolfgang Stöggl - 2.7.4-1 +- Update to 2.7.4 + * Wed Mar 23 2022 Wolfgang Stöggl - 2.7.3-2 - Update tinyxml2 patch, add upstream link and rebuild diff --git a/sources b/sources index 7a31972..622803d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppcheck-2.7.3.tar.gz) = 419fe7af54499e3c086792d159f1e91dff7e91cb7a9555d42ce35262413e060e090200777ed387cbbbfd7731b44ad71f490e12b07c4d6050c2bd1ea8e226a71f +SHA512 (cppcheck-2.7.4.tar.gz) = 599101c2c5ffe8073849ca97dd99839af9d241dc10e0638d339aa919c2df98d48e3fbb882120c864647de97ed3f77434a2748eec489bfcebbebacb020fc32611