From 21d1bc741d22b3b309b9904700a293e0bfba7fec Mon Sep 17 00:00:00 2001 From: omni Date: Sun, 28 Mar 2021 17:05:06 +0000 Subject: [PATCH] community/cppcheck: upgrade to 2.4.1 enable on aarch64 & s390x --- community/cppcheck/APKBUILD | 12 ++++------ community/cppcheck/climit.patch | 22 ------------------- .../disable-findFunction19-test.patch | 13 ----------- 3 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 community/cppcheck/climit.patch delete mode 100644 community/cppcheck/disable-findFunction19-test.patch diff --git a/community/cppcheck/APKBUILD b/community/cppcheck/APKBUILD index 25fc1f73958..a6979b20fb9 100644 --- a/community/cppcheck/APKBUILD +++ b/community/cppcheck/APKBUILD @@ -1,19 +1,17 @@ # Contributor: August Klein # Maintainer: André Klitzing pkgname=cppcheck -pkgver=2.3 +pkgver=2.4.1 pkgrel=0 pkgdesc="Static analysis tool for C/C++ code" url="http://cppcheck.sourceforge.net" -arch="all !s390x !aarch64 !mips !mips64" # limited by z3 +arch="all !mips !mips64" # limited by z3 license="GPL-3.0-or-later" makedepends="docbook-xsl pcre-dev python3 qt5-qttools-dev z3-dev tinyxml2-dev qtchooser" subpackages="$pkgname-doc $pkgname-htmlreport::noarch $pkgname-gui" source="$pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/$pkgver.tar.gz set_datadir.patch - disable-findFunction19-test.patch python3-htmlreport.patch - climit.patch " build() { @@ -59,8 +57,6 @@ gui() { mv gui/cppcheck*.qm "$subpkgdir"/usr/share/cppcheck/lang/ } -sha512sums="1da7985e1b0636a4cd2c85c07fcb0ca938445ae1d0a7543d059a1851125cb263053d4fe41f38a469d5a3c5c9eb0092b527b1d07ac6aa71e3b83ab1482a2a1007 cppcheck-2.3.tar.gz +sha512sums="8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09 cppcheck-2.4.1.tar.gz 013e3d1bb49602ac0bf39335d5b4df001aa98e1ad9689207063460edc30a4cd7b67f5e880bd0bcae0c03e5724a8bdd0cb5c8cafcb89a815dab24b2ead2923f36 set_datadir.patch -dd118f930aa509ee3d8b39d920f5de38b425657cc8a44520bb13b8f744aa4f2fe2bcd61141dbe1730f3202b70aecd3ef2531a04b8ebccdc5475cbe1a4dda38ab disable-findFunction19-test.patch -346c5b41af809dfbff00b7ce66f8abc0e038d6272cf08bbefc4bfc6eaf32940815faca376609165de85072761271521c2a7a56aa7c59e88f65f7d9514b35aaff python3-htmlreport.patch -211b4a6d48ad08d3dbd4d112ac7ff5e1fa4e61577958a6e2feb4d55b8862f346c9ab555c9e17cc14cef2d9547ac050c82a124959351cf5af56bc5445bfc91979 climit.patch" +346c5b41af809dfbff00b7ce66f8abc0e038d6272cf08bbefc4bfc6eaf32940815faca376609165de85072761271521c2a7a56aa7c59e88f65f7d9514b35aaff python3-htmlreport.patch" diff --git a/community/cppcheck/climit.patch b/community/cppcheck/climit.patch deleted file mode 100644 index 504b8b95b48..00000000000 --- a/community/cppcheck/climit.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b7ce2a5a99f3f8665faf04d9efc6f4e838095124 Mon Sep 17 00:00:00 2001 -From: YQGong <32567917+YQGong@users.noreply.github.com> -Date: Sat, 30 Jan 2021 21:45:03 +0800 -Subject: [PATCH] fix NAME_MAX not found on macOS GCC8.1 (#3098) - ---- - cli/filelister.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cli/filelister.cpp b/cli/filelister.cpp -index f619b485a2..6a54bd2b18 100644 ---- a/cli/filelister.cpp -+++ b/cli/filelister.cpp -@@ -24,6 +24,8 @@ - - #include - #include -+// fix NAME_MAX not found on macOS GCC8.1 -+#include - - #ifdef _WIN32 - diff --git a/community/cppcheck/disable-findFunction19-test.patch b/community/cppcheck/disable-findFunction19-test.patch deleted file mode 100644 index ac8df18f804..00000000000 --- a/community/cppcheck/disable-findFunction19-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp -index 384e64fa1..218bdb56d 100644 ---- a/test/testsymboldatabase.cpp -+++ b/test/testsymboldatabase.cpp -@@ -326,7 +326,7 @@ private: - TEST_CASE(findFunction16); - TEST_CASE(findFunction17); - TEST_CASE(findFunction18); -- TEST_CASE(findFunction19); -+ //TEST_CASE(findFunction19); // broken on aarch64 & s390x - TEST_CASE(findFunction20); // #8280 - - TEST_CASE(noexceptFunction1);