From c18c9f53fac7cb7eca04ec0b324ef9988f5df3ac Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 18 Oct 2017 14:51:27 +0200 Subject: [PATCH 01/12] Update to 1.81. --- cppcheck.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppcheck.spec b/cppcheck.spec index a678dda..97debdb 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,5 +1,5 @@ Name: cppcheck -Version: 1.80 +Version: 1.81 Release: 1%{?dist} Summary: Tool for static C/C++ code analysis Group: Development/Languages @@ -94,6 +94,9 @@ rm -rf %{buildroot} %changelog +* Wed Oct 18 2017 Susi Lehtola - 1.81-1 +- Update to 1.81. + * Tue Aug 01 2017 Gwyn Ciesla - 1.80-1 - 1.80 From 61cf6bb75523acab79bb77ce07861070b8c8babb Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 18 Oct 2017 16:26:03 +0200 Subject: [PATCH 02/12] Update to 1.81. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 89467a9..1ed57fb 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ cppcheck-1.44.tar.bz2 /cppcheck-1.78.tar.bz2 /cppcheck-1.79.tar.bz2 /cppcheck-1.80.tar.gz +/cppcheck-1.81.tar.gz diff --git a/sources b/sources index 2631036..0c74911 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppcheck-1.80.tar.gz) = 3b674f54fdb9f64a2d87223439bbfdb0fc12ca3527768b2477cf4e59aa39591386efd9890dc5acae4336e86db2ef7b1efc40bc0aefe6ac9703fe5bcb8f5c6db5 +SHA512 (cppcheck-1.81.tar.gz) = 0a8d288a1ca8e87b99bc23d87badb81a5754dff96a7e1e4acc04f4a1cd8a64ca10a724a1caabe964a66db6cc398a80de918c43e59f0bda5163fced0ff0744553 From f8cc68f0b96885e19c3949fcf88be9d69ced21b8 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 18 Oct 2017 16:44:12 +0200 Subject: [PATCH 03/12] Update patches. --- ...nyxml.patch => cppcheck-1.81-tinyxml.patch | 67 +++++++++---------- ....patch => cppcheck-1.81-translations.patch | 18 ++--- cppcheck.spec | 30 ++++----- 3 files changed, 57 insertions(+), 58 deletions(-) rename cppcheck-1.77-tinyxml.patch => cppcheck-1.81-tinyxml.patch (71%) rename cppcheck-1.79-translations.patch => cppcheck-1.81-translations.patch (62%) diff --git a/cppcheck-1.77-tinyxml.patch b/cppcheck-1.81-tinyxml.patch similarity index 71% rename from cppcheck-1.77-tinyxml.patch rename to cppcheck-1.81-tinyxml.patch index 673d053..17114a0 100644 --- a/cppcheck-1.77-tinyxml.patch +++ b/cppcheck-1.81-tinyxml.patch @@ -1,6 +1,6 @@ -diff -up cppcheck-1.75/cli/CMakeLists.txt.tinyxml cppcheck-1.75/cli/CMakeLists.txt ---- cppcheck-1.75/cli/CMakeLists.txt.tinyxml 2016-08-09 06:43:08.152146498 +0200 -+++ cppcheck-1.75/cli/CMakeLists.txt 2016-08-09 06:44:12.819146690 +0200 +diff -up cppcheck-1.81/cli/CMakeLists.txt.tinyxml cppcheck-1.81/cli/CMakeLists.txt +--- cppcheck-1.81/cli/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 ++++ cppcheck-1.81/cli/CMakeLists.txt 2017-10-18 16:40:18.898918748 +0200 @@ -1,5 +1,4 @@ include_directories(${PROJECT_SOURCE_DIR}/lib/) -include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/) @@ -20,9 +20,9 @@ diff -up cppcheck-1.75/cli/CMakeLists.txt.tinyxml cppcheck-1.75/cli/CMakeLists.t install(TARGETS cppcheck RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} -diff -up cppcheck-1.75/CMakeLists.txt.tinyxml cppcheck-1.75/CMakeLists.txt ---- cppcheck-1.75/CMakeLists.txt.tinyxml 2016-08-09 06:43:08.153146498 +0200 -+++ cppcheck-1.75/CMakeLists.txt 2016-08-09 06:43:31.191146016 +0200 +diff -up cppcheck-1.81/CMakeLists.txt.tinyxml cppcheck-1.81/CMakeLists.txt +--- cppcheck-1.81/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 ++++ cppcheck-1.81/CMakeLists.txt 2017-10-18 16:40:18.899918734 +0200 @@ -16,7 +16,6 @@ if (BUILD_TESTS) enable_testing() endif() @@ -31,9 +31,33 @@ diff -up cppcheck-1.75/CMakeLists.txt.tinyxml cppcheck-1.75/CMakeLists.txt add_subdirectory(externals/simplecpp) add_subdirectory(lib) # CppCheck Library add_subdirectory(cli) # Client application -diff -up cppcheck-1.75/gui/CMakeLists.txt.tinyxml cppcheck-1.75/gui/CMakeLists.txt ---- cppcheck-1.75/test/CMakeLists.txt.tinyxml 2016-08-09 06:43:08.155146498 +0200 -+++ cppcheck-1.75/test/CMakeLists.txt 2016-08-09 06:45:26.020153572 +0200 +diff -up cppcheck-1.81/gui/CMakeLists.txt.tinyxml cppcheck-1.81/gui/CMakeLists.txt +--- cppcheck-1.81/gui/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 ++++ cppcheck-1.81/gui/CMakeLists.txt 2017-10-18 16:41:12.083142778 +0200 +@@ -10,7 +10,6 @@ if (BUILD_GUI) + endif() + + include_directories(${PROJECT_SOURCE_DIR}/lib/) +- include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/) + + file(GLOB hdrs "*.h") + file(GLOB srcs "*.cpp") +@@ -20,10 +19,11 @@ if (BUILD_GUI) + QT5_ADD_RESOURCES(resources "gui.qrc") + QT5_ADD_TRANSLATION(qms ${tss}) + +- add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $ $ $) ++ add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $ $) + if (HAVE_RULES) + target_link_libraries(cppcheck-gui pcre) + endif() ++ target_link_libraries(cppcheck-gui tinyxml2) + qt5_use_modules(cppcheck-gui ${GUI_QT_COMPONENTS}) + + install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) +diff -up cppcheck-1.81/test/CMakeLists.txt.tinyxml cppcheck-1.81/test/CMakeLists.txt +--- cppcheck-1.81/test/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 ++++ cppcheck-1.81/test/CMakeLists.txt 2017-10-18 16:40:18.900918719 +0200 @@ -1,16 +1,16 @@ if (BUILD_TESTS) @@ -53,28 +77,3 @@ diff -up cppcheck-1.75/gui/CMakeLists.txt.tinyxml cppcheck-1.75/gui/CMakeLists.t add_custom_target(copy_cfg ALL COMMENT "Copying cfg files") ---- cppcheck-1.77/gui/CMakeLists.txt.orig 2017-01-31 12:46:53.394879690 -0600 -+++ cppcheck-1.77/gui/CMakeLists.txt 2017-01-31 12:47:57.626549785 -0600 -@@ -11,7 +11,6 @@ - endif() - - include_directories(${PROJECT_SOURCE_DIR}/lib/) -- include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/) - - file(GLOB hdrs "*.h") - file(GLOB srcs "*.cpp") -@@ -21,12 +20,13 @@ - QT4_ADD_RESOURCES(resources "gui.qrc") - QT4_ADD_TRANSLATION(qms ${tss}) - -- add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $ $ $) -+ add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $ $) - target_link_libraries(cppcheck-gui ${QT_LIBRARIES}) - if (HAVE_RULES) - target_link_libraries(cppcheck-gui pcre) - endif() - -+ target_link_libraries(cppcheck-gui tinyxml2) - - install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) - install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) diff --git a/cppcheck-1.79-translations.patch b/cppcheck-1.81-translations.patch similarity index 62% rename from cppcheck-1.79-translations.patch rename to cppcheck-1.81-translations.patch index f4531dc..9e9a662 100644 --- a/cppcheck-1.79-translations.patch +++ b/cppcheck-1.81-translations.patch @@ -1,8 +1,8 @@ -diff -up cppcheck-1.79/gui/CMakeLists.txt.translations cppcheck-1.79/gui/CMakeLists.txt ---- cppcheck-1.79/gui/CMakeLists.txt.translations 2017-05-18 05:09:44.643624491 +0200 -+++ cppcheck-1.79/gui/CMakeLists.txt 2017-05-18 05:09:44.651624352 +0200 -@@ -29,7 +29,7 @@ if (BUILD_GUI) - target_link_libraries(cppcheck-gui tinyxml2) +diff -up cppcheck-1.81/gui/CMakeLists.txt.translations cppcheck-1.81/gui/CMakeLists.txt +--- cppcheck-1.81/gui/CMakeLists.txt.translations 2017-10-18 16:41:50.647580110 +0200 ++++ cppcheck-1.81/gui/CMakeLists.txt 2017-10-18 16:42:38.432882931 +0200 +@@ -27,7 +27,7 @@ if (BUILD_GUI) + qt5_use_modules(cppcheck-gui ${GUI_QT_COMPONENTS}) install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) - install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) @@ -10,10 +10,10 @@ diff -up cppcheck-1.79/gui/CMakeLists.txt.translations cppcheck-1.79/gui/CMakeLi install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) -diff -up cppcheck-1.79/gui/translationhandler.cpp.translations cppcheck-1.79/gui/translationhandler.cpp ---- cppcheck-1.79/gui/translationhandler.cpp.translations 2017-05-18 05:09:44.649624387 +0200 -+++ cppcheck-1.79/gui/translationhandler.cpp 2017-05-18 05:14:16.716915424 +0200 -@@ -116,15 +116,7 @@ bool TranslationHandler::SetLanguage(con +diff -up cppcheck-1.81/gui/translationhandler.cpp.translations cppcheck-1.81/gui/translationhandler.cpp +--- cppcheck-1.81/gui/translationhandler.cpp.translations 2017-10-07 23:11:39.000000000 +0200 ++++ cppcheck-1.81/gui/translationhandler.cpp 2017-10-18 16:41:50.649580081 +0200 +@@ -116,15 +116,7 @@ bool TranslationHandler::setLanguage(con if (datadir.isEmpty()) datadir = appPath; diff --git a/cppcheck.spec b/cppcheck.spec index 97debdb..a461c66 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,24 +1,24 @@ -Name: cppcheck -Version: 1.81 -Release: 1%{?dist} -Summary: Tool for static C/C++ code analysis -Group: Development/Languages -License: GPLv3+ -URL: http://cppcheck.wiki.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Name: cppcheck +Version: 1.81 +Release: 1%{?dist} +Summary: Tool for static C/C++ code analysis +Group: Development/Languages +License: GPLv3+ +URL: http://cppcheck.wiki.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # Use system tinyxml2 -Patch0: cppcheck-1.77-tinyxml.patch +Patch0: cppcheck-1.81-tinyxml.patch # Fix location of translations -Patch1: cppcheck-1.79-translations.patch +Patch1: cppcheck-1.81-translations.patch # Set location of config files Patch2: cppcheck-1.78-cfgdir.patch -BuildRequires: pcre-devel -BuildRequires: tinyxml2-devel >= 2.1.0 -BuildRequires: docbook-style-xsl -BuildRequires: libxslt +BuildRequires: pcre-devel +BuildRequires: tinyxml2-devel >= 2.1.0 +BuildRequires: docbook-style-xsl +BuildRequires: libxslt BuildRequires: qt4-devel BuildRequires: cmake BuildRequires: desktop-file-utils From 452c79914512304b3bfa86defbe7e4fa29bb79b9 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 18 Oct 2017 16:50:16 +0200 Subject: [PATCH 04/12] cppcheck-gui now depends on qt5, not qt4. --- cppcheck.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cppcheck.spec b/cppcheck.spec index a461c66..5fb2bca 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -19,7 +19,7 @@ BuildRequires: pcre-devel BuildRequires: tinyxml2-devel >= 2.1.0 BuildRequires: docbook-style-xsl BuildRequires: libxslt -BuildRequires: qt4-devel +BuildRequires: qt5-devel BuildRequires: cmake BuildRequires: desktop-file-utils From 24a7a8373eefc4403b8c4dac738ebbe7b7018fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Tue, 23 Jan 2018 00:30:05 +0100 Subject: [PATCH 05/12] Bump release & rebuild (tinyxml2 soname/ABI change) --- cppcheck.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppcheck.spec b/cppcheck.spec index 5fb2bca..00360b4 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,6 +1,6 @@ Name: cppcheck Version: 1.81 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tool for static C/C++ code analysis Group: Development/Languages License: GPLv3+ @@ -94,6 +94,9 @@ rm -rf %{buildroot} %changelog +* Tue Jan 23 2018 François Cami - 1.81-2 +- Rebuilt for tinyxml2 soname/ABI change + * Wed Oct 18 2017 Susi Lehtola - 1.81-1 - Update to 1.81. From 88159928148850f142228781332908a6af9be997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 23 Jan 2018 16:38:28 +0100 Subject: [PATCH 06/12] Rebuilt for tinyxml2 soname/ABI change again --- cppcheck.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppcheck.spec b/cppcheck.spec index 00360b4..f711eab 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,6 +1,6 @@ Name: cppcheck Version: 1.81 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tool for static C/C++ code analysis Group: Development/Languages License: GPLv3+ @@ -94,6 +94,9 @@ rm -rf %{buildroot} %changelog +* Tue Jan 23 2018 Björn Esser - 1.81-3 +- Rebuilt for tinyxml2 soname/ABI change again + * Tue Jan 23 2018 François Cami - 1.81-2 - Rebuilt for tinyxml2 soname/ABI change From ae349f055a498ff974519c06665424832c21873d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:50:01 +0000 Subject: [PATCH 07/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cppcheck.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cppcheck.spec b/cppcheck.spec index f711eab..0615a55 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,6 +1,6 @@ Name: cppcheck Version: 1.81 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Tool for static C/C++ code analysis Group: Development/Languages License: GPLv3+ @@ -94,6 +94,9 @@ rm -rf %{buildroot} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.81-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Jan 23 2018 Björn Esser - 1.81-3 - Rebuilt for tinyxml2 soname/ABI change again From cb462578e76e743c3a7b47e691a472c64876d200 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:10:27 +0100 Subject: [PATCH 08/12] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- cppcheck.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cppcheck.spec b/cppcheck.spec index 0615a55..47d590a 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -6,7 +6,6 @@ Group: Development/Languages License: GPLv3+ URL: http://cppcheck.wiki.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) # Use system tinyxml2 Patch0: cppcheck-1.81-tinyxml.patch From 8fa4fb983f289030d7fae4197f6156d0781a492c Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:04:28 +0100 Subject: [PATCH 09/12] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- cppcheck.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/cppcheck.spec b/cppcheck.spec index 47d590a..5085961 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -75,9 +75,6 @@ install -D -p -m 644 gui/cppcheck-gui.png %{buildroot}%{_datadir}/pixmaps/cppche cd objdir-%{_target_platform}/bin ./testrunner -g -q -%clean -rm -rf %{buildroot} - %files %doc AUTHORS COPYING man/manual.html %{_datadir}/CppCheck/ From c00a51ea69c85ec0efa9a452a9639496cee02538 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 28 Feb 2018 14:54:33 +0100 Subject: [PATCH 10/12] Add gcc-c++ buildrequires. --- cppcheck.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cppcheck.spec b/cppcheck.spec index 5085961..eba6401 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,6 +1,6 @@ Name: cppcheck Version: 1.81 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for static C/C++ code analysis Group: Development/Languages License: GPLv3+ @@ -14,6 +14,7 @@ Patch1: cppcheck-1.81-translations.patch # Set location of config files Patch2: cppcheck-1.78-cfgdir.patch +BuildRequires: gcc-c++ BuildRequires: pcre-devel BuildRequires: tinyxml2-devel >= 2.1.0 BuildRequires: docbook-style-xsl @@ -90,6 +91,9 @@ cd objdir-%{_target_platform}/bin %changelog +* Wed Feb 28 2018 Susi Lehtola - 1.81-5 +- Added gcc-c++ buildrequires. + * Wed Feb 07 2018 Fedora Release Engineering - 1.81-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d4f19b339645cecbcb32aa3edbd2e43f75e10216 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Sat, 14 Apr 2018 16:49:48 +0200 Subject: [PATCH 11/12] Update to 1.83. --- ...nyxml.patch => cppcheck-1.83-tinyxml.patch | 35 +++++++++---------- cppcheck.spec | 9 +++-- 2 files changed, 23 insertions(+), 21 deletions(-) rename cppcheck-1.81-tinyxml.patch => cppcheck-1.83-tinyxml.patch (70%) diff --git a/cppcheck-1.81-tinyxml.patch b/cppcheck-1.83-tinyxml.patch similarity index 70% rename from cppcheck-1.81-tinyxml.patch rename to cppcheck-1.83-tinyxml.patch index 17114a0..b396f48 100644 --- a/cppcheck-1.81-tinyxml.patch +++ b/cppcheck-1.83-tinyxml.patch @@ -1,13 +1,12 @@ -diff -up cppcheck-1.81/cli/CMakeLists.txt.tinyxml cppcheck-1.81/cli/CMakeLists.txt ---- cppcheck-1.81/cli/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 -+++ cppcheck-1.81/cli/CMakeLists.txt 2017-10-18 16:40:18.898918748 +0200 -@@ -1,5 +1,4 @@ +--- cppcheck-1.83.orig/cli/CMakeLists.txt 2018-04-02 03:02:50.000000000 -0400 ++++ cppcheck-1.83.orig/cli/CMakeLists.txt 2018-04-12 12:46:04.990212969 -0400 +@@ -1,5 +1,4 @@ include_directories(${PROJECT_SOURCE_DIR}/lib/) -include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml/) include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/) file(GLOB hdrs "*.h") -@@ -8,10 +7,11 @@ file(GLOB mainfile "main.cpp") +@@ -8,13 +7,14 @@ list(REMOVE_ITEM srcs ${mainfile}) add_library(cli_objs OBJECT ${hdrs} ${srcs}) @@ -16,14 +15,16 @@ diff -up cppcheck-1.81/cli/CMakeLists.txt.tinyxml cppcheck-1.81/cli/CMakeLists.t if (HAVE_RULES) target_link_libraries(cppcheck pcre) endif() + if (MSVC) + target_link_libraries(cppcheck Shlwapi.lib) + endif() +target_link_libraries(cppcheck tinyxml2) install(TARGETS cppcheck RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} -diff -up cppcheck-1.81/CMakeLists.txt.tinyxml cppcheck-1.81/CMakeLists.txt ---- cppcheck-1.81/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 -+++ cppcheck-1.81/CMakeLists.txt 2017-10-18 16:40:18.899918734 +0200 -@@ -16,7 +16,6 @@ if (BUILD_TESTS) +--- cppcheck-1.83.orig/CMakeLists.txt 2018-04-02 03:02:50.000000000 -0400 ++++ cppcheck-1.83.orig/CMakeLists.txt 2018-04-12 12:45:04.959219411 -0400 +@@ -16,7 +16,6 @@ enable_testing() endif() @@ -31,10 +32,9 @@ diff -up cppcheck-1.81/CMakeLists.txt.tinyxml cppcheck-1.81/CMakeLists.txt add_subdirectory(externals/simplecpp) add_subdirectory(lib) # CppCheck Library add_subdirectory(cli) # Client application -diff -up cppcheck-1.81/gui/CMakeLists.txt.tinyxml cppcheck-1.81/gui/CMakeLists.txt ---- cppcheck-1.81/gui/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 -+++ cppcheck-1.81/gui/CMakeLists.txt 2017-10-18 16:41:12.083142778 +0200 -@@ -10,7 +10,6 @@ if (BUILD_GUI) +--- cppcheck-1.83.orig/gui/CMakeLists.txt 2018-04-02 03:02:50.000000000 -0400 ++++ cppcheck-1.83.orig/gui/CMakeLists.txt 2018-04-12 12:45:04.959219411 -0400 +@@ -10,7 +10,6 @@ endif() include_directories(${PROJECT_SOURCE_DIR}/lib/) @@ -42,7 +42,7 @@ diff -up cppcheck-1.81/gui/CMakeLists.txt.tinyxml cppcheck-1.81/gui/CMakeLists.t file(GLOB hdrs "*.h") file(GLOB srcs "*.cpp") -@@ -20,10 +19,11 @@ if (BUILD_GUI) +@@ -20,10 +19,11 @@ QT5_ADD_RESOURCES(resources "gui.qrc") QT5_ADD_TRANSLATION(qms ${tss}) @@ -55,10 +55,9 @@ diff -up cppcheck-1.81/gui/CMakeLists.txt.tinyxml cppcheck-1.81/gui/CMakeLists.t qt5_use_modules(cppcheck-gui ${GUI_QT_COMPONENTS}) install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) -diff -up cppcheck-1.81/test/CMakeLists.txt.tinyxml cppcheck-1.81/test/CMakeLists.txt ---- cppcheck-1.81/test/CMakeLists.txt.tinyxml 2017-10-07 23:11:39.000000000 +0200 -+++ cppcheck-1.81/test/CMakeLists.txt 2017-10-18 16:40:18.900918719 +0200 -@@ -1,16 +1,16 @@ +--- cppcheck-1.83.orig/test/CMakeLists.txt 2018-04-02 03:02:50.000000000 -0400 ++++ cppcheck-1.83.orig/test/CMakeLists.txt 2018-04-12 12:45:04.959219411 -0400 +@@ -1,16 +1,16 @@ if (BUILD_TESTS) include_directories(${PROJECT_SOURCE_DIR}/lib/ ${PROJECT_SOURCE_DIR}/cli/) diff --git a/cppcheck.spec b/cppcheck.spec index eba6401..2df67c3 100644 --- a/cppcheck.spec +++ b/cppcheck.spec @@ -1,6 +1,6 @@ Name: cppcheck -Version: 1.81 -Release: 5%{?dist} +Version: 1.83 +Release: 1%{?dist} Summary: Tool for static C/C++ code analysis Group: Development/Languages License: GPLv3+ @@ -8,7 +8,7 @@ URL: http://cppcheck.wiki.sourceforge.net/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Use system tinyxml2 -Patch0: cppcheck-1.81-tinyxml.patch +Patch0: cppcheck-1.83-tinyxml.patch # Fix location of translations Patch1: cppcheck-1.81-translations.patch # Set location of config files @@ -91,6 +91,9 @@ cd objdir-%{_target_platform}/bin %changelog +* Sat Apr 14 2018 Susi Lehtola - 1.83-1 +- Update to 1.83. + * Wed Feb 28 2018 Susi Lehtola - 1.81-5 - Added gcc-c++ buildrequires. From 84fd7168ba96229f187955354868788bc2a436da Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Sat, 14 Apr 2018 16:53:40 +0200 Subject: [PATCH 12/12] Forgot to add new source tarball. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1ed57fb..e7e4b91 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ cppcheck-1.44.tar.bz2 /cppcheck-1.79.tar.bz2 /cppcheck-1.80.tar.gz /cppcheck-1.81.tar.gz +/cppcheck-1.83.tar.gz diff --git a/sources b/sources index 0c74911..ea82c14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cppcheck-1.81.tar.gz) = 0a8d288a1ca8e87b99bc23d87badb81a5754dff96a7e1e4acc04f4a1cd8a64ca10a724a1caabe964a66db6cc398a80de918c43e59f0bda5163fced0ff0744553 +SHA512 (cppcheck-1.83.tar.gz) = 1f610c6ff73401e68c5f8ad4f6f78d754e760ca79395681fe76b1248ef596fcfd471b76482f7cce690226ed745645b03d15e3f91a6d60f58e7747d36ffda3840