diff options
Diffstat (limited to 'dev-util/cppcheck')
| -rw-r--r-- | dev-util/cppcheck/Manifest | 9 | ||||
| -rw-r--r-- | dev-util/cppcheck/cppcheck-2.13.0.ebuild | 10 | ||||
| -rw-r--r-- | dev-util/cppcheck/cppcheck-2.14.2.ebuild | 152 | ||||
| -rw-r--r-- | dev-util/cppcheck/cppcheck-2.9.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/cppcheck/files/cppcheck-2.13.0-32-bit-tests.patch | 28 | ||||
| -rw-r--r-- | dev-util/cppcheck/metadata.xml | 5 |
6 files changed, 196 insertions, 12 deletions
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest index 9648c5b3307b..e3c40dbe6438 100644 --- a/dev-util/cppcheck/Manifest +++ b/dev-util/cppcheck/Manifest @@ -1,5 +1,8 @@ +AUX cppcheck-2.13.0-32-bit-tests.patch 1241 BLAKE2B 8af4df092aa481b380e161b1d45f25000fb001e2d5172cbaa3a0ffe3257e811e495d446e8418d97e809011d067d03efacca9e1ee9c264ee45a56b0ade50e1340 SHA512 e916ff0bb845332626711447eb0af33927d26bc92f55ab9b378377e84a0ac3ddc504555f5862b97caa555f1a99bf2469610641bd9f7a5e268543fc649b1481fc DIST cppcheck-2.13.0.tar.gz 3643744 BLAKE2B 942391bdc2ad009e1bf9f691835c268b33ae0a7c84ff68a1ea7985abbc65fc7ea6e319111ed6a968f4f93f3b682ce46447ba1e3b1fccd96535497f3fd190b913 SHA512 35f266cd247860aa0a0d84862faf4561f4efea096e641a01ebc3b1e4cea14c91c75773344da5bd3d48101c11ee7841b46f24419a9583e65bd242d0219a1ca418 +DIST cppcheck-2.14.2.tar.gz 3723248 BLAKE2B 551c783e13202f496b705602566799848b611bcc706f7a803c9ff530b3405db9e0b5294d2ce51ef5a4889e08c5b9d54c15d40a7ec6f4dc59333a7b6ed24b1f02 SHA512 8e90fa87845a083a4de66ec86edf707184a2293eb346fd79bfcafb73f93db049216472fcb2ab802ce529680f9708261ba3c26675c6fd9637e1dc83903bc44c4b DIST cppcheck-2.9.tar.gz 3916529 BLAKE2B 5d75328e1fcd389376630502ad7427d3473392a9467e8731e6cd7c2c6349efccc05eddd7eca4cb361930661d2383a8d316e33bd3609b9333a710153d199e326d SHA512 69204a7ceac087470201482894e6422b99d0849f08641e80b2e341c9d164a1d2095e3a08a1fba2e9fa681783d07fe7277b30ea0cc0bf582431b5d13ab2f58c1f -EBUILD cppcheck-2.13.0.ebuild 3119 BLAKE2B ad03c294e91bf4aff0d089401beb11cdaf8e90aa669bce868d20a5917f2454ab4d4740e48add9873dacf709b00e9944f37f5c9659e1c138df22406d052a14f55 SHA512 b76f6e93d312833f5f6d6cae27ba550c30f7e457dd67231d49ede366465701f3b2dcd7e01f3c4f7916ccd816600b569834d0cd9d31b5be0a2ad387f8a38f455b -EBUILD cppcheck-2.9.ebuild 2380 BLAKE2B cc7c03d3ce356b915dfd51c2db4a60b58bc527b42de98216e8d1e0ef9dfd2baac697d4f6375c7f55f4bbf0fd2759ca0ff7f396294a5597de032ae5955da46d8f SHA512 89433207c2fae3f869d0594bc5c96a23245acb1dc4e8574b3299fa329af0286f5c6c5aa9beb9e988190ce2590226dfb7a955546effe0e9019abeaff70409fb60 -MISC metadata.xml 519 BLAKE2B 8f520238cfead1bbf8f534fcfb733805de6c657379d6eb02e5e823d5cdb4716fa5fd2b3aae63009601d06e79f82519c159c86d234e59f0966568ceb3ad58f5fb SHA512 d4472b2285c72f3fb891678374c73f0204556d247ac56489484739b4cfaece956974189653feb81d58d8418cb9563378ce3f040d093238f1a2dd27216c8a361c +EBUILD cppcheck-2.13.0.ebuild 3174 BLAKE2B 8809bee9b0fcebb6e56de883dcd1db2102ddd50789d1992445416eaf76d22a0dbb5c8583e32b5e88cef51425c9769b11b7a69399e8b8bfbb1a3c33a2a2caa342 SHA512 d0ec553281ddcdca9d2750fe2d786f87336847ab4dcbd31f259a98d4014163e85a2ed145a85b2795362f8ce8d1dea9510aaf5eae51c5d201f778fcd77bd71757 +EBUILD cppcheck-2.14.2.ebuild 3078 BLAKE2B 53e0031e13fb36b22cc1d4052157207fa3694745009c4c67baeb6859ed9ff012c641224a813f406a339745c90fef0167fc07234754f8495a7df89c888037ab94 SHA512 f80ae436fa324556ada875032705e5ac53cc4a6fe8ae27eb0d547f0980f2022e0af4b65358be0bfd76b38ad5a2fbb466d89f64b6a0539beaf136c7437dc64fd8 +EBUILD cppcheck-2.9.ebuild 2369 BLAKE2B 909101f8491d35342282c8334e7a3e31fc8a13dd30ad8a46acbe469b2735842c7856c444bfb47950f15f62e353be9e724ba08eeec039ab58713d3832d161c83d SHA512 71152b0282b8628b4ba25110c90072b09d75c9828408688af0d025ebe111de0a28e29659bb6d95e5982badff5de5501bab1d4263635ccee9763e11a1c73889f0 +MISC metadata.xml 439 BLAKE2B 2fae88ef8445fcf382e68d615e7f9c4b41ce119785b9d3a8a3685297270043da641c8e454e40de2507f6e17a91846488e4dcb1a72e09e241287fb06cc531ae82 SHA512 64084c96f491b6f966d9b20409ec43a530280c01e29c2c531a43bb40d62263c7fb9e1c55079cddfe2eb437ffa6ca431a9dce758a5932c549bd8cb5850a8769c8 diff --git a/dev-util/cppcheck/cppcheck-2.13.0.ebuild b/dev-util/cppcheck/cppcheck-2.13.0.ebuild index 2499d53d7a92..447003eceefe 100644 --- a/dev-util/cppcheck/cppcheck-2.13.0.ebuild +++ b/dev-util/cppcheck/cppcheck-2.13.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${ LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="charts gui qt6 htmlreport pcre test threads" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -75,10 +75,14 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${PN}-2.13.0-32-bit-tests.patch +) + src_prepare() { cmake_src_prepare - # Modify to an existing dockbook location + # Modify to an existing docbook location sed -i \ -e "s|set(DB2MAN .*|set(DB2MAN \"${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl\")|" \ man/CMakeLists.txt || die diff --git a/dev-util/cppcheck/cppcheck-2.14.2.ebuild b/dev-util/cppcheck/cppcheck-2.14.2.ebuild new file mode 100644 index 000000000000..088bb97b6b42 --- /dev/null +++ b/dev-util/cppcheck/cppcheck-2.14.2.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit cmake python-single-r1 xdg + +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 ~loong ~ppc64 ~riscv ~x86" +IUSE="charts gui qt6 htmlreport pcre test" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + charts? ( gui ) + qt6? ( gui ) +" +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/tinyxml2:= + pcre? ( dev-libs/libpcre ) + gui? ( + qt6? ( + dev-qt/qtbase:6[gui,widgets,network] + dev-qt/qttools:6[assistant,linguist] + charts? ( dev-qt/qtcharts:6 ) + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qthelp:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + charts? ( dev-qt/qtcharts:5 ) + ) + ) +" +RDEPEND=" + ${DEPEND} + ${PYTHON_DEPS} + htmlreport? ( + $(python_gen_cond_dep ' + dev-python/pygments[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + ${PYTHON_DEPS} + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + virtual/pkgconfig + gui? ( + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + gui? ( + !qt6? ( + dev-qt/qttest:5 + ) + ) + htmlreport? ( + $(python_gen_cond_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + ') + ) + ) +" + +src_prepare() { + cmake_src_prepare + + # Modify to an existing docbook location + sed -i \ + -e "s|set(DB2MAN .*|set(DB2MAN \"${EPREFIX}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl\")|" \ + man/CMakeLists.txt || die + + # Make tests use cppcheck built in build dir. + sed -i -e "s|CPPCHECK_BIN = .*|CPPCHECK_BIN = '${BUILD_DIR}/bin/cppcheck'|" htmlreport/test_htmlreport.py || die +} + +src_configure() { + local mycmakeargs=( + -DFILESDIR="${EPREFIX}"/usr/share/${PF}/ + -DBUILD_MANPAGE=ON + + -DHAVE_RULES=$(usex pcre) + + -DBUILD_GUI=$(usex gui) + -DUSE_QT6=$(usex qt6) + -DWITH_QCHART=$(usex charts) + + -DBUILD_TESTS=$(usex test) + -DREGISTER_TESTS=$(usex test) + -DREGISTER_GUI_TESTS=$(usex test) + + -DUSE_MATCHCOMPILER=ON + -DUSE_LIBCXX=OFF + + -DDISABLE_DMAKE=ON + -DUSE_BOOST=OFF + -DUSE_BUNDLED_TINYXML2=OFF + + # Yes, this is necessary to use the correct python version. + # bug #826602 + -DPython_EXECUTABLE=${PYTHON} + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + cmake_build man +} + +src_test() { + local CMAKE_SKIP_TESTS=( + # Out of source builds breaks test TestFileLister + # https://github.com/danmar/cppcheck/pull/5462 + TestFileLister + ) + cmake_src_test + use htmlreport && epytest htmlreport +} + +src_install() { + cmake_src_install + + insinto /usr/share/${PF}/cfg + doins cfg/*.cfg + + if use gui ; then + dobin "${WORKDIR}/${P}_build/bin/${PN}-gui" + dodoc gui/{projectfile.txt,gui.${PN}} + fi + + use htmlreport && python_doscript htmlreport/cppcheck-htmlreport + python_fix_shebang "${ED}"/usr/share/${PF} + python_optimize "${ED}"/usr/share/${PF} + + dodoc -r tools/triage + doman "${BUILD_DIR}"/man/cppcheck.1 +} diff --git a/dev-util/cppcheck/cppcheck-2.9.ebuild b/dev-util/cppcheck/cppcheck-2.9.ebuild index d70808c01352..c6d68f1cc701 100644 --- a/dev-util/cppcheck/cppcheck-2.9.ebuild +++ b/dev-util/cppcheck/cppcheck-2.9.ebuild @@ -8,7 +8,7 @@ EAPI=8 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit distutils-r1 cmake DESCRIPTION="Static analyzer of C/C++ code" @@ -17,7 +17,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/refs/tags/${PV}.tar.gz -> ${ LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc64 ~riscv sparc x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="htmlreport pcre qt5 test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" 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 + diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml index 4e56958744c0..4f3e5ddc6036 100644 --- a/dev-util/cppcheck/metadata.xml +++ b/dev-util/cppcheck/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>tamiko@gentoo.org</email> - <name>Matthias Maier</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="charts">Enable QtCharts usage in the GUI</flag> <flag name="htmlreport">install cppcheck-htmlreport</flag> |