Compare commits

...

4 Commits
rawhide ... f36

Author SHA1 Message Date
Jerry James de87a1ef21 Rebuild for z3 4.8.17 2022-05-19 15:12:56 -06:00
Wolfgang Stöggl 170e2f6462 Update to 2.7.4
- Remove patch:
  cppcheck-2.7.3-tinyxml2.patch
2022-03-26 06:51:04 +01:00
Wolfgang Stöggl df57bfad11 Update to 2.7.3
- Update tinyxml2 patch:
  cppcheck-2.7.3-tinyxml2.patch
- Remove patch:
  cppcheck-2.7-disable-test-testmathlib-tostring.patch
2022-03-19 18:33:27 +01:00
Wolfgang Stöggl 832e062070 Update to 2.7
- Add the following patches:
  cppcheck-2.7-tinyxml2.patch
  cppcheck-2.7-disable-test-testmathlib-tostring.patch
- Remove patch:
  cppcheck-2.5-disable-test-testexprengine-array7.patch
2022-02-09 21:34:08 +01:00
5 changed files with 32 additions and 19 deletions

3
.gitignore vendored
View File

@ -47,3 +47,6 @@ cppcheck-1.44.tar.bz2
/cppcheck-2.3.tar.gz
/cppcheck-2.5.tar.gz
/cppcheck-2.6.tar.gz
/cppcheck-2.7.tar.gz
/cppcheck-2.7.3.tar.gz
/cppcheck-2.7.4.tar.gz

View File

@ -1,13 +0,0 @@
diff --git a/test/testexprengine.cpp b/test/testexprengine.cpp
index f23671a3d..c6069b49c 100644
--- a/test/testexprengine.cpp
+++ b/test/testexprengine.cpp
@@ -92,7 +92,7 @@ private:
TEST_CASE(array4);
TEST_CASE(array5);
TEST_CASE(array6);
- TEST_CASE(array7);
+ // TEST_CASE(array7);
TEST_CASE(arrayInit1);
TEST_CASE(arrayInit2);
TEST_CASE(arrayInit3);

View File

@ -0,0 +1,15 @@
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
index 4d5b9efc5..6f6d9210c 100644
--- a/cmake/findDependencies.cmake
+++ b/cmake/findDependencies.cmake
@@ -48,7 +48,9 @@ endif()
if (NOT USE_BUNDLED_TINYXML2)
find_package(tinyxml2 QUIET)
- if (NOT tinyxml2_FOUND)
+ if (tinyxml2_FOUND)
+ set(tinyxml2_LIBRARIES "tinyxml2")
+ else()
find_library(tinyxml2_LIBRARIES tinyxml2)
if (NOT tinyxml2_LIBRARIES)
message(FATAL_ERROR "tinyxml2 has not been found")

View File

@ -1,7 +1,7 @@
%undefine __cmake_in_source_build
Name: cppcheck
Version: 2.6
Version: 2.7.4
Release: 2%{?dist}
Summary: Tool for static C/C++ code analysis
License: GPLv3+
@ -12,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
# Disable one test, which fails under 32-bit archs i686 and armv7hl
# https://trac.cppcheck.net/ticket/10282
Patch2: cppcheck-2.5-disable-test-testexprengine-array7.patch
BuildRequires: gcc-c++
BuildRequires: pcre-devel
@ -61,7 +58,6 @@ from xml files first generated using cppcheck.
%setup -q
%patch0 -p1 -b .translations
%patch1 -p1 -b .python3
%patch2 -p1 -b .array7
# Make sure bundled tinyxml2 is not used
rm -r externals/tinyxml2
# Generate the Qt online-help file
@ -117,6 +113,18 @@ cd %{_vpath_builddir}/bin
%{_bindir}/cppcheck-htmlreport
%changelog
* Thu May 19 2022 Jerry James <loganjerry@gmail.com> - 2.7.4-2
- Rebuild for z3 4.8.17
* Fri Mar 25 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7.4-1
- Update to 2.7.4
* Sat Mar 19 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7.3-1
- Update to 2.7.3.
* Tue Feb 08 2022 Wolfgang Stöggl <c72578@yahoo.de> - 2.7-1
- Update to 2.7.
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (cppcheck-2.6.tar.gz) = 6abe518cb9d80c4d0fcc5d47a317f45f177a30372846008f5c65352db91e7de74e6ec6d500d1d18b8cd29a91e3974df125efb35c14c7814c9640741b3827fc2a
SHA512 (cppcheck-2.7.4.tar.gz) = 599101c2c5ffe8073849ca97dd99839af9d241dc10e0638d339aa919c2df98d48e3fbb882120c864647de97ed3f77434a2748eec489bfcebbebacb020fc32611