1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-07-25 04:05:40 +03:00

testing/cppcheck: upgrade to 1.73

This commit is contained in:
AmatCoder 2016-05-28 09:46:27 +00:00 committed by Jakub Jirutka
parent ba29897fd8
commit 92f85a405c
3 changed files with 25 additions and 36 deletions

View file

@ -1,34 +1,23 @@
# Contributor: August Klein <amatcoder@gmail.com> # Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: August Klein <amatcoder@gmail.com> # Maintainer: August Klein <amatcoder@gmail.com>
pkgname=cppcheck pkgname=cppcheck
pkgver=1.69 pkgver=1.73
pkgrel=0 pkgrel=0
pkgdesc="A static analysis tool for C/C++ code" pkgdesc="A static analysis tool for C/C++ code"
url="http://cppcheck.sourceforge.net" url="http://cppcheck.sourceforge.net"
arch="all" arch="all"
license="GPL3" license="GPL3"
depends="" depends=""
depends_dev="" makedepends="docbook-xsl pcre-dev qt5-qttools-dev"
makedepends="$depends_dev docbook-xsl pcre-dev qt5-qttools-dev"
install=""
subpackages="$pkgname-doc $pkgname-htmlreport $pkgname-gui" subpackages="$pkgname-doc $pkgname-htmlreport $pkgname-gui"
source="$pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/$pkgver.tar.gz source="$pkgname-$pkgver.tar.gz::https://github.com/danmar/cppcheck/archive/$pkgver.tar.gz
avoid_execinfo.patch avoid_execinfo.patch
set_datadir.patch" set_datadir.patch"
_builddir="$srcdir"/$pkgname-$pkgver builddir="$srcdir"/$pkgname-$pkgver
prepare() {
local i
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() { build() {
cd "$_builddir" cd "$builddir"
make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-*/manpages/docbook.xsl man || return 1 make DB2MAN=/usr/share/xml/docbook/xsl-stylesheets-*/manpages/docbook.xsl man || return 1
cd gui cd gui
@ -38,7 +27,7 @@ build() {
} }
package() { package() {
cd "$_builddir" cd "$builddir"
make DESTDIR="$pkgdir" CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes install || return 1 make DESTDIR="$pkgdir" CFGDIR=/usr/share/cppcheck/cfg HAVE_RULES=yes install || return 1
install -Dm644 cppcheck.1 "$pkgdir"/usr/share/man/man1/cppcheck.1 || return 1 install -Dm644 cppcheck.1 "$pkgdir"/usr/share/man/man1/cppcheck.1 || return 1
} }
@ -46,31 +35,31 @@ package() {
htmlreport() { htmlreport() {
pkgdesc="A utility to generate a html report of a XML file produced by cppcheck" pkgdesc="A utility to generate a html report of a XML file produced by cppcheck"
arch="noarch" arch="noarch"
depends="cppcheck py-pygments" depends="$pkgname py-pygments"
cd "$_builddir" cd "$builddir"
mkdir -p "$subpkgdir"/usr/bin mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/$subpkgname "$subpkgdir"/usr/bin/ mv "$pkgdir"/usr/bin/$subpkgname "$subpkgdir"/usr/bin/
} }
gui() { gui() {
pkgdesc="A Qt gui for cppcheck" pkgdesc="A Qt gui for cppcheck"
depends="cppcheck" depends="$pkgname"
cd "$_builddir" cd "$builddir"
mkdir -p "$subpkgdir"/usr/bin mkdir -p "$subpkgdir"/usr/bin
mv gui/$subpkgname "$subpkgdir"/usr/bin/ mv gui/$subpkgname "$subpkgdir"/usr/bin/ || return 1
mkdir -p "$subpkgdir"/usr/share/cppcheck/lang/ mkdir -p "$subpkgdir"/usr/share/cppcheck/lang/
mv gui/cppcheck*.qm "$subpkgdir"/usr/share/cppcheck/lang/ mv gui/cppcheck*.qm "$subpkgdir"/usr/share/cppcheck/lang/
} }
md5sums="9bc7532d9371f506bc4547a05a1fdebf cppcheck-1.69.tar.gz md5sums="8c2713c4475ff204438b7dc999011e26 cppcheck-1.73.tar.gz
f7543600f177495d19246934210df4c4 avoid_execinfo.patch 3d29b07670be78cf36ef8493089f37cd avoid_execinfo.patch
9107713c930708436089b31eb3975de0 set_datadir.patch" 24f448e5821494d4f02d44551aa8cb0a set_datadir.patch"
sha256sums="6e54f0dc97cbcc6c742cef4ceb1ade7f20f88af713a19c7613dba1d78eed6363 cppcheck-1.69.tar.gz sha256sums="938d792c9399233b551bd9991d6842f353fa8dad973d5e457b78be66646c8b8f cppcheck-1.73.tar.gz
d628da592fd6fce32d533a8333a20ea0bc273a1a21ed6057f0673678b6bdf4a5 avoid_execinfo.patch aa6a72bc06039b857accc04c00cddb37d19aa86f3a8aee01ce17fac969d87fe4 avoid_execinfo.patch
0f76926ea6baec00cad4e62ecb9215139cf8a1709c3ec613f494212e18ac5275 set_datadir.patch" 993e9426221624f59f2e22a814af03097976a3fded7c06f57bf702d532e7bcef set_datadir.patch"
sha512sums="0b0ea178e9135987153f104f6b8dac8f6c441c55893dd1e32217087b97f3ae6be8fb6365e93d23d202195dde61a32e1fb6a532e6c54c2a54564d09cf774bdbe0 cppcheck-1.69.tar.gz sha512sums="556f5f3f0f4cd33a470ee6a16a60b3a0a43fac0547bd3bb70f4a3253fa51870d2b780686d907bfc3a038f8630cf9e6ebc0adc417104fef69ab3369c6157f6ae3 cppcheck-1.73.tar.gz
0f8b62dfbef9305d7146adf14cd01e028e12a63f781d8f25e3e813ecbf98f8bc0c79b0085ec277a12bee8208abddc5520b51e64c5a3503dc77e52db95688c66d avoid_execinfo.patch 5c21e4be5a0e11b26da38e4bbe5566d27e01024198947ed6bf4de88f1067159e730966e85d67af99034e54be9120a065b17f16b86278b28d792597c3f8c65c2b avoid_execinfo.patch
b3cdd52899c2e1633cd715243b285029a8e72aa3e745be04579677b572b569ef3616dbe98df11cc9a39bc9acd9c13cc43bc4d21edc7e7fde8b95a9903cdcd58e set_datadir.patch" 76f0699273347068b562d001cf6701ef3180506d21bd9298a6b1f2e522ea3c32b1cc350128a2c0b8d69b89aa3c0992b04e9d641ae170b51e3073acb3c6ca7b6e set_datadir.patch"

View file

@ -1,6 +1,6 @@
--- cppcheck-1.68-origin/cli/cppcheckexecutor.cpp --- cppcheck-1.73-origin/cli/cppcheckexecutor.cpp
+++ cppcheck-1.68/cli/cppcheckexecutor.cpp +++ cppcheck-1.73/cli/cppcheckexecutor.cpp
@@ -51,7 +51,7 @@ @@ -50,7 +50,7 @@
#endif #endif
#endif #endif

View file

@ -1,5 +1,5 @@
--- cppcheck-1.68-origin/gui/main.cpp --- cppcheck-1.73-origin/gui/main.cpp
+++ cppcheck-1.68/gui/main.cpp +++ cppcheck-1.73/gui/main.cpp
@@ -57,12 +57,18 @@ @@ -57,12 +57,18 @@
QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app); QSettings* settings = new QSettings("Cppcheck", "Cppcheck-GUI", &app);
@ -7,7 +7,7 @@
+ if ((settings->value("DATADIR", QString()).toString()).isEmpty()) + if ((settings->value("DATADIR", QString()).toString()).isEmpty())
+ settings->setValue("DATADIR", "/usr/share/cppcheck"); + settings->setValue("DATADIR", "/usr/share/cppcheck");
+ +
foreach(const QString arg, app.arguments()) { foreach (const QString arg, app.arguments()) {
if (arg.startsWith("--data-dir=")) { if (arg.startsWith("--data-dir=")) {
settings->setValue("DATADIR", arg.mid(11)); settings->setValue("DATADIR", arg.mid(11));
return 0; return 0;