From f8cc68f0b96885e19c3949fcf88be9d69ced21b8 Mon Sep 17 00:00:00 2001 From: Susi Lehtola Date: Wed, 18 Oct 2017 16:44:12 +0200 Subject: [PATCH] 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