[arch-commits] Commit in cppcheck/repos/community-x86_64 (4 files)
Jelle van der Waa
jelle at gemini.archlinux.org
Sun Jul 11 19:06:45 UTC 2021
Date: Sunday, July 11, 2021 @ 19:06:45
Author: jelle
Revision: 976580
archrelease: copy trunk to community-x86_64
Added:
cppcheck/repos/community-x86_64/PKGBUILD
(from rev 976579, cppcheck/trunk/PKGBUILD)
cppcheck/repos/community-x86_64/translations-location.patch
(from rev 976579, cppcheck/trunk/translations-location.patch)
Deleted:
cppcheck/repos/community-x86_64/PKGBUILD
cppcheck/repos/community-x86_64/translations-location.patch
-----------------------------+
PKGBUILD | 140 +++++++++++++++++++++---------------------
translations-location.patch | 40 ++++++------
2 files changed, 90 insertions(+), 90 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-11 19:06:39 UTC (rev 976579)
+++ PKGBUILD 2021-07-11 19:06:45 UTC (rev 976580)
@@ -1,70 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-
-pkgname=cppcheck
-pkgver=2.4.1
-pkgrel=2
-pkgdesc="A tool for static C/C++ code analysis"
-arch=('x86_64')
-url="http://cppcheck.sourceforge.net/"
-license=('GPL')
-depends=('python-pygments' 'tinyxml2')
-makedepends=('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')
-source=($pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz
- translations-location.patch
- https://github.com/danmar/cppcheck/commit/8d682884.patch)
-sha1sums=('b2b19fa617aa4f2bd67609a15ba1f737909dbf66'
- '03b0888438cf92ccdcbf307dbc3c35e65c91b844'
- '7846c2e482320c2f6f9352dc134fdf0ad39faec8')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- patch -Np1 -i $srcdir/translations-location.patch
- patch -p1 < ../8d682884.patch # Fix build with GCC 11
-
- mkdir build
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- export CXXFLAGS+=" -DNDEBUG"
-
- # Manuals
- 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
-
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
- -DUSE_MATCHCOMPILER=yes -DHAVE_RULES=yes \
- -DBUILD_GUI=yes -DBUILD_SHARED_LIBS:BOOL=OFF \
- -DBUILD_TESTS=yes -DFILESDIR=/usr/share/cppcheck \
- -DUSE_BUNDLED_TINYXML2=OFF \
- ..
-
- make
-}
-
-
-check() {
- cd "${pkgname}-${pkgver}/build/bin"
- ./testrunner -g -q
-}
-
-package() {
- cd "${pkgname}-${pkgver}/build"
- make DESTDIR="${pkgdir}" install
-
- cd ..
-
- install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1
- install -D -p -m 755 htmlreport/cppcheck-htmlreport "${pkgdir}"/usr/bin/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 976579, cppcheck/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-07-11 19:06:45 UTC (rev 976580)
@@ -0,0 +1,70 @@
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+
+pkgname=cppcheck
+pkgver=2.5
+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=('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')
+source=($pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz
+ translations-location.patch
+ https://github.com/danmar/cppcheck/commit/8d682884.patch)
+sha1sums=('ee95fc119b271f2506c0302169e7c7fcace89aa3'
+ '03b0888438cf92ccdcbf307dbc3c35e65c91b844'
+ 'f554bc1f0d9966e232ff13b2929d7a5851009278')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i $srcdir/translations-location.patch
+ patch -p1 < ../8d682884.patch # Fix build with GCC 11
+
+ mkdir build
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ export CXXFLAGS+=" -DNDEBUG"
+
+ # Manuals
+ 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
+
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
+ -DUSE_MATCHCOMPILER=yes -DHAVE_RULES=yes \
+ -DBUILD_GUI=yes -DBUILD_SHARED_LIBS:BOOL=OFF \
+ -DBUILD_TESTS=yes -DFILESDIR=/usr/share/cppcheck \
+ -DUSE_BUNDLED_TINYXML2=OFF \
+ ..
+
+ make
+}
+
+
+check() {
+ cd "${pkgname}-${pkgver}/build/bin"
+ ./testrunner -g -q
+}
+
+package() {
+ cd "${pkgname}-${pkgver}/build"
+ make DESTDIR="${pkgdir}" install
+
+ cd ..
+
+ install -D -p -m 644 cppcheck.1 "${pkgdir}"/usr/share/man/man1/cppcheck.1
+ install -D -p -m 755 htmlreport/cppcheck-htmlreport "${pkgdir}"/usr/bin/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 2021-07-11 19:06:39 UTC (rev 976579)
+++ translations-location.patch 2021-07-11 19:06:45 UTC (rev 976580)
@@ -1,20 +0,0 @@
-diff -aur cppcheck-1.89/gui/translationhandler.cpp cppcheck-1.89.new/gui/translationhandler.cpp
---- cppcheck-1.89/gui/translationhandler.cpp 2019-09-01 15:01:12.000000000 +0200
-+++ cppcheck-1.89.new/gui/translationhandler.cpp 2019-10-02 13:47:44.503900628 +0200
-@@ -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 976579, cppcheck/trunk/translations-location.patch)
===================================================================
--- translations-location.patch (rev 0)
+++ translations-location.patch 2021-07-11 19:06:45 UTC (rev 976580)
@@ -0,0 +1,20 @@
+diff -aur cppcheck-1.89/gui/translationhandler.cpp cppcheck-1.89.new/gui/translationhandler.cpp
+--- cppcheck-1.89/gui/translationhandler.cpp 2019-09-01 15:01:12.000000000 +0200
++++ cppcheck-1.89.new/gui/translationhandler.cpp 2019-10-02 13:47:44.503900628 +0200
+@@ -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