[arch-commits] Commit in cppcheck/repos/community-x86_64 (5 files)
George Rawlinson
grawlinson at gemini.archlinux.org
Fri Mar 25 09:17:14 UTC 2022
Date: Friday, March 25, 2022 @ 09:17:14
Author: grawlinson
Revision: 1176183
archrelease: copy trunk to community-x86_64
Added:
cppcheck/repos/community-x86_64/PKGBUILD
(from rev 1176182, cppcheck/trunk/PKGBUILD)
cppcheck/repos/community-x86_64/translations-location.patch
(from rev 1176182, cppcheck/trunk/translations-location.patch)
Deleted:
cppcheck/repos/community-x86_64/PKGBUILD
cppcheck/repos/community-x86_64/find-tinyxml2.patch
cppcheck/repos/community-x86_64/translations-location.patch
-----------------------------+
PKGBUILD | 202 ++++++++++++++++++++----------------------
find-tinyxml2.patch | 13 --
translations-location.patch | 38 +++----
3 files changed, 117 insertions(+), 136 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-25 09:14:37 UTC (rev 1176182)
+++ PKGBUILD 2022-03-25 09:17:14 UTC (rev 1176183)
@@ -1,104 +0,0 @@
-# Maintainer: George Rawlinson <grawlinson at archlinux.org>
-# Contributor: Jelle van der Waa <jelle at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-
-pkgname=cppcheck
-pkgver=2.7.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'
-)
-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='97bf53515b8ec8db6f6f12ea15db4786e26afbc8'
-source=(
- "$pkgname::git+https://github.com/danmar/cppcheck.git#commit=$_commit"
- 'translations-location.patch'
- 'find-tinyxml2.patch'
-)
-sha512sums=('SKIP'
- 'd3528834d719017ec3a0e08005a293089b556622928defa1b37f940e62cb01165dcbd741e6d5e989c0156fb8789f7e63702af8b2390738648b2300a92f4ab0ae'
- '09b03952ea98f56ed750f3e4443dd148a8aafc68072235537c7db09aca83a11a9f28e7a573b0d63d2a1bf1b57886fd540be060d933bcec9b38d09a09426ae5ff')
-b2sums=('SKIP'
- '8156920eacc630cb5eceb2387937b747c84c6325bef906717cfbad68c122bdd27965da1e8070a560a0bed3a7b7c59ff5f0e116bb1d035c4c42f430c927a75b1f'
- '51585895a91142fecac88e49c9c182897441ee8033638927b0cbd1c66e5345096d0b03f296a2a8ff8622ef5959b73963617e46be231c8e9a6fbc563571db7ba5')
-
-pkgver() {
- cd "$pkgname"
-
- git describe --tags
-}
-
-prepare() {
- cd "$pkgname"
-
- # fix location of translations
- patch -p1 -i ../translations-location.patch
-
- # fix undefined reference to tinyxml2
- patch -p1 -i ../find-tinyxml2.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 1176182, cppcheck/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-25 09:17:14 UTC (rev 1176183)
@@ -0,0 +1,98 @@
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
+# Contributor: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=cppcheck
+pkgver=2.7.4
+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'
+)
+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='1cc234ac2c1a7ba8c62e4d57b4595b8f69990bd2'
+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: find-tinyxml2.patch
===================================================================
--- find-tinyxml2.patch 2022-03-25 09:14:37 UTC (rev 1176182)
+++ find-tinyxml2.patch 2022-03-25 09:17:14 UTC (rev 1176183)
@@ -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")
Deleted: translations-location.patch
===================================================================
--- translations-location.patch 2022-03-25 09:14:37 UTC (rev 1176182)
+++ translations-location.patch 2022-03-25 09:17:14 UTC (rev 1176183)
@@ -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 1176182, cppcheck/trunk/translations-location.patch)
===================================================================
--- translations-location.patch (rev 0)
+++ translations-location.patch 2022-03-25 09:17:14 UTC (rev 1176183)
@@ -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
More information about the arch-commits
mailing list