[arch-commits] Commit in cppcheck/trunk (PKGBUILD cppcheck-2.2-tinyxml.patch)
Jelle van der Waa
jelle at archlinux.org
Fri Oct 23 20:06:20 UTC 2020
Date: Friday, October 23, 2020 @ 20:06:20
Author: jelle
Revision: 730785
upgpkg: cppcheck 2.2-1
Added:
cppcheck/trunk/cppcheck-2.2-tinyxml.patch
Modified:
cppcheck/trunk/PKGBUILD
----------------------------+
PKGBUILD | 14 ++----
cppcheck-2.2-tinyxml.patch | 90 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-23 20:05:51 UTC (rev 730784)
+++ PKGBUILD 2020-10-23 20:06:20 UTC (rev 730785)
@@ -2,7 +2,7 @@
# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
pkgname=cppcheck
-pkgver=2.1
+pkgver=2.2
pkgrel=1
pkgdesc="A tool for static C/C++ code analysis"
arch=('x86_64')
@@ -9,23 +9,21 @@
url="http://cppcheck.sourceforge.net/"
license=('GPL')
depends=('python-pygments' 'tinyxml2')
-makedepends=('docbook-xsl' 'qt5-tools' 'qt5-base' 'python' 'pandoc' 'cmake')
+makedepends=('docbook-xsl' 'qt5-tools' 'qt5-base' 'python' 'pandoc' 'cmake' 'clang')
optdepends=('qt5-base: run cppcheck-gui'
'python-pygments: cppcheck-htmlreport'
'clang: for cppcheck-gui integration')
source=($pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz
- translations-location.patch cppcheck-2.1-tinyxml.patch)
-sha1sums=('e59758410408fa0679df06e8c3f3dd4e8c930d00'
+ translations-location.patch cppcheck-2.2-tinyxml.patch)
+sha1sums=('11bdc2f82269cf74f9882719f761cde79443a928'
'03b0888438cf92ccdcbf307dbc3c35e65c91b844'
- '6859e2350169af231cdb04336413a508c339a652')
+ 'd83e1202770b7389c14a91885d7d838c097d7680')
prepare() {
cd "${pkgname}-${pkgver}"
patch -Np1 -i $srcdir/translations-location.patch
- patch -Np1 -i $srcdir/cppcheck-2.1-tinyxml.patch
+ patch -Np1 -i $srcdir/cppcheck-2.2-tinyxml.patch
-#sed -i 's/2.0/2.0.0/' cmake/versions.cmake
-
# Make sure bundled tinyxml is not used
rm -r externals/tinyxml
Added: cppcheck-2.2-tinyxml.patch
===================================================================
--- cppcheck-2.2-tinyxml.patch (rev 0)
+++ cppcheck-2.2-tinyxml.patch 2020-10-23 20:06:20 UTC (rev 730785)
@@ -0,0 +1,90 @@
+diff -up cppcheck-2.2/cli/CMakeLists.txt.orig cppcheck-2.2/cli/CMakeLists.txt
+--- cppcheck-2.2/cli/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
++++ cppcheck-2.2/cli/CMakeLists.txt 2020-10-04 06:47:29.867450500 +0200
+@@ -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,7 +7,7 @@ file(GLOB mainfile "main.cpp")
+ list(REMOVE_ITEM srcs ${mainfile})
+
+ add_library(cli_objs OBJECT ${hdrs} ${srcs})
+-add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
++add_executable(cppcheck ${hdrs} ${mainfile} $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+ if (HAVE_RULES)
+ target_link_libraries(cppcheck ${PCRE_LIBRARY})
+ endif()
+@@ -18,6 +17,7 @@ endif()
+ if (WIN32 AND NOT BORLAND)
+ target_link_libraries(cppcheck Shlwapi.lib)
+ endif()
++target_link_libraries(cppcheck tinyxml2)
+
+ install(TARGETS cppcheck
+ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+diff -up cppcheck-2.2/CMakeLists.txt.orig cppcheck-2.2/CMakeLists.txt
+--- cppcheck-2.2/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
++++ cppcheck-2.2/CMakeLists.txt 2020-10-04 06:48:18.324566600 +0200
+@@ -23,7 +23,6 @@ if (BUILD_TESTS)
+ enable_testing()
+ endif()
+
+-add_subdirectory(externals/tinyxml)
+ add_subdirectory(externals/simplecpp)
+ add_subdirectory(lib) # CppCheck Library
+ add_subdirectory(cli) # Client application
+diff -up cppcheck-2.2/gui/CMakeLists.txt.orig cppcheck-2.2/gui/CMakeLists.txt
+--- cppcheck-2.2/gui/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
++++ cppcheck-2.2/gui/CMakeLists.txt 2020-10-04 07:36:13.199769100 +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,14 +19,14 @@ if (BUILD_GUI)
+ QT5_ADD_RESOURCES(resources "gui.qrc")
+ QT5_ADD_TRANSLATION(qms ${tss})
+
+- add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
++ add_executable(cppcheck-gui ${hdrs} ${srcs} ${uis_hdrs} ${resources} ${qms} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+ if (HAVE_RULES)
+ target_link_libraries(cppcheck-gui ${PCRE_LIBRARY})
+ endif()
+ if (USE_Z3)
+ target_link_libraries(cppcheck-gui ${Z3_LIBRARIES})
+ endif()
+- target_link_libraries(cppcheck-gui Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)
++ target_link_libraries(cppcheck-gui tinyxml2 Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::Help)
+ if(WITH_QCHART)
+ target_compile_definitions (cppcheck-gui PRIVATE HAVE_QCHART )
+ target_link_libraries(cppcheck-gui Qt5::Charts)
+diff -up cppcheck-2.2/test/CMakeLists.txt.orig cppcheck-2.2/test/CMakeLists.txt
+--- cppcheck-2.2/test/CMakeLists.txt.orig 2020-10-03 11:05:53.000000000 +0200
++++ cppcheck-2.2/test/CMakeLists.txt 2020-10-04 06:55:33.660775300 +0200
+@@ -13,19 +13,19 @@ if (BUILD_TESTS)
+ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure -j ${CTEST_PARALLEL_LEVEL} -C ${CMAKE_CFG_INTDIR} --timeout 90)
+
+ include_directories(${PROJECT_SOURCE_DIR}/lib/ ${PROJECT_SOURCE_DIR}/cli/)
+- include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/externals/tinyxml)
+ include_directories(${PROJECT_SOURCE_DIR}/externals/simplecpp/)
+
+ file(GLOB hdrs "*.h")
+ file(GLOB srcs "*.cpp")
+
+- add_executable(testrunner ${hdrs} ${srcs} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:tinyxml_objs> $<TARGET_OBJECTS:simplecpp_objs>)
++ add_executable(testrunner ${hdrs} ${srcs} $<TARGET_OBJECTS:lib_objs> $<TARGET_OBJECTS:cli_objs> $<TARGET_OBJECTS:simplecpp_objs>)
+ if (HAVE_RULES)
+ target_link_libraries(testrunner ${PCRE_LIBRARY})
+ endif()
+ if (USE_Z3)
+ target_link_libraries(testrunner ${Z3_LIBRARIES})
+ endif()
++ target_link_libraries(testrunner tinyxml2)
+
+ if (NOT CMAKE_DISABLE_PRECOMPILE_HEADERS)
+ target_precompile_headers(testrunner PRIVATE precompiled.h)
More information about the arch-commits
mailing list