* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2015-09-15 15:16 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2015-09-15 15:16 UTC (permalink / raw
To: gentoo-commits
commit: f5e7bd29a2a93900dc75398e102d4a1d4077dee9
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 15 14:37:57 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 15:15:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e7bd29
dev-util/cppcheck: Drop old version.
Package-Manager: portage-2.2.20.1
dev-util/cppcheck/Manifest | 3 -
dev-util/cppcheck/cppcheck-1.63-r1.ebuild | 62 -------------
dev-util/cppcheck/cppcheck-1.67.ebuild | 101 --------------------
dev-util/cppcheck/cppcheck-1.68.ebuild | 102 ---------------------
dev-util/cppcheck/cppcheck-1.69.ebuild | 102 ---------------------
dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch | 9 --
.../cppcheck/files/cppcheck-1.66-tinyxml2.patch | 67 --------------
7 files changed, 446 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 02f695f..b8ce7b8 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,4 +1 @@
-DIST cppcheck-1.63.tar.bz2 1157231 SHA256 924bfc4593215b7bab6b049dbbce9a6f343dbf15f4bdd869ef1d378f09f92064 SHA512 4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508 WHIRLPOOL af095e4f0b84ded78f9fa10baedc5266a66ac52ffa6813eeb38697d1c55e02b76670eb09228c4ce356f2d3402f4247a66fe2ccd666e5637326e0913a75c2732e
-DIST cppcheck-1.67.tar.bz2 1084926 SHA256 6214c0cf0c11c83ecfae35f8cc8db4fa47389a77360919653d635612cefe2ab9 SHA512 5d1e3e12c818f850b00a8e3b3d79f24fceb0fa806d9100aaa6aed1bbbc86237af2e7dd4567fdfd227281f62d4b5450ac6cbbc6a97e04b380c242c59ddd3609ef WHIRLPOOL 1fc82744a78b76d9bb682fa6f6d8a619164c5cb250eb199ac545d4c147522ab5c4961d635cdea291ccf65f7972a162d394c4e500542b27b8679e262093e86884
-DIST cppcheck-1.68.tar.bz2 1008321 SHA256 add6e5e12b05ca02b356cd0ec7420ae0dcafddeaef183b4dfbdef59c617349b1 SHA512 72c78a17281ad3d771459895ad776c5dceda605edef13886e870cff456db5dc5cbff39d56bdf39788283bf673dd28a13b1602a330b8e33a3042b07cf43f0f011 WHIRLPOOL 16d8d4deeef9ec9fb4415c5941935122ebf3a44159ac8251ebfbfca2aeeb270bccaed5dcf63f6018b3fcf79cad6779af76d0e1cba47e853394794be4942cd622
DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4
diff --git a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild b/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
deleted file mode 100644
index 3c1d42f..0000000
--- a/dev-util/cppcheck/cppcheck-1.63-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/cppcheck/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="htmlreport qt4"
-
-DEPEND="htmlreport? ( ${PYTHON_DEPS} )
- qt4? ( dev-qt/qtgui:4 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- tc-export CXX
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- emake CFGDIR="/usr/share/${PN}/cfg"
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc readme.txt
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc readme_gui.txt gui/{projectfile.txt,gui.cppcheck}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- fi
-}
diff --git a/dev-util/cppcheck/cppcheck-1.67.ebuild b/dev-util/cppcheck/cppcheck-1.67.ebuild
deleted file mode 100644
index d17bb4b..0000000
--- a/dev-util/cppcheck/cppcheck-1.67.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( ${PYTHON_DEPS} )
- >=dev-libs/tinyxml2-2
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.66-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch "${FILESDIR}"/${PN}-1.65-c++0x.patch
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- fi
- doman ${PN}.1
- dodoc readme.txt
-}
diff --git a/dev-util/cppcheck/cppcheck-1.68.ebuild b/dev-util/cppcheck/cppcheck-1.68.ebuild
deleted file mode 100644
index f1d83a5..0000000
--- a/dev-util/cppcheck/cppcheck-1.68.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( ${PYTHON_DEPS} )
- >=dev-libs/tinyxml2-2
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.66-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch "${FILESDIR}"/${PN}-1.65-c++0x.patch
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- fi
- doman ${PN}.1
- dodoc readme.txt
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/cppcheck-1.69.ebuild b/dev-util/cppcheck/cppcheck-1.69.ebuild
deleted file mode 100644
index 1393746..0000000
--- a/dev-util/cppcheck/cppcheck-1.69.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( ${PYTHON_DEPS} )
- >=dev-libs/tinyxml2-2
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.69-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch "${FILESDIR}"/${PN}-1.69-c++0x.patch
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- fi
- doman ${PN}.1
- dodoc readme.txt
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
deleted file mode 100644
index 67590d0..0000000
--- a/dev-util/cppcheck/files/cppcheck-1.65-c++0x.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- cppcheck-1.65/gui/gui.pro
-+++ cppcheck-1.65/gui/gui.pro
-@@ -150,6 +150,4 @@
- LIBS += -lshlwapi
- }
-
--contains(QMAKE_CC, gcc) {
- QMAKE_CXXFLAGS += -std=c++0x
--}
diff --git a/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch
deleted file mode 100644
index 1417ea3..0000000
--- a/dev-util/cppcheck/files/cppcheck-1.66-tinyxml2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- cppcheck-1.65/tools/dmake.cpp
-+++ cppcheck-1.65/tools/dmake.cpp
-@@ -170,7 +170,6 @@
- }
-
- std::vector<std::string> externalfiles;
-- getCppFiles(externalfiles, "externals/");
-
-
- // QMAKE - lib/lib.pri
-@@ -179,10 +178,6 @@
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
- fout1 << "include($$PWD/pcrerules.pri)\n";
-- fout1 << "BASEPATH = ../externals/tinyxml/\n";
-- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
-- fout1 << "BASEPATH = ../lib/\n";
-- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
- fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
- for (unsigned int i = 0; i < libfiles.size(); ++i) {
- std::string fname(libfiles[i].substr(4));
-@@ -208,7 +203,6 @@
- std::ofstream fout1("test/testfiles.pri");
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
-- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
- fout1 << "\n\nSOURCES += ";
- for (unsigned int i = 0; i < testfiles.size(); ++i) {
- const std::string filename(testfiles[i].substr(5));
-@@ -354,9 +348,9 @@
-
- makeConditionalVariable(fout, "CXX", "g++");
- makeConditionalVariable(fout, "PREFIX", "/usr");
-- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
-
- fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
- fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
-@@ -401,10 +401,10 @@
- fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n";
- fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n";
- fout << "\t./dmake\n\n";
-- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
-- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
-+ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
-+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
- fout << "clean:\n";
-- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
-+ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
- fout << "man:\tman/cppcheck.1\n\n";
- fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
- fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
---- cppcheck-1.65/gui/gui.pro
-+++ cppcheck-1.65/gui/gui.pro
-@@ -15,7 +15,7 @@
- LIBS += -l../bin/cppcheck-core
- DEFINES += CPPCHECKLIB_IMPORT
- }
--LIBS += -L../externals
-+LIBS += `pkg-config --libs tinyxml2`
-
- DESTDIR = .
- RCC_DIR = temp
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2016-01-09 2:06 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2016-01-09 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 8ef6ba279be7191fc99ab27146a6f8fc1ee901de
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 02:04:14 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 02:06:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ef6ba27
dev-util/cppcheck: Version bump (thanks Christian Strahl, bug 566974).
Package-Manager: portage-2.2.26
dev-util/cppcheck/Manifest | 1 +
dev-util/cppcheck/cppcheck-1.71.ebuild | 106 +++++++++++++++++++++
.../cppcheck/files/cppcheck-1.71-tinyxml2.patch | 67 +++++++++++++
3 files changed, 174 insertions(+)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 237e644..4c36b97 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,2 +1,3 @@
DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4
DIST cppcheck-1.70.tar.bz2 1111291 SHA256 c6aaafd41b4c2050f3fb96a4aa159507007403a163d05361bd9544e5baf18f39 SHA512 c2223edce22739e555eca114bc39d8f66229ec26fb122c976e3dcf88957bfd6b37c170e183f22611ea2d17ac22b33da78440f820c044f6099ac901bd6c4f1b8d WHIRLPOOL 0b6c52d13ff8c9c8dfdf383e419edd311a484a89d695dbf9409f1ea608c1dc5bbc20fcb03bc0469495a35b61a43a90ccf1e76cd191cf28326f929020d66083b6
+DIST cppcheck-1.71.tar.bz2 1128689 SHA256 0114d29e5c49c8ff0030798f4fa02f9ef4c1d64d09697a3ea4b19aa5b67b4afe SHA512 ff56909ca566f9a48623822d78119930f0f55961a8011b0bce92178b25f82649847612157fa24f3b21f0aad6da81aa8387d08f7af4127df1d5a75b20ced67af9 WHIRLPOOL 2d1ff247c85354329bc645a8d74ae16119e6a246a282cb47e119a956d7d65bb4ea9fd3964a228b45a11cfa5efacc6fc8ae4602c29256f237c687d35da8c154c5
diff --git a/dev-util/cppcheck/cppcheck-1.71.ebuild b/dev-util/cppcheck/cppcheck-1.71.ebuild
new file mode 100644
index 0000000..f126c41
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.71.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
+
+DESCRIPTION="static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="htmlreport pcre qt4"
+
+RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+ >=dev-libs/tinyxml2-2
+ qt4? ( dev-qt/qtgui:4 )
+ pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig"
+
+src_prepare() {
+ append-cxxflags -std=c++0x
+
+ # Drop bundled libs, patch Makefile generator and re-run it
+ rm -r externals || die
+ epatch "${FILESDIR}"/${PN}-1.71-tinyxml2.patch
+ tc-export CXX
+ emake dmake
+ ./dmake || die
+
+ epatch_user
+}
+
+src_configure() {
+ if use pcre ; then
+ sed -e '/HAVE_RULES=/s:=no:=yes:' \
+ -i Makefile
+ fi
+ if use qt4 ; then
+ pushd gui
+ qt4-r2_src_configure
+ popd
+ fi
+}
+
+src_compile() {
+ export LIBS="$(pkg-config --libs tinyxml2)"
+ emake ${PN} man \
+ CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+ DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" \
+ CXXFLAGS="${CXXFLAGS} -std=c++0x"
+
+ if use qt4 ; then
+ pushd gui
+ qt4-r2_src_compile
+ popd
+ fi
+ if use htmlreport ; then
+ pushd htmlreport
+ distutils-r1_src_compile
+ popd
+ fi
+}
+
+src_test() {
+ # safe final version
+ mv -v ${PN}{,.final}
+ mv -v lib/library.o{,.final}
+ mv -v cli/cppcheckexecutor.o{,.final}
+ #trigger recompile with CFGDIR inside ${S}
+ emake check CFGDIR="${S}/cfg"
+ # restore
+ mv -v ${PN}{.final,}
+ mv -v lib/library.o{.final,}
+ mv -v cli/cppcheckexecutor.o{.final,}
+}
+
+src_install() {
+ # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+ emake install DESTDIR="${ED}"
+
+ insinto "/usr/share/${PN}/cfg"
+ doins cfg/*.cfg
+ if use qt4 ; then
+ dobin gui/${PN}-gui
+ dodoc gui/{projectfile.txt,gui.${PN}}
+ fi
+ if use htmlreport ; then
+ pushd htmlreport
+ distutils-r1_src_install
+ popd
+ find "${D}" -name "*.egg-info" -delete
+ else
+ rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+ fi
+ doman ${PN}.1
+ dodoc -r triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.71-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.71-tinyxml2.patch
new file mode 100644
index 0000000..4b82c21
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.71-tinyxml2.patch
@@ -0,0 +1,67 @@
+--- cppcheck-1.71/gui/gui.pro
++++ cppcheck-1.71/gui/gui.pro
+@@ -14,7 +14,7 @@
+ LIBS += -l../bin/cppcheck-core
+ DEFINES += CPPCHECKLIB_IMPORT
+ }
+-LIBS += -L$$PWD/../externals
++LIBS += `pkg-config --libs tinyxml2`
+
+ DESTDIR = .
+ RCC_DIR = temp
+--- cppcheck-1.71/tools/dmake.cpp
++++ cppcheck-1.71/tools/dmake.cpp
+@@ -174,7 +174,6 @@
+ }
+
+ std::vector<std::string> externalfiles;
+- getCppFiles(externalfiles, "externals/", true);
+
+
+ // QMAKE - lib/lib.pri
+@@ -183,10 +182,6 @@
+ if (fout1.is_open()) {
+ fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+ fout1 << "include($$PWD/pcrerules.pri)\n";
+- fout1 << "BASEPATH = ../externals/tinyxml/\n";
+- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
+- fout1 << "BASEPATH = ../lib/\n";
+- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+ fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
+ for (unsigned int i = 0; i < libfiles.size(); ++i) {
+ std::string fname(libfiles[i].substr(4));
+@@ -212,7 +207,6 @@
+ std::ofstream fout1("test/testfiles.pri");
+ if (fout1.is_open()) {
+ fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+ fout1 << "\n\nSOURCES += ";
+ for (unsigned int i = 0; i < testfiles.size(); ++i) {
+ const std::string filename(testfiles[i].substr(5));
+@@ -376,9 +370,9 @@
+ << "endif\n\n";
+
+ makeConditionalVariable(fout, "PREFIX", "/usr");
+- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
+- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
+- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
++ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
++ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
++ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
+
+ fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+ fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
+@@ -419,10 +413,10 @@
+ fout << "\t$(CXX) $(CXXFLAGS) -o dmake tools/dmake.o cli/filelister.o cli/pathmatch.o lib/path.o -Ilib $(LDFLAGS)\n\n";
+ fout << "run-dmake: dmake\n";
+ fout << "\t./dmake\n\n";
+- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
+- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
++ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
++ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+ fout << "clean:\n";
+- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
++ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+ fout << "man:\tman/cppcheck.1\n\n";
+ fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
+ fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2016-01-14 22:25 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2016-01-14 22:25 UTC (permalink / raw
To: gentoo-commits
commit: 0889a829da8c60581beeb304f91a028363ecdbc2
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 22:23:00 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 22:25:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0889a829
dev-util/cppcheck: Version bump (thanks Christian Strahl, bug 571716).
Package-Manager: portage-2.2.26
dev-util/cppcheck/Manifest | 1 +
dev-util/cppcheck/cppcheck-1.69-r1.ebuild | 2 +-
dev-util/cppcheck/cppcheck-1.70.ebuild | 2 +-
dev-util/cppcheck/cppcheck-1.71.ebuild | 2 +-
.../{cppcheck-1.71.ebuild => cppcheck-1.72.ebuild} | 9 ++-
.../cppcheck/files/cppcheck-1.72-tinyxml2.patch | 66 ++++++++++++++++++++++
6 files changed, 74 insertions(+), 8 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 4c36b97..d17bc3f 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1,4 @@
DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4
DIST cppcheck-1.70.tar.bz2 1111291 SHA256 c6aaafd41b4c2050f3fb96a4aa159507007403a163d05361bd9544e5baf18f39 SHA512 c2223edce22739e555eca114bc39d8f66229ec26fb122c976e3dcf88957bfd6b37c170e183f22611ea2d17ac22b33da78440f820c044f6099ac901bd6c4f1b8d WHIRLPOOL 0b6c52d13ff8c9c8dfdf383e419edd311a484a89d695dbf9409f1ea608c1dc5bbc20fcb03bc0469495a35b61a43a90ccf1e76cd191cf28326f929020d66083b6
DIST cppcheck-1.71.tar.bz2 1128689 SHA256 0114d29e5c49c8ff0030798f4fa02f9ef4c1d64d09697a3ea4b19aa5b67b4afe SHA512 ff56909ca566f9a48623822d78119930f0f55961a8011b0bce92178b25f82649847612157fa24f3b21f0aad6da81aa8387d08f7af4127df1d5a75b20ced67af9 WHIRLPOOL 2d1ff247c85354329bc645a8d74ae16119e6a246a282cb47e119a956d7d65bb4ea9fd3964a228b45a11cfa5efacc6fc8ae4602c29256f237c687d35da8c154c5
+DIST cppcheck-1.72.tar.bz2 1125775 SHA256 9460b184ff2d8dd15344f3e2f42f634c86e4dd3303e1e9b3f13dc67536aab420 SHA512 13b2348c97a3777feaad579f8620f18d90f6f934f92f5db712c7190af1f40042527500aefa4c8ccd348f7691b1c0d5f32115085c9385dec55460d5ba0804a410 WHIRLPOOL 790514f4b5b9c539a30daa691d268c6c5f1077743cde1af8834248eb4213224275e9f72cea46f3b378119a3d0944d7e8d63270c0cd47517c7f382c683a1938fe
diff --git a/dev-util/cppcheck/cppcheck-1.69-r1.ebuild b/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
index 6c4e7d6..d5d903e 100644
--- a/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
diff --git a/dev-util/cppcheck/cppcheck-1.70.ebuild b/dev-util/cppcheck/cppcheck-1.70.ebuild
index 74b0df9..8ffd554 100644
--- a/dev-util/cppcheck/cppcheck-1.70.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.70.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
diff --git a/dev-util/cppcheck/cppcheck-1.71.ebuild b/dev-util/cppcheck/cppcheck-1.71.ebuild
index f126c41..fd66a88 100644
--- a/dev-util/cppcheck/cppcheck-1.71.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.71.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
diff --git a/dev-util/cppcheck/cppcheck-1.71.ebuild b/dev-util/cppcheck/cppcheck-1.72.ebuild
similarity index 90%
copy from dev-util/cppcheck/cppcheck-1.71.ebuild
copy to dev-util/cppcheck/cppcheck-1.72.ebuild
index f126c41..e42c03c 100644
--- a/dev-util/cppcheck/cppcheck-1.71.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.72.ebuild
@@ -4,9 +4,9 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
DESCRIPTION="static analyzer of C/C++ code"
HOMEPAGE="http://cppcheck.sourceforge.net"
@@ -31,7 +31,7 @@ src_prepare() {
# Drop bundled libs, patch Makefile generator and re-run it
rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.71-tinyxml2.patch
+ epatch "${FILESDIR}"/${PN}-1.72-tinyxml2.patch
tc-export CXX
emake dmake
./dmake || die
@@ -55,8 +55,7 @@ src_compile() {
export LIBS="$(pkg-config --libs tinyxml2)"
emake ${PN} man \
CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" \
- CXXFLAGS="${CXXFLAGS} -std=c++0x"
+ DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
if use qt4 ; then
pushd gui
diff --git a/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
new file mode 100644
index 0000000..478f1fe
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
@@ -0,0 +1,66 @@
+--- cppcheck-1.71/gui/gui.pro
++++ cppcheck-1.71/gui/gui.pro
+@@ -14,7 +14,7 @@
+ LIBS += -l../bin/cppcheck-core
+ DEFINES += CPPCHECKLIB_IMPORT
+ }
+-LIBS += -L$$PWD/../externals
++LIBS += `pkg-config --libs tinyxml2`
+
+ DESTDIR = .
+ RCC_DIR = temp
+--- cppcheck-1.72/tools/dmake.cpp
++++ cppcheck-1.72/tools/dmake.cpp
+@@ -174,7 +174,6 @@
+ }
+
+ std::vector<std::string> externalfiles;
+- getCppFiles(externalfiles, "externals/", true);
+
+
+ // QMAKE - lib/lib.pri
+@@ -183,8 +182,7 @@
+ if (fout1.is_open()) {
+ fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+ fout1 << "include($$PWD/pcrerules.pri)\n";
+- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
+- fout1 << "INCLUDEPATH += $$PWD $$PWD/../externals/tinyxml\n";
++ fout1 << "INCLUDEPATH += $$PWD\n";
+ fout1 << "HEADERS += $${PWD}/check.h \\\n";
+ for (unsigned int i = 0; i < libfiles.size(); ++i) {
+ std::string fname(libfiles[i].substr(4));
+@@ -210,7 +208,6 @@
+ std::ofstream fout1("test/testfiles.pri");
+ if (fout1.is_open()) {
+ fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
+- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
+ fout1 << "\n\nSOURCES += ";
+ for (unsigned int i = 0; i < testfiles.size(); ++i) {
+ const std::string filename(testfiles[i].substr(5));
+@@ -375,9 +372,9 @@
+ << "endif\n\n";
+
+ makeConditionalVariable(fout, "PREFIX", "/usr");
+- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
+- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
+- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
++ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
++ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
++ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
+
+ fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
+ fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
+@@ -418,10 +415,10 @@
+ fout << "\t$(CXX) $(CXXFLAGS) -o dmake tools/dmake.o cli/filelister.o cli/pathmatch.o lib/path.o -Ilib $(LDFLAGS)\n\n";
+ fout << "run-dmake: dmake\n";
+ fout << "\t./dmake\n\n";
+- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
+- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
++ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
++ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
+ fout << "clean:\n";
+- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
++ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+ fout << "man:\tman/cppcheck.1\n\n";
+ fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
+ fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2016-05-07 21:55 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2016-05-07 21:55 UTC (permalink / raw
To: gentoo-commits
commit: 115808d2e8efde4b9392365b52becc80a5b6f463
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 21:49:04 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat May 7 21:55:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=115808d2
dev-util/cppcheck: Drop old.
Package-Manager: portage-2.2.28
dev-util/cppcheck/Manifest | 3 -
dev-util/cppcheck/cppcheck-1.69-r1.ebuild | 106 ---------------------
dev-util/cppcheck/cppcheck-1.70.ebuild | 106 ---------------------
dev-util/cppcheck/cppcheck-1.71.ebuild | 106 ---------------------
dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch | 12 ---
.../cppcheck/files/cppcheck-1.69-tinyxml2.patch | 67 -------------
.../cppcheck/files/cppcheck-1.71-tinyxml2.patch | 67 -------------
7 files changed, 467 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index d17bc3f..5deca44 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,4 +1 @@
-DIST cppcheck-1.69.tar.bz2 1052984 SHA256 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e SHA512 30f239bcdf4cb1fcc254271bf55f3fdc1ec22e7d26f0704218390cfce1d4cf3ef41f385f4e463ede1a1a401e87d81b1d66a462c7b07e045d46aebd2354384a01 WHIRLPOOL e341c8b8f133fd19188700d53d6f02ab5deffc10fdfedbc9474931596850c10027a91e445998a3884f8f30908581e428fe4c629397b14660a0fe7b852e48b3a4
-DIST cppcheck-1.70.tar.bz2 1111291 SHA256 c6aaafd41b4c2050f3fb96a4aa159507007403a163d05361bd9544e5baf18f39 SHA512 c2223edce22739e555eca114bc39d8f66229ec26fb122c976e3dcf88957bfd6b37c170e183f22611ea2d17ac22b33da78440f820c044f6099ac901bd6c4f1b8d WHIRLPOOL 0b6c52d13ff8c9c8dfdf383e419edd311a484a89d695dbf9409f1ea608c1dc5bbc20fcb03bc0469495a35b61a43a90ccf1e76cd191cf28326f929020d66083b6
-DIST cppcheck-1.71.tar.bz2 1128689 SHA256 0114d29e5c49c8ff0030798f4fa02f9ef4c1d64d09697a3ea4b19aa5b67b4afe SHA512 ff56909ca566f9a48623822d78119930f0f55961a8011b0bce92178b25f82649847612157fa24f3b21f0aad6da81aa8387d08f7af4127df1d5a75b20ced67af9 WHIRLPOOL 2d1ff247c85354329bc645a8d74ae16119e6a246a282cb47e119a956d7d65bb4ea9fd3964a228b45a11cfa5efacc6fc8ae4602c29256f237c687d35da8c154c5
DIST cppcheck-1.72.tar.bz2 1125775 SHA256 9460b184ff2d8dd15344f3e2f42f634c86e4dd3303e1e9b3f13dc67536aab420 SHA512 13b2348c97a3777feaad579f8620f18d90f6f934f92f5db712c7190af1f40042527500aefa4c8ccd348f7691b1c0d5f32115085c9385dec55460d5ba0804a410 WHIRLPOOL 790514f4b5b9c539a30daa691d268c6c5f1077743cde1af8834248eb4213224275e9f72cea46f3b378119a3d0944d7e8d63270c0cd47517c7f382c683a1938fe
diff --git a/dev-util/cppcheck/cppcheck-1.69-r1.ebuild b/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
deleted file mode 100644
index d5d903e..0000000
--- a/dev-util/cppcheck/cppcheck-1.69-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- >=dev-libs/tinyxml2-2
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.69-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch "${FILESDIR}"/${PN}-1.69-c++0x.patch
-
- epatch_user
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
- doman ${PN}.1
- dodoc readme.txt
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/cppcheck-1.70.ebuild b/dev-util/cppcheck/cppcheck-1.70.ebuild
deleted file mode 100644
index 8ffd554..0000000
--- a/dev-util/cppcheck/cppcheck-1.70.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- >=dev-libs/tinyxml2-2
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.69-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch "${FILESDIR}"/${PN}-1.69-c++0x.patch
-
- epatch_user
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc readme_gui.txt gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
- doman ${PN}.1
- dodoc readme.txt
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/cppcheck-1.71.ebuild b/dev-util/cppcheck/cppcheck-1.71.ebuild
deleted file mode 100644
index fd66a88..0000000
--- a/dev-util/cppcheck/cppcheck-1.71.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit distutils-r1 eutils flag-o-matic qt4-r2 toolchain-funcs
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- >=dev-libs/tinyxml2-2
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- append-cxxflags -std=c++0x
-
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.71-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch_user
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl" \
- CXXFLAGS="${CXXFLAGS} -std=c++0x"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
- doman ${PN}.1
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch b/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch
deleted file mode 100644
index 8e9635c..0000000
--- a/dev-util/cppcheck/files/cppcheck-1.69-c++0x.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cppcheck-1.69/gui/gui.pro
-+++ cppcheck-1.69/gui/gui.pro
-@@ -146,9 +146,7 @@
- LIBS += -lshlwapi
- }
-
--contains(QMAKE_CC, gcc) {
- QMAKE_CXXFLAGS += -std=c++0x
--}
-
- macx {
- contains(QMAKE_CXX, clang++) {
diff --git a/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch
deleted file mode 100644
index 0b0c9f8..0000000
--- a/dev-util/cppcheck/files/cppcheck-1.69-tinyxml2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- cppcheck-1.69/gui/gui.pro
-+++ cppcheck-1.69/gui/gui.pro
-@@ -15,7 +15,7 @@ contains(LINKCORE, [yY][eE][sS]) {
- LIBS += -l../bin/cppcheck-core
- DEFINES += CPPCHECKLIB_IMPORT
- }
--LIBS += -L$$PWD/../externals
-+LIBS += `pkg-config --libs tinyxml2`
-
- DESTDIR = .
- RCC_DIR = temp
---- cppcheck-1.69/tools/dmake.cpp
-+++ cppcheck-1.69/tools/dmake.cpp
-@@ -171,7 +171,6 @@ int main(int argc, char **argv)
- }
-
- std::vector<std::string> externalfiles;
-- getCppFiles(externalfiles, "externals/", true);
-
-
- // QMAKE - lib/lib.pri
-@@ -180,10 +179,6 @@ int main(int argc, char **argv)
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
- fout1 << "include($$PWD/pcrerules.pri)\n";
-- fout1 << "BASEPATH = ../externals/tinyxml/\n";
-- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
-- fout1 << "BASEPATH = ../lib/\n";
-- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
- fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
- for (unsigned int i = 0; i < libfiles.size(); ++i) {
- std::string fname(libfiles[i].substr(4));
-@@ -209,7 +204,6 @@ int main(int argc, char **argv)
- std::ofstream fout1("test/testfiles.pri");
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
-- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
- fout1 << "\n\nSOURCES += ";
- for (unsigned int i = 0; i < testfiles.size(); ++i) {
- const std::string filename(testfiles[i].substr(5));
-@@ -357,9 +351,9 @@ int main(int argc, char **argv)
-
- makeConditionalVariable(fout, "CXX", "g++");
- makeConditionalVariable(fout, "PREFIX", "/usr");
-- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
-
- fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
- fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
-@@ -399,10 +393,10 @@ int main(int argc, char **argv)
- fout << "dmake:\ttools/dmake.o cli/filelister.o lib/path.o\n";
- fout << "\t$(CXX) $(CXXFLAGS) -std=c++0x -o dmake tools/dmake.o cli/filelister.o lib/path.o -Ilib $(LDFLAGS)\n";
- fout << "\t./dmake\n\n";
-- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
-- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
-+ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
-+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -std=c++0x -g -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
- fout << "clean:\n";
-- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
-+ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
- fout << "man:\tman/cppcheck.1\n\n";
- fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
- fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
diff --git a/dev-util/cppcheck/files/cppcheck-1.71-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.71-tinyxml2.patch
deleted file mode 100644
index 4b82c21..0000000
--- a/dev-util/cppcheck/files/cppcheck-1.71-tinyxml2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- cppcheck-1.71/gui/gui.pro
-+++ cppcheck-1.71/gui/gui.pro
-@@ -14,7 +14,7 @@
- LIBS += -l../bin/cppcheck-core
- DEFINES += CPPCHECKLIB_IMPORT
- }
--LIBS += -L$$PWD/../externals
-+LIBS += `pkg-config --libs tinyxml2`
-
- DESTDIR = .
- RCC_DIR = temp
---- cppcheck-1.71/tools/dmake.cpp
-+++ cppcheck-1.71/tools/dmake.cpp
-@@ -174,7 +174,6 @@
- }
-
- std::vector<std::string> externalfiles;
-- getCppFiles(externalfiles, "externals/", true);
-
-
- // QMAKE - lib/lib.pri
-@@ -183,10 +182,6 @@
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
- fout1 << "include($$PWD/pcrerules.pri)\n";
-- fout1 << "BASEPATH = ../externals/tinyxml/\n";
-- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
-- fout1 << "BASEPATH = ../lib/\n";
-- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
- fout1 << "HEADERS += $${BASEPATH}check.h \\\n";
- for (unsigned int i = 0; i < libfiles.size(); ++i) {
- std::string fname(libfiles[i].substr(4));
-@@ -212,7 +207,6 @@
- std::ofstream fout1("test/testfiles.pri");
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
-- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
- fout1 << "\n\nSOURCES += ";
- for (unsigned int i = 0; i < testfiles.size(); ++i) {
- const std::string filename(testfiles[i].substr(5));
-@@ -376,9 +370,9 @@
- << "endif\n\n";
-
- makeConditionalVariable(fout, "PREFIX", "/usr");
-- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
-
- fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
- fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
-@@ -419,10 +413,10 @@
- fout << "\t$(CXX) $(CXXFLAGS) -o dmake tools/dmake.o cli/filelister.o cli/pathmatch.o lib/path.o -Ilib $(LDFLAGS)\n\n";
- fout << "run-dmake: dmake\n";
- fout << "\t./dmake\n\n";
-- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
-- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
-+ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
-+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
- fout << "clean:\n";
-- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
-+ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
- fout << "man:\tman/cppcheck.1\n\n";
- fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
- fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2016-08-22 17:30 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2016-08-22 17:30 UTC (permalink / raw
To: gentoo-commits
commit: a4b543a3b8a232ecfe56977eaa894db4e3b216d2
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 22 17:28:46 2016 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Aug 22 17:30:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b543a3
dev-util/cppcheck: Version bump (thanks Christian Strahl, bug 591018).
Package-Manager: portage-2.2.28
dev-util/cppcheck/Manifest | 1 +
dev-util/cppcheck/{cppcheck-9999.ebuild => cppcheck-1.75.ebuild} | 8 ++++----
dev-util/cppcheck/cppcheck-9999.ebuild | 2 +-
...{cppcheck-9999-tinyxml2.patch => cppcheck-1.75-tinyxml2.patch} | 0
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 1c94c4e..95505df 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,3 +1,4 @@
DIST cppcheck-1.72.tar.bz2 1125775 SHA256 9460b184ff2d8dd15344f3e2f42f634c86e4dd3303e1e9b3f13dc67536aab420 SHA512 13b2348c97a3777feaad579f8620f18d90f6f934f92f5db712c7190af1f40042527500aefa4c8ccd348f7691b1c0d5f32115085c9385dec55460d5ba0804a410 WHIRLPOOL 790514f4b5b9c539a30daa691d268c6c5f1077743cde1af8834248eb4213224275e9f72cea46f3b378119a3d0944d7e8d63270c0cd47517c7f382c683a1938fe
DIST cppcheck-1.73.tar.bz2 1147270 SHA256 36f68354734310203c285fac17aed47bb82131fc0487145b9c0386301cd5fe50 SHA512 a703cb47016982c27509bd46fa601b5baf359b0c44be188e2f5fe7d64b2accc392af5aa803a5e298b778f15b979585781ecd1459c8d2dd8b033f34cb1bad15a7 WHIRLPOOL 1ecbcd36f3ed36c0db3a9e6c99b730c164c5e4a680dfa1f6b3a84df5a9e4e7ca0ab902d34306dcaf12c9ffd686fbac4492f07b12b99d862d9152db6ffeac377c
DIST cppcheck-1.74.tar.bz2 1151321 SHA256 c05b2f7e4619326f4cbdf6465d517cd0e37349e1221356470d75a97ca35fc254 SHA512 aa77747618ae16d796c428dc5931dc39bb51774dcdbea740c5cfc0f353c3b825c9673c84d0f2196cb8749f54c66f2d358f45b372aa5db9b057d3de740d852f01 WHIRLPOOL 07aa11a0e5478ea9c7eafa79359259d3570424d3a7dfd0ad2d623a69157d09fbdb2f72ce576d19db142d67a69b2b0663b7e37d42d2ea5781401eb6723123dd1b
+DIST cppcheck-1.75.tar.bz2 1152511 SHA256 57c70043c1330ed915cbd1a17ecc5408f2637a05062970508e990b1ba28760a0 SHA512 74116a7a2cd1c8c9a06c81f3f4de3de281f24ee30692729de5506dc7572ed694e55c32d1ad72196a9b95005e9f8d749bd82655323f8ff56051997c2ffc4ed57f WHIRLPOOL a42979e35041d382b1df755b0cdfb4c51951388d2b097856fa08b3ca6b39bdd99a13809a8b514b1fc0502ac0183a08e0f1ed742100e38a14ee2f7337ddda1f01
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-1.75.ebuild
similarity index 91%
copy from dev-util/cppcheck/cppcheck-9999.ebuild
copy to dev-util/cppcheck/cppcheck-1.75.ebuild
index 937cc7f..dfd60d7 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.75.ebuild
@@ -6,15 +6,15 @@ EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic git-r3
+inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
DESCRIPTION="static analyzer of C/C++ code"
HOMEPAGE="http://cppcheck.sourceforge.net"
-EGIT_REPO_URI="git://github.com/danmar/cppcheck.git"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="htmlreport pcre qt4"
RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
@@ -31,7 +31,7 @@ src_prepare() {
# Drop bundled libs, patch Makefile generator and re-run it
rm -r externals/tinyxml || die
- epatch "${FILESDIR}"/${PN}-9999-tinyxml2.patch
+ epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
tc-export CXX
emake dmake
./dmake || die
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 937cc7f..2c2c287 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
# Drop bundled libs, patch Makefile generator and re-run it
rm -r externals/tinyxml || die
- epatch "${FILESDIR}"/${PN}-9999-tinyxml2.patch
+ epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
tc-export CXX
emake dmake
./dmake || die
diff --git a/dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
similarity index 100%
rename from dev-util/cppcheck/files/cppcheck-9999-tinyxml2.patch
rename to dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2017-04-17 22:34 Michael Weber
0 siblings, 0 replies; 9+ messages in thread
From: Michael Weber @ 2017-04-17 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 77f63475d8ab174a29107809ac1be1203717333c
Author: Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 22:34:02 2017 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 22:34:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77f63475
dev-util/cppcheck: Remove old versions.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-util/cppcheck/Manifest | 2 -
dev-util/cppcheck/cppcheck-1.72.ebuild | 105 ---------------------
dev-util/cppcheck/cppcheck-1.75.ebuild | 104 --------------------
.../cppcheck/files/cppcheck-1.72-tinyxml2.patch | 66 -------------
4 files changed, 277 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 3d83dd57558..32c7ec74e29 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,4 +1,2 @@
-DIST cppcheck-1.72.tar.bz2 1125775 SHA256 9460b184ff2d8dd15344f3e2f42f634c86e4dd3303e1e9b3f13dc67536aab420 SHA512 13b2348c97a3777feaad579f8620f18d90f6f934f92f5db712c7190af1f40042527500aefa4c8ccd348f7691b1c0d5f32115085c9385dec55460d5ba0804a410 WHIRLPOOL 790514f4b5b9c539a30daa691d268c6c5f1077743cde1af8834248eb4213224275e9f72cea46f3b378119a3d0944d7e8d63270c0cd47517c7f382c683a1938fe
-DIST cppcheck-1.75.tar.bz2 1152511 SHA256 57c70043c1330ed915cbd1a17ecc5408f2637a05062970508e990b1ba28760a0 SHA512 74116a7a2cd1c8c9a06c81f3f4de3de281f24ee30692729de5506dc7572ed694e55c32d1ad72196a9b95005e9f8d749bd82655323f8ff56051997c2ffc4ed57f WHIRLPOOL a42979e35041d382b1df755b0cdfb4c51951388d2b097856fa08b3ca6b39bdd99a13809a8b514b1fc0502ac0183a08e0f1ed742100e38a14ee2f7337ddda1f01
DIST cppcheck-1.77.tar.bz2 1188453 SHA256 1980ffe5c9c24bb6dea24514d42be3aa49d6ba7cc26c448b3543611fe8ba2619 SHA512 df8dddf7758c342d45b3393246e07eaa11a53dca19e8a0d09de04f12ea6232538941328d9ca9ac52eb425871fd1c49d55c77e6e38b40772b6f856fd1e9e99779 WHIRLPOOL 9f7842eba0f53a999993dbd23d09c10e5bd3dcca5ecbb0689e4ded8c7529d84fd939a57ce9cd267cdd21b2d79aeb6c07d672983ccb52be0fcc0b28ca80a31b59
DIST cppcheck-1.78.tar.bz2 1201959 SHA256 e42696f7d6321b98cb479ad9728d051effe543b26aca8102428f60b9850786b1 SHA512 598556e9d657a3a77ff889cb6647291160017f7f9322326771416ff59d44126ce47c39767657b863cdb8a1b46d7c83bb337ec2fe0574500b37e99c33377b5dd8 WHIRLPOOL 2087ad837353d01bca828af940c427909a3e556e97e46d1822e0f2f527619c87b15d1a7f647992dd46eb3a2ef1eb4fb86344db31d7a01fb6f8a9070dfeecef96
diff --git a/dev-util/cppcheck/cppcheck-1.72.ebuild b/dev-util/cppcheck/cppcheck-1.72.ebuild
deleted file mode 100644
index 0f4dcbf95d9..00000000000
--- a/dev-util/cppcheck/cppcheck-1.72.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- >=dev-libs/tinyxml2-2
- <dev-libs/tinyxml2-4
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- append-cxxflags -std=c++0x
-
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals || die
- epatch "${FILESDIR}"/${PN}-1.72-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch_user
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
- doman ${PN}.1
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/cppcheck-1.75.ebuild b/dev-util/cppcheck/cppcheck-1.75.ebuild
deleted file mode 100644
index ab82e77f822..00000000000
--- a/dev-util/cppcheck/cppcheck-1.75.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1 eutils qt4-r2 toolchain-funcs flag-o-matic
-
-DESCRIPTION="static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="htmlreport pcre qt4"
-
-RDEPEND="htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- >=dev-libs/tinyxml2-2
- qt4? ( dev-qt/qtgui:4 )
- pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig"
-
-src_prepare() {
- append-cxxflags -std=c++0x
-
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals/tinyxml || die
- epatch "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
- tc-export CXX
- emake dmake
- ./dmake || die
-
- epatch_user
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile
- fi
- if use qt4 ; then
- pushd gui
- qt4-r2_src_configure
- popd
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt4 ; then
- pushd gui
- qt4-r2_src_compile
- popd
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_compile
- popd
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final}
- mv -v lib/library.o{,.final}
- mv -v cli/cppcheckexecutor.o{,.final}
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,}
- mv -v lib/library.o{.final,}
- mv -v cli/cppcheckexecutor.o{.final,}
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt4 ; then
- dobin gui/${PN}-gui
- dodoc gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport
- distutils-r1_src_install
- popd
- find "${D}" -name "*.egg-info" -delete
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
- doman ${PN}.1
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
deleted file mode 100644
index 478f1feed16..00000000000
--- a/dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- cppcheck-1.71/gui/gui.pro
-+++ cppcheck-1.71/gui/gui.pro
-@@ -14,7 +14,7 @@
- LIBS += -l../bin/cppcheck-core
- DEFINES += CPPCHECKLIB_IMPORT
- }
--LIBS += -L$$PWD/../externals
-+LIBS += `pkg-config --libs tinyxml2`
-
- DESTDIR = .
- RCC_DIR = temp
---- cppcheck-1.72/tools/dmake.cpp
-+++ cppcheck-1.72/tools/dmake.cpp
-@@ -174,7 +174,6 @@
- }
-
- std::vector<std::string> externalfiles;
-- getCppFiles(externalfiles, "externals/", true);
-
-
- // QMAKE - lib/lib.pri
-@@ -183,8 +182,7 @@
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
- fout1 << "include($$PWD/pcrerules.pri)\n";
-- fout1 << "include($$PWD/../externals/tinyxml/tinyxml.pri)\n";
-- fout1 << "INCLUDEPATH += $$PWD $$PWD/../externals/tinyxml\n";
-+ fout1 << "INCLUDEPATH += $$PWD\n";
- fout1 << "HEADERS += $${PWD}/check.h \\\n";
- for (unsigned int i = 0; i < libfiles.size(); ++i) {
- std::string fname(libfiles[i].substr(4));
-@@ -210,7 +208,6 @@
- std::ofstream fout1("test/testfiles.pri");
- if (fout1.is_open()) {
- fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
-- fout1 << "INCLUDEPATH += ../externals/tinyxml\n";
- fout1 << "\n\nSOURCES += ";
- for (unsigned int i = 0; i < testfiles.size(); ++i) {
- const std::string filename(testfiles[i].substr(5));
-@@ -375,9 +372,9 @@
- << "endif\n\n";
-
- makeConditionalVariable(fout, "PREFIX", "/usr");
-- makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib -Iexternals/tinyxml");
-- makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli -Iexternals/tinyxml");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_LIB", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_CLI", "-Ilib");
-+ makeConditionalVariable(fout, "INCLUDE_FOR_TEST", "-Ilib -Icli");
-
- fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
- fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
-@@ -418,10 +415,10 @@
- fout << "\t$(CXX) $(CXXFLAGS) -o dmake tools/dmake.o cli/filelister.o cli/pathmatch.o lib/path.o -Ilib $(LDFLAGS)\n\n";
- fout << "run-dmake: dmake\n";
- fout << "\t./dmake\n\n";
-- fout << "reduce:\ttools/reduce.o externals/tinyxml/tinyxml2.o $(LIBOBJ)\n";
-- fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -g -o reduce tools/reduce.o -Ilib -Iexternals/tinyxml $(LIBOBJ) $(LIBS) externals/tinyxml/tinyxml2.o $(LDFLAGS) $(RDYNAMIC)\n\n";
-+ fout << "reduce:\ttools/reduce.o $(LIBOBJ)\n";
-+ fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o reduce tools/reduce.o -Ilib $(LIBOBJ) $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
- fout << "clean:\n";
-- fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/tinyxml/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
-+ fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
- fout << "man:\tman/cppcheck.1\n\n";
- fout << "man/cppcheck.1:\t$(MAN_SOURCE)\n\n";
- fout << "\t$(XP) $(DB2MAN) $(MAN_SOURCE)\n\n";
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2018-12-21 15:33 Jeroen Roovers
0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers @ 2018-12-21 15:33 UTC (permalink / raw
To: gentoo-commits
commit: 455491c71c0539e28fdf3b0270ff7c149ba3ae09
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 15:33:29 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 15:33:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=455491c7
dev-util/cppcheck: Old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
dev-util/cppcheck/Manifest | 1 -
dev-util/cppcheck/cppcheck-1.84-r1.ebuild | 110 ---------------------
dev-util/cppcheck/cppcheck-1.84.ebuild | 107 --------------------
.../files/cppcheck-1.84-char-signedness.patch | 88 -----------------
4 files changed, 306 deletions(-)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 6bde7d45d7a..ea5ae23f704 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,4 +1,3 @@
DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
-DIST cppcheck-1.84.tar.gz 2051244 BLAKE2B 8e4b4c71da969addec6d1cb2919c39625054797ae730c85555695e872f87295c20e4564db2eadf536a762ca018882285d5d329f9a5789608e14ef17f1069753d SHA512 7f971f9097db6d2fee7483634afc697bddff499a7b09c4be0bfdc3f8e502d47202a8d4f4fc1a330d0fb1d34a7772065b96419b4b4f4f1467b997e62459304526
DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B 73a1d4e1fb0770103c8163f35b9e710a5863561df66e46e319b9246ed14e3c5d4d73511db6e70275de4f4510866d7e1888b0fd6b49e5b01fc4f08d081119b36c SHA512 cc984c751d87150839782e96b3762dbf918d9e3687562eabaff6473e48e3254995dd3bffe8605842f867d7ad76845ca2248a53bbd54b5c367281db8a1c1c7fad
DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
diff --git a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild b/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
deleted file mode 100644
index 82a4ecbe4b9..00000000000
--- a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
- dev-libs/tinyxml2:=
- htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- pcre? ( dev-libs/libpcre )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.75-tinyxml2.patch
- "${FILESDIR}"/${PN}-1.84-char-signedness.patch
-)
-
-src_prepare() {
- default
- append-cxxflags -std=c++0x
-
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals/tinyxml || die
- tc-export CXX
- emake dmake
- ./dmake || die
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile || die
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt5 ; then
- pushd gui || die
- eqmake5
- emake
- popd || die
- fi
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_compile
- popd || die
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final} || die
- mv -v lib/library.o{,.final} || die
- mv -v cli/cppcheckexecutor.o{,.final} || die
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,} || die
- mv -v lib/library.o{.final,} || die
- mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt5 ; then
- dobin gui/${PN}-gui
- dodoc gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_install
- popd || die
- find "${D}" -name "*.egg-info" -delete
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
- doman ${PN}.1
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/cppcheck-1.84.ebuild b/dev-util/cppcheck/cppcheck-1.84.ebuild
deleted file mode 100644
index 2fb1dddad4b..00000000000
--- a/dev-util/cppcheck/cppcheck-1.84.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Static analyzer of C/C++ code"
-HOMEPAGE="http://cppcheck.sourceforge.net"
-SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE="htmlreport pcre qt5"
-
-RDEPEND="
- dev-libs/tinyxml2:=
- htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
- pcre? ( dev-libs/libpcre )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtprintsupport:5
- )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
-
-src_prepare() {
- default
- append-cxxflags -std=c++0x
-
- # Drop bundled libs, patch Makefile generator and re-run it
- rm -r externals/tinyxml || die
- tc-export CXX
- emake dmake
- ./dmake || die
-}
-
-src_configure() {
- if use pcre ; then
- sed -e '/HAVE_RULES=/s:=no:=yes:' \
- -i Makefile || die
- fi
-}
-
-src_compile() {
- export LIBS="$(pkg-config --libs tinyxml2)"
- emake ${PN} man \
- CFGDIR="${EROOT}usr/share/${PN}/cfg" \
- DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
-
- if use qt5 ; then
- pushd gui || die
- eqmake5
- emake
- popd || die
- fi
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_compile
- popd || die
- fi
-}
-
-src_test() {
- # safe final version
- mv -v ${PN}{,.final} || die
- mv -v lib/library.o{,.final} || die
- mv -v cli/cppcheckexecutor.o{,.final} || die
- #trigger recompile with CFGDIR inside ${S}
- emake check CFGDIR="${S}/cfg"
- # restore
- mv -v ${PN}{.final,} || die
- mv -v lib/library.o{.final,} || die
- mv -v cli/cppcheckexecutor.o{.final,} || die
-}
-
-src_install() {
- # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
- emake install DESTDIR="${ED}"
-
- insinto "/usr/share/${PN}/cfg"
- doins cfg/*.cfg
- if use qt5 ; then
- dobin gui/${PN}-gui
- dodoc gui/{projectfile.txt,gui.${PN}}
- fi
- if use htmlreport ; then
- pushd htmlreport || die
- distutils-r1_src_install
- popd || die
- find "${D}" -name "*.egg-info" -delete
- else
- rm "${ED}/usr/bin/cppcheck-htmlreport" || die
- fi
- doman ${PN}.1
- dodoc -r triage
-}
diff --git a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
deleted file mode 100644
index ee1b136c9a9..00000000000
--- a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 320a957bbc912325363cf86b61108db860195ec3 Mon Sep 17 00:00:00 2001
-From: Alexander Mai <amai@users.sf.net>
-Date: Thu, 28 Jun 2018 22:16:18 +0200
-Subject: [PATCH] Extend TestSymbolDatabase::findFunction19 to outline
- different results depending whether char is signed or unsigned on compile
- time
-
----
- test/testsymboldatabase.cpp | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
-index 0dafd2730..28473e8e9 100644
---- a/test/testsymboldatabase.cpp
-+++ b/test/testsymboldatabase.cpp
-@@ -26,6 +26,7 @@
- #include "tokenlist.h"
- #include "utils.h"
-
-+#include <climits>
- #include <cstddef>
- #include <list>
- #include <map>
-@@ -5065,6 +5066,7 @@ private:
- " long get(long x) { return x; }\n"
- " long long get(long long x) { return x; }\n"
- " unsigned char get(unsigned char x) { return x; }\n"
-+ " signed char get(signed char x) { return x; }\n"
- " unsigned short get(unsigned short x) { return x; }\n"
- " unsigned int get(unsigned int x) { return x; }\n"
- " unsigned long get(unsigned long x) { return x; }\n"
-@@ -5079,12 +5081,13 @@ private:
- " long v5 = 1; v5 = get(get(v5));\n"
- " long long v6 = 1; v6 = get(get(v6));\n"
- " unsigned char v7 = '1'; v7 = get(get(v7));\n"
-- " unsigned short v8 = 1; v8 = get(get(v8));\n"
-- " unsigned int v9 = 1; v9 = get(get(v9));\n"
-- " unsigned long v10 = 1; v10 = get(get(v10));\n"
-- " unsigned long long v11 = 1; v11 = get(get(v11));\n"
-- " E1 v12 = e1; v12 = get(get(v12));\n"
-- " E2 v13 = E2::e2; v13 = get(get(v13));\n"
-+ " signed char v8 = '1'; v8 = get(get(v8));\n"
-+ " unsigned short v9 = 1; v9 = get(get(v9));\n"
-+ " unsigned int v10 = 1; v10 = get(get(v10));\n"
-+ " unsigned long v11 = 1; v11 = get(get(v11));\n"
-+ " unsigned long long v12 = 1; v12 = get(get(v12));\n"
-+ " E1 v13 = e1; v13 = get(get(v13));\n"
-+ " E2 v14 = E2::e2; v14 = get(get(v14));\n"
- " }\n"
- "};");
-
-@@ -5094,7 +5097,10 @@ private:
- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 4);
-
- f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v2 ) ) ;");
-- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+ if (std::numeric_limits<char>::is_signed)
-+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+ else
-+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
-
- f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v3 ) ) ;");
- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 6);
-@@ -5112,7 +5118,10 @@ private:
- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
-
- f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v8 ) ) ;");
-- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 11);
-+ if (std::numeric_limits<char>::is_signed)
-+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+ else
-+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
-
- f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v9 ) ) ;");
- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 12);
-@@ -5128,6 +5137,9 @@ private:
-
- f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v13 ) ) ;");
- ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 16);
-+
-+ f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v14 ) ) ;");
-+ ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 17);
- }
-
- void findFunction20() { // # 8280
---
-2.16.4
-
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2021-05-31 4:03 Matthias Maier
0 siblings, 0 replies; 9+ messages in thread
From: Matthias Maier @ 2021-05-31 4:03 UTC (permalink / raw
To: gentoo-commits
commit: cd42cd0ed94bf92cf0719487596755402cc6c32a
Author: Luke Peterson <hazelnusse <AT> gmail <DOT> com>
AuthorDate: Tue May 18 18:10:25 2021 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon May 31 03:59:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd42cd0e
dev-util/cppcheck: Add version 2.4.1
Closes: https://bugs.gentoo.org/786633
Closes: https://github.com/gentoo/gentoo/pull/20874
Signed-off-by: Dale Lukas Peterson <hazelnusse <AT> gmail.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
dev-util/cppcheck/Manifest | 1 +
dev-util/cppcheck/cppcheck-2.4.1.ebuild | 84 ++++++++++++++++++++++
.../cppcheck/files/cppcheck-2.4.1-limits.patch | 12 ++++
3 files changed, 97 insertions(+)
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 51d80e257e3..c78e131f430 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,2 +1,3 @@
DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
DIST cppcheck-2.2.tar.gz 3561406 BLAKE2B e436de4bec5412a18f013c8557a966c28c14edcd07fbb80eb53a897848d15f32afc180798ea1a074742f896b15d4020755c104b87dc8f82252121b58a92b92dc SHA512 d766187a69d6aa839e072e3c0ed44009621ca8492504257288ca2f49774f705a1ebcf2957f0801ac6eab2ffbdd845e9237f1213f85c6d0fcdbf16b1e7c690327
+DIST cppcheck-2.4.1.tar.gz 3761646 BLAKE2B 4c791088621f989e2529c92de38a73676fc3394e8cac72822596f7a75594283d0983693d693aa903a3ffb80bc0e1e20e71b55db5682d4d01c135ed77b2fc2e3c SHA512 8fb1ed5faa0071fc69405b7eb5b41e9f94b77d097158ea0d4f5e4da8a5087b9d1ab7bf37f8dc73d00096d3d2494aeb431af8029f0d4f1e2085f5b9b72bdc2d09
diff --git a/dev-util/cppcheck/cppcheck-2.4.1.ebuild b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
new file mode 100644
index 00000000000..8ee6ca9778e
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-2.4.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+inherit distutils-r1 toolchain-funcs cmake
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="https://github.com/danmar/cppcheck"
+SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="htmlreport pcre qt5 +z3"
+
+RDEPEND="
+ htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+ pcre? ( dev-libs/libpcre )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp
+ dev-qt/qtprintsupport:5
+ )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+ z3? ( sci-mathematics/z3 )
+"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.1-limits.patch
+)
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+
+ local mycmakeargs=(
+ -DHAVE_RULES="$(usex pcre)"
+ -DBUILD_GUI="$(usex qt5)"
+ -DUSE_Z3="$(usex z3)"
+ -DFILESDIR="${EROOT}/usr/share/${PN}/"
+ -DENABLE_OSS_FUZZ=OFF
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use htmlreport ; then
+ pushd htmlreport || die
+ distutils-r1_src_compile
+ popd || die
+ fi
+}
+
+src_install() {
+ # it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+ emake install DESTDIR="${ED}" \
+ FILESDIR="${EROOT}/usr/share/${PN}/"
+
+ insinto "/usr/share/${PN}/cfg"
+ doins cfg/*.cfg
+ if use qt5 ; then
+ dobin "${WORKDIR}/${P}_build/bin/${PN}-gui"
+ dodoc gui/{projectfile.txt,gui.${PN}}
+ fi
+ if use htmlreport ; then
+ pushd htmlreport || die
+ distutils-r1_src_install
+ popd || die
+ find "${D}" -name "*.egg-info" -delete
+ else
+ rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+ fi
+
+ dodoc -r tools/triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch b/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch
new file mode 100644
index 00000000000..8b8db9cb8a4
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-2.4.1-limits.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
+index d59789236..3604d517f 100644
+--- a/lib/symboldatabase.cpp
++++ b/lib/symboldatabase.cpp
+@@ -35,6 +35,7 @@
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
++#include <limits>
+ #include <iomanip>
+ #include <iostream>
+ #include <unordered_map>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/
@ 2024-07-15 4:35 Sam James
0 siblings, 0 replies; 9+ messages in thread
From: Sam James @ 2024-07-15 4:35 UTC (permalink / raw
To: gentoo-commits
commit: 68f0e9969e5761d580346c0788186dcf471e5a0c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 04:34:19 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 04:34:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f0e996
dev-util/cppcheck: backport 32-bit test(-only) fix
Bug: https://bugs.gentoo.org/935368
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/cppcheck/cppcheck-2.13.0.ebuild | 4 ++++
.../files/cppcheck-2.13.0-32-bit-tests.patch | 28 ++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/dev-util/cppcheck/cppcheck-2.13.0.ebuild b/dev-util/cppcheck/cppcheck-2.13.0.ebuild
index 71c678e92cc5..949840795040 100644
--- a/dev-util/cppcheck/cppcheck-2.13.0.ebuild
+++ b/dev-util/cppcheck/cppcheck-2.13.0.ebuild
@@ -75,6 +75,10 @@ BDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.13.0-32-bit-tests.patch
+)
+
src_prepare() {
cmake_src_prepare
diff --git a/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch b/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch
new file mode 100644
index 000000000000..a31a014f5968
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/935368
+https://github.com/danmar/cppcheck/commit/9118d330d387e73a20e1bc46c65387306afa0895
+
+From 9118d330d387e73a20e1bc46c65387306afa0895 Mon Sep 17 00:00:00 2001
+From: chrchr-github <78114321+chrchr-github@users.noreply.github.com>
+Date: Sat, 23 Dec 2023 20:59:59 +0100
+Subject: [PATCH] Fix test failure on 32bit platform (#5803)
+
+--- a/test/testother.cpp
++++ b/test/testother.cpp
+@@ -2173,6 +2173,7 @@ class TestOther : public TestFixture {
+ "}\n");
+ ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 't' should be passed by const reference.\n", errout.str());
+
++ Settings settings0 = settingsBuilder(_settings).platform(Platform::Type::Unix64).build();
+ check("struct S {\n" // #12138
+ " union {\n"
+ " int a = 0;\n"
+@@ -2189,7 +2190,7 @@ class TestOther : public TestFixture {
+ "};\n"
+ "void f(S s) {\n"
+ " if (s.x > s.y) {}\n"
+- "}\n");
++ "}\n", /*filename*/ nullptr, /*inconclusive*/ true, /*runSimpleChecks*/ true, /*verbose*/ false, &settings0);
+ ASSERT_EQUALS("", errout.str());
+
+ check("struct S { std::list<int> l; };\n" // #12147
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-07-15 4:35 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-15 4:35 [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-05-31 4:03 Matthias Maier
2018-12-21 15:33 Jeroen Roovers
2017-04-17 22:34 Michael Weber
2016-08-22 17:30 Michael Weber
2016-05-07 21:55 Michael Weber
2016-01-14 22:25 Michael Weber
2016-01-09 2:06 Michael Weber
2015-09-15 15:16 Michael Weber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox