From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 575FA1388BF for ; Thu, 14 Jan 2016 22:25:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BBBFE07A7; Thu, 14 Jan 2016 22:25:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B32F4E07A7 for ; Thu, 14 Jan 2016 22:25:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94108340B55 for ; Thu, 14 Jan 2016 22:25:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15C39A16 for ; Thu, 14 Jan 2016 22:25:19 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1452810308.0889a829da8c60581beeb304f91a028363ecdbc2.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cppcheck/, dev-util/cppcheck/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cppcheck/Manifest dev-util/cppcheck/cppcheck-1.69-r1.ebuild dev-util/cppcheck/cppcheck-1.70.ebuild dev-util/cppcheck/cppcheck-1.71.ebuild dev-util/cppcheck/cppcheck-1.72.ebuild dev-util/cppcheck/files/cppcheck-1.72-tinyxml2.patch X-VCS-Directories: dev-util/cppcheck/files/ dev-util/cppcheck/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 0889a829da8c60581beeb304f91a028363ecdbc2 X-VCS-Branch: master Date: Thu, 14 Jan 2016 22:25:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4aa4b34e-de03-4e68-bffd-b20b87c9af16 X-Archives-Hash: 773f4d39a252d4bdea44c6c4ea1f4e88 commit: 0889a829da8c60581beeb304f91a028363ecdbc2 Author: Michael Weber gentoo org> AuthorDate: Thu Jan 14 22:23:00 2016 +0000 Commit: Michael Weber gentoo 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 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";