Date: Tuesday, November 22, 2022 @ 05:58:10 Author: grawlinson Revision: 1351446
archrelease: copy trunk to community-x86_64 Added: cppcheck/repos/community-x86_64/PKGBUILD (from rev 1351445, cppcheck/trunk/PKGBUILD) cppcheck/repos/community-x86_64/translations-location.patch (from rev 1351445, cppcheck/trunk/translations-location.patch) Deleted: cppcheck/repos/community-x86_64/PKGBUILD cppcheck/repos/community-x86_64/translations-location.patch -----------------------------+ PKGBUILD | 198 +++++++++++++++++++++--------------------- translations-location.patch | 38 ++++---- 2 files changed, 118 insertions(+), 118 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-11-22 05:50:47 UTC (rev 1351445) +++ PKGBUILD 2022-11-22 05:58:10 UTC (rev 1351446) @@ -1,99 +0,0 @@ -# Maintainer: George Rawlinson <grawlin...@archlinux.org> -# Contributor: Jelle van der Waa <je...@archlinux.org> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> - -pkgname=cppcheck -pkgver=2.9.2 -pkgrel=1 -pkgdesc='A tool for static C/C++ code analysis' -arch=('x86_64') -url='http://cppcheck.sourceforge.net/' -license=('GPL') -depends=( - 'python-pygments' - 'tinyxml2' - 'pcre' -) -makedepends=( - 'git' - 'docbook-xsl' - 'qt5-tools' - 'qt5-base' - 'python' - 'pandoc' - 'cmake' - 'clang' -) -optdepends=( - 'qt5-tools: run cppcheck-gui' - 'python-pygments: cppcheck-htmlreport' - 'clang: for cppcheck-gui integration' -) -options=('debug') -_commit='caa6ff7c2a6ef64df53e04701944aaa4712a1915' -source=( - "$pkgname::git+https://github.com/danmar/cppcheck.git#commit=$_commit" - 'translations-location.patch' -) -sha512sums=('SKIP' - 'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae') -b2sums=('SKIP' - '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f') - -pkgver() { - cd "$pkgname" - - git describe --tags -} - -prepare() { - cd "$pkgname" - - # fix location of translations - patch -p1 -i ../translations-location.patch -} - -build() { - export CXXFLAGS+=" -DNDEBUG" - - # Manuals - pushd "$pkgname" - xsversion=$(pacman -Qi docbook-xsl | grep ^Version | sed -e 's/.*: //' -e 's/-[0-9]$//') - make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-${xsversion}-nons/manpages/docbook.xsl man - pandoc man/manual.md -o man/manual.html -s --number-sections --toc - pandoc man/reference-cfg-format.md -o man/reference-cfg-format.html -s --number-sections --toc - popd - - cmake \ - -B build \ - -S "$pkgname" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DUSE_MATCHCOMPILER=ON \ - -DHAVE_RULES=ON \ - -DBUILD_GUI=ON \ - -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_TESTS=ON \ - -DFILESDIR=/usr/share/cppcheck \ - -DUSE_BUNDLED_TINYXML2=OFF - - cmake --build build -} - -check() { - cd build/bin - ./testrunner -g -q -} - -package() { - DESTDIR="$pkgdir" cmake --install build - - cd "$pkgname" - - install -vDm644 -t "$pkgdir/usr/share/man/man1" cppcheck.1 - install -vDm755 -t "$pkgdir/usr/bin" htmlreport/cppcheck-htmlreport - - # Fix location of language files - install -d "${pkgdir}"/usr/share/cppcheck/cfg/lang - mv "${pkgdir}"/usr/bin/cppcheck_*.qm "${pkgdir}"/usr/share/cppcheck/cfg/lang/ -} Copied: cppcheck/repos/community-x86_64/PKGBUILD (from rev 1351445, cppcheck/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-11-22 05:58:10 UTC (rev 1351446) @@ -0,0 +1,99 @@ +# Maintainer: George Rawlinson <grawlin...@archlinux.org> +# Contributor: Jelle van der Waa <je...@archlinux.org> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> + +pkgname=cppcheck +pkgver=2.9.3 +pkgrel=1 +pkgdesc='A tool for static C/C++ code analysis' +arch=('x86_64') +url='http://cppcheck.sourceforge.net/' +license=('GPL') +depends=( + 'python-pygments' + 'tinyxml2' + 'pcre' +) +makedepends=( + 'git' + 'docbook-xsl' + 'qt5-tools' + 'qt5-base' + 'python' + 'pandoc' + 'cmake' + 'clang' +) +optdepends=( + 'qt5-tools: run cppcheck-gui' + 'python-pygments: cppcheck-htmlreport' + 'clang: for cppcheck-gui integration' +) +options=('debug') +_commit='577d07360e42c302ce49d1096059d982cf380c4f' +source=( + "$pkgname::git+https://github.com/danmar/cppcheck.git#commit=$_commit" + 'translations-location.patch' +) +sha512sums=('SKIP' + 'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae') +b2sums=('SKIP' + '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f') + +pkgver() { + cd "$pkgname" + + git describe --tags +} + +prepare() { + cd "$pkgname" + + # fix location of translations + patch -p1 -i ../translations-location.patch +} + +build() { + export CXXFLAGS+=" -DNDEBUG" + + # Manuals + pushd "$pkgname" + xsversion=$(pacman -Qi docbook-xsl | grep ^Version | sed -e 's/.*: //' -e 's/-[0-9]$//') + make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-${xsversion}-nons/manpages/docbook.xsl man + pandoc man/manual.md -o man/manual.html -s --number-sections --toc + pandoc man/reference-cfg-format.md -o man/reference-cfg-format.html -s --number-sections --toc + popd + + cmake \ + -B build \ + -S "$pkgname" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DUSE_MATCHCOMPILER=ON \ + -DHAVE_RULES=ON \ + -DBUILD_GUI=ON \ + -DBUILD_SHARED_LIBS=OFF \ + -DBUILD_TESTS=ON \ + -DFILESDIR=/usr/share/cppcheck \ + -DUSE_BUNDLED_TINYXML2=OFF + + cmake --build build +} + +check() { + cd build/bin + ./testrunner -g -q +} + +package() { + DESTDIR="$pkgdir" cmake --install build + + cd "$pkgname" + + install -vDm644 -t "$pkgdir/usr/share/man/man1" cppcheck.1 + install -vDm755 -t "$pkgdir/usr/bin" htmlreport/cppcheck-htmlreport + + # Fix location of language files + install -d "${pkgdir}"/usr/share/cppcheck/cfg/lang + mv "${pkgdir}"/usr/bin/cppcheck_*.qm "${pkgdir}"/usr/share/cppcheck/cfg/lang/ +} Deleted: translations-location.patch =================================================================== --- translations-location.patch 2022-11-22 05:50:47 UTC (rev 1351445) +++ translations-location.patch 2022-11-22 05:58:10 UTC (rev 1351446) @@ -1,19 +0,0 @@ ---- a/gui/translationhandler.cpp -+++ b/gui/translationhandler.cpp -@@ -116,15 +116,7 @@ - if (datadir.isEmpty()) - datadir = appPath; - -- QString translationFile; -- if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm")) -- translationFile = datadir + "/lang/" + mTranslations[index].mFilename + ".qm"; -- -- else if (QFile::exists(datadir + "/" + mTranslations[index].mFilename + ".qm")) -- translationFile = datadir + "/" + mTranslations[index].mFilename + ".qm"; -- -- else -- translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm"; -+ QString translationFile("/usr/share/cppcheck/cfg/lang/" + mTranslations[index].mFilename + ".qm"); - - if (!mTranslator->load(translationFile) && !failure) { - //If it failed, lets check if the default file exists Copied: cppcheck/repos/community-x86_64/translations-location.patch (from rev 1351445, cppcheck/trunk/translations-location.patch) =================================================================== --- translations-location.patch (rev 0) +++ translations-location.patch 2022-11-22 05:58:10 UTC (rev 1351446) @@ -0,0 +1,19 @@ +--- a/gui/translationhandler.cpp ++++ b/gui/translationhandler.cpp +@@ -116,15 +116,7 @@ + if (datadir.isEmpty()) + datadir = appPath; + +- QString translationFile; +- if (QFile::exists(datadir + "/lang/" + mTranslations[index].mFilename + ".qm")) +- translationFile = datadir + "/lang/" + mTranslations[index].mFilename + ".qm"; +- +- else if (QFile::exists(datadir + "/" + mTranslations[index].mFilename + ".qm")) +- translationFile = datadir + "/" + mTranslations[index].mFilename + ".qm"; +- +- else +- translationFile = appPath + "/" + mTranslations[index].mFilename + ".qm"; ++ QString translationFile("/usr/share/cppcheck/cfg/lang/" + mTranslations[index].mFilename + ".qm"); + + if (!mTranslator->load(translationFile) && !failure) { + //If it failed, lets check if the default file exists