Date: Tuesday, March 22, 2022 @ 19:52:07 Author: grawlinson Revision: 1170495
upgpkg: cppcheck Drop Fedora's fix and use upstream's suggested fix for undefined references to tinyxml2. Modified: cppcheck/trunk/PKGBUILD Deleted: cppcheck/trunk/find-tinyxml2.patch ---------------------+ PKGBUILD | 9 +++------ find-tinyxml2.patch | 13 ------------- 2 files changed, 3 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-03-22 19:52:05 UTC (rev 1170494) +++ PKGBUILD 2022-03-22 19:52:07 UTC (rev 1170495) @@ -33,14 +33,11 @@ source=( "$pkgname::git+https://github.com/danmar/cppcheck.git#commit=$_commit"; 'translations-location.patch' - 'find-tinyxml2.patch' ) sha512sums=('SKIP' - 'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae' - '09b03952ea98f56ed750f3e4443dd148a8aafc68072235537c7db09aca83a11a9f28e7a573b0d63d2a1bf1b57886fd540be060d933bcec9b38d09a09426ae5ff') + 'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae') b2sums=('SKIP' - '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f' - '51585895a91142fecac88e49c9c182897441ee8033638927b0cbd1c66e5345096d0b03f296a2a8ff8622ef5959b73963617e46be231c8e9a6fbc563571db7ba5') + '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f') pkgver() { cd "$pkgname" @@ -55,7 +52,7 @@ patch -p1 -i ../translations-location.patch # fix undefined reference to tinyxml2 - patch -p1 -i ../find-tinyxml2.patch + git cherry-pick -n 72ff5fdaacd965dc755330640e815dc7acb9e255 } build() { Deleted: find-tinyxml2.patch =================================================================== --- find-tinyxml2.patch 2022-03-22 19:52:05 UTC (rev 1170494) +++ find-tinyxml2.patch 2022-03-22 19:52:07 UTC (rev 1170495) @@ -1,13 +0,0 @@ ---- 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")
