[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
commit: c17598fbbaa12c67798d045dc1d6798d494941c9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 30 15:42:28 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 31 10:47:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17598fb kde-frameworks/extra-cmake-modules: drop 5.116.0, 6.5.0 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/Manifest| 1 - .../extra-cmake-modules-5.116.0.ebuild | 70 .../extra-cmake-modules-6.5.0.ebuild | 70 ...make-modules-5.93.0-disable-qmlplugindump.patch | 76 -- 4 files changed, 217 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 7aa6482a2197..c6c7d36d9a58 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,2 +1 @@ -DIST extra-cmake-modules-5.116.0.tar.xz 332248 BLAKE2B 3a9b9afc47279c3f3242f5cc8271596533be347374b59db6af49b6b08368917be4321f33d3721d3a3328f52ad9347556b40611702d7b8c52f86a92c7a23613fe SHA512 c0d73c2a6a155e3f03292335c994ec940892c751334e2336b42640016ebde5a9d72efe6fc6a31b7349504142da01e5974539b82d1e2aa967f448ae3ae80859f6 DIST extra-cmake-modules-6.5.0.tar.xz 340948 BLAKE2B 104e02638042498e9fae486542a30a8f454c11d5c8c7099c10a88e0c34cbf1563905a79705ce59a5448af19479ec130bc23182138083e5ff06e312f4c488 SHA512 70150c13f0eb85924d5f80a40efb8981227915c497980bfa8e5622f2cca7b6cad4e0e5ebe0b8a34cdf4aabb33dee66073926dd5ea3a23229823605b0d2f29aee diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild deleted file mode 100644 index b3f9beee0ee6.. --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -QTMIN=5.15.9 -inherit cmake frameworks.kde.org python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; - -LICENSE="BSD" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" -IUSE="doc test" - -RESTRICT="!test? ( test )" - -RDEPEND="app-arch/libarchive[bzip2]" -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - >=dev-qt/qthelp-${QTMIN}:5 - ) - test? ( - >=dev-qt/linguist-tools-${QTMIN}:5 - >=dev-qt/qtcore-${QTMIN}:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" - "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch" - "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256 -) - -python_check_deps() { - python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" - -DBUILD_QTHELP_DOCS=$(usex doc) - -DBUILD_HTML_DOCS=$(usex doc) - -DBUILD_MAN_DOCS=$(usex doc) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - # passes, but then breaks src_install - ECMToolchainAndroidTest - # broken, bug #627806 - ECMPoQmToolsTest - # can not possibly succeed in releases, bug #764953 - KDEFetchTranslations - ) - # possible race condition with multiple jobs, bug #701854 - cmake_src_test -j1 -} diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0.ebuild deleted file mode 100644 index 37cec1eb1db8.. --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -QTMIN=6.6.2 -inherit cmake frameworks.kde.org python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -IUSE="doc test" - -RESTRICT="!test? ( test )" - -RDEPEND="app-arch/libarchive[bzip2]" -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - >=dev-qt/qttools-${QTMIN}:6[assistant]
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e6a42b2aa11165d505500d3ae4f46eb974c82ee8 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Aug 30 06:38:43 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Aug 30 06:38:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a42b2a kde-frameworks/extra-cmake-modules: Stabilize 6.5.0-r1 x86, #937885 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild index 16ee842f043a..aa02971aa02f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 85f0113a7df158f9fd0fb005e0256c73469248d7 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Aug 30 06:38:52 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Aug 30 06:38:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f0113a kde-frameworks/extra-cmake-modules: Stabilize 6.5.0-r1 arm64, #937885 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild index 7f0eb2525e48..ed1f9497b3a5 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 7c864fb860305728ba7af32a7e7b03633447063d Author: Arthur Zamarin gentoo org> AuthorDate: Fri Aug 30 06:38:48 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Aug 30 06:38:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c864fb8 kde-frameworks/extra-cmake-modules: Stabilize 6.5.0-r1 arm, #937885 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild index aa02971aa02f..7f0eb2525e48 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 54042e19fc7babcd16b82b9491a3cda46e6f6301 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Aug 30 06:38:38 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Aug 30 06:38:38 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54042e19 kde-frameworks/extra-cmake-modules: Stabilize 6.5.0-r1 amd64, #937885 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild index 8625761031c6..16ee842f043a 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: aa3ade8a247a9a169c8edeef147b3720b4a382f0 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Aug 30 06:17:28 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Aug 30 06:17:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3ade8a kde-frameworks/extra-cmake-modules: Stabilize 6.5.0-r1 ppc64, #937885 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild index ee14a26da961..8625761031c6 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: fc1315738b11cde744dc1bfc2ee677b408f2cb8c Author: Sam James gentoo org> AuthorDate: Thu Aug 29 23:08:21 2024 + Commit: Sam James gentoo org> CommitDate: Thu Aug 29 23:08:21 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc131573 kde-frameworks/extra-cmake-modules: Stabilize 6.5.0-r1 ppc, #937885 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild index cfe32a36a87c..ee14a26da961 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
commit: 3e6dcb8a38f69cf8edad355295a2aed5e477f869 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 14 21:06:19 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 15 17:46:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e6dcb8a kde-frameworks/extra-cmake-modules: More silence, less appstream test Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-6.5.0-r1.ebuild| 72 ++ ...cmake-modules-6.5.0-disable-appstreamtest.patch | 31 ++ ...ke-modules-6.5.0-disable-git-commit-hooks.patch | 31 ++ 3 files changed, 134 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild new file mode 100644 index ..cfe32a36a87c --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.5.0-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +QTMIN=6.6.2 +inherit cmake frameworks.kde.org python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="doc test" + +RESTRICT="!test? ( test )" + +RDEPEND="app-arch/libarchive[bzip2]" +BDEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + >=dev-qt/qttools-${QTMIN}:6[assistant] + ) + test? ( + >=dev-qt/qttools-${QTMIN}:6[linguist] + >=dev-qt/qtbase-${QTMIN}:6 + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" + "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" + "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256 + "${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-6.5.0-disable-appstreamtest.patch" + "${FILESDIR}/${PN}-6.5.0-disable-git-commit-hooks.patch" +) + +python_check_deps() { + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" + -DBUILD_QTHELP_DOCS=$(usex doc) + -DBUILD_HTML_DOCS=$(usex doc) + -DBUILD_MAN_DOCS=$(usex doc) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + local CMAKE_SKIP_TESTS=( + # passes, but then breaks src_install + ECMToolchainAndroidTest + # broken, bug #627806 + ECMPoQmToolsTest + # can not possibly succeed in releases, bug #764953 + KDEFetchTranslations + ) + # possible race condition with multiple jobs, bug #701854 + cmake_src_test -j1 +} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-appstreamtest.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-appstreamtest.patch new file mode 100644 index ..3691e891892b --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-appstreamtest.patch @@ -0,0 +1,31 @@ +From c287bae2677f0339d12a12f90147b5d96cdaa7a1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 13 Aug 2024 21:44:24 +0200 +Subject: [PATCH] KDECMakeSettings.cmake: Add ECM_DISABLE_APPSTREAMTEST to not + run test + +and spend time in every consumer. + +Signed-off-by: Andreas Sturmlechner +--- + kde-modules/KDECMakeSettings.cmake | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake +index 3e4ac32f..9f73eb28 100644 +--- a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake +@@ -184,7 +184,10 @@ if(NOT KDE_SKIP_TEST_SETTINGS) + option(BUILD_TESTING "Build the testing tree." ON) + if(BUILD_TESTING) + enable_testing() ++option (ECM_DISABLE_APPSTREAMTEST "Do not run appstreamtest" OFF) ++if(NOT ECM_DISABLE_APPSTREAMTEST) + appstreamtest() ++endif() + endif () +endif () + +-- +2.45.2 + diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-git-commit-hooks.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-git-commit-hooks.patch new file mode 100644 index ..ad67e8233a4b --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-6.5.0-disable-git-commit-hooks.patch @@ -0,0 +1,31 @@ +From ed944c8c85822c39dea66afdd1759dec093fd6b3 Mon Sep 17 00:00:00 2001 +From: A
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: f4acdc2a733975b8da5a959d3fd5b4d4d827db8a Author: Michał Górny gentoo org> AuthorDate: Sat Jul 6 17:19:47 2024 + Commit: Michał Górny gentoo org> CommitDate: Sat Jul 6 17:23:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4acdc2a kde-frameworks/extra-cmake-modules: Enable py3.13 Signed-off-by: Michał Górny gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.3.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.3.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.3.0.ebuild index ecb22352a8b3..37cec1eb1db8 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.3.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-6.3.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) QTMIN=6.6.2 inherit cmake frameworks.kde.org python-any-r1
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 2812b9f8ad077ab85b43e2dfb73e6c23503f2dd8 Author: Sam James gentoo org> AuthorDate: Mon May 27 23:48:25 2024 + Commit: Sam James gentoo org> CommitDate: Mon May 27 23:48:25 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2812b9f8 kde-frameworks/extra-cmake-modules: Stabilize 5.116.0 arm, #932369 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild index a77884343661..6b39e2b8124e 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 17775164b284555d5fc4b79ed3370929fb0b4e20 Author: Arthur Zamarin gentoo org> AuthorDate: Mon May 27 18:11:04 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon May 27 18:11:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17775164 kde-frameworks/extra-cmake-modules: Stabilize 5.116.0 ppc, #932369 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild index b66b7a47adf4..c97f3f892e62 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.116.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: ff8ad6f2b7a2ce872b9bbcc9a982b796a9873ed9 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Dec 29 20:25:46 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Dec 29 20:25:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8ad6f2 kde-frameworks/extra-cmake-modules: Stabilize 5.113.0 ppc, #920698 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild index aab9c74da028..59eefae8c156 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: aba698a9151ae47fd29fdaf28c1cc7c0cf5048bf Author: Sam James gentoo org> AuthorDate: Fri Dec 29 00:23:24 2023 + Commit: Sam James gentoo org> CommitDate: Fri Dec 29 00:23:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba698a9 kde-frameworks/extra-cmake-modules: Stabilize 5.113.0 arm, #920698 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild index 840663abd876..aab9c74da028 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: f56b42fbae3bf6ff653343b58f1286aab6cf799e Author: Sam James gentoo org> AuthorDate: Thu Dec 28 14:58:11 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 14:58:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f56b42fb kde-frameworks/extra-cmake-modules: Stabilize 5.113.0 ppc64, #920698 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild index 957d978a2b50..393f0a5739ea 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.113.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 1bd3a098d72b7795e35c772dba06e2182575101d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 25 21:52:00 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Nov 25 23:33:25 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd3a098 kde-frameworks/extra-cmake-modules: Revbump dropping subslot Signed-off-by: Andreas Sturmlechner gentoo.org> ...e-modules-5.110.0.ebuild => extra-cmake-modules-5.110.0-r1.ebuild} | 4 +--- ...e-modules-5.112.0.ebuild => extra-cmake-modules-5.112.0-r1.ebuild} | 0 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.110.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.110.0-r1.ebuild similarity index 97% rename from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.110.0.ebuild rename to kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.110.0-r1.ebuild index 6e5ad27851a6..01fab67c74db 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.110.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.110.0-r1.ebuild @@ -16,6 +16,7 @@ IUSE="doc test" RESTRICT="!test? ( test )" +RDEPEND="app-arch/libarchive[bzip2]" BDEPEND=" doc? ( ${PYTHON_DEPS} @@ -27,9 +28,6 @@ BDEPEND=" >=dev-qt/qtcore-${QTMIN}:5 ) " -RDEPEND=" - app-arch/libarchive[bzip2] -" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0-r1.ebuild similarity index 100% rename from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild rename to kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 5a7bbd22559c353309dd5dff17e4aceb012ab4b1 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Nov 22 11:15:23 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Nov 22 11:15:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a7bbd22 kde-frameworks/extra-cmake-modules: Stabilize 5.112.0 ppc, #917244 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild index 3210f0803045..c00554e674d4 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" +KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: cf5567e3994789d06afb3b3c22ed2de9837d7d9b Author: Sam James gentoo org> AuthorDate: Tue Nov 21 15:39:42 2023 + Commit: Sam James gentoo org> CommitDate: Tue Nov 21 15:39:42 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5567e3 kde-frameworks/extra-cmake-modules: Stabilize 5.112.0 arm, #917244 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild index f6dfb9d85af9..3210f0803045 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" +KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 5a8c55c3286524240cc78d6b6722474bc379145f Author: Sam James gentoo org> AuthorDate: Tue Nov 21 15:39:40 2023 + Commit: Sam James gentoo org> CommitDate: Tue Nov 21 15:39:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8c55c3 kde-frameworks/extra-cmake-modules: Stabilize 5.112.0 ppc64, #917244 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild index 428e9b3c5ae5..f6dfb9d85af9 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 0202ac89e366b6085d51aadf6f54a2990fc591e5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Nov 18 17:01:52 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 21 10:38:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0202ac89 kde-frameworks/extra-cmake-modules: Disable PyQt5-based tests by patch ... replacing sed. Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.112.0.ebuild | 12 ++ ...les-5.112.0-disable-tests-requiring-PyQt5.patch | 27 ++ 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild index 08a4d2f25a21..428e9b3c5ae5 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.112.0.ebuild @@ -16,6 +16,7 @@ IUSE="doc test" RESTRICT="!test? ( test )" +RDEPEND="app-arch/libarchive[bzip2]" BDEPEND=" doc? ( ${PYTHON_DEPS} @@ -27,14 +28,12 @@ BDEPEND=" >=dev-qt/qtcore-${QTMIN}:5 ) " -RDEPEND=" - app-arch/libarchive[bzip2] -" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch" "${FILESDIR}/${PN}-5.93.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256 ) python_check_deps() { @@ -45,13 +44,6 @@ pkg_setup() { use doc && python-any-r1_pkg_setup } -src_prepare() { - cmake_src_prepare - # Requires PyQt5, bug #680256 - sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ - tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" -} - src_configure() { local mycmakeargs=( -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch new file mode 100644 index ..17d60448056f --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch @@ -0,0 +1,27 @@ +From 35d209b5662e468aa2f613ffdb9b91bc2e7f7e26 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 18 Nov 2023 17:58:36 +0100 +Subject: [PATCH] Disable tests requiring PyQt5 + +Gentoo-bug: https://bugs.gentoo.org/680256 +Signed-off-by: Andreas Sturmlechner +--- + tests/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 1415bb91..09d998e4 100644 +--- a/tests/CMakeLists.txt b/tests/CMakeLists.txt +@@ -79,7 +79,7 @@ find_file(SIP_Qt5Core_Mod_FILE + PATH_SUFFIXES share/sip/PyQt5/QtCore + ) + +-if(NOT SIP_Qt5Core_Mod_FILE) ++if(TRUE) + message(STATUS "WARNING: skipping tests that require PyQt") + else() + find_package(PythonModuleGeneration) +-- +2.42.1 +
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: bdd7682493082df526d98c8f7e247e00a199e5a3 Author: Sam James gentoo org> AuthorDate: Wed Aug 2 17:50:57 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 2 17:50:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd76824 kde-frameworks/extra-cmake-modules: Stabilize 5.108.0 ppc, #910062 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild index 6e92d10c587e..c25469223ced 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 3a2d3ce84a867d07a10eb65dc65de03a2b8dca83 Author: Sam James gentoo org> AuthorDate: Wed Aug 2 17:33:41 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 2 17:43:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a2d3ce8 kde-frameworks/extra-cmake-modules: Stabilize 5.108.0 arm64, #910062 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild index f913dccfc0cf..6e92d10c587e 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: d9e1dfcbfd91a0a114be3391650e5a434eea4b53 Author: Sam James gentoo org> AuthorDate: Wed Aug 2 17:33:34 2023 + Commit: Sam James gentoo org> CommitDate: Wed Aug 2 17:43:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9e1dfcb kde-frameworks/extra-cmake-modules: Stabilize 5.108.0 arm, #910062 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild index fbcfc816e0c9..f913dccfc0cf 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: f613ab6207c058c1e732db958d688a2aff33ad11 Author: Sam James gentoo org> AuthorDate: Tue Jul 25 18:51:37 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jul 25 18:51:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f613ab62 kde-frameworks/extra-cmake-modules: Stabilize 5.108.0 ppc64, #910062 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild index a255f2735822..fbcfc816e0c9 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.108.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 60b0e566979c4f31cf044b19b9dad83084a870ec Author: Sam James gentoo org> AuthorDate: Sun May 28 11:35:49 2023 + Commit: Sam James gentoo org> CommitDate: Sun May 28 11:35:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60b0e566 kde-frameworks/extra-cmake-modules: Stabilize 5.106.0 ppc64, #906676 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild index 4020ba48eab2..4c9e3fc454b3 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 894b4e411158fffba7d3305c4c0c3682da5c8e55 Author: Sam James gentoo org> AuthorDate: Sat May 27 15:54:26 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 27 15:54:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894b4e41 kde-frameworks/extra-cmake-modules: Stabilize 5.106.0 ppc, #906676 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild index 3ac9823f844a..4020ba48eab2 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: f1feb3403f058b5745a1db8733643ea640b25d81 Author: Arthur Zamarin gentoo org> AuthorDate: Sat May 27 10:59:48 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat May 27 10:59:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1feb340 kde-frameworks/extra-cmake-modules: Stabilize 5.106.0 arm, #906676 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild index 4f1be6b93a0d..c5ce1fc30fdf 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.106.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 849dd38f589e2f2735a7a6e7530e05d7c3a2bbe9 Author: Sam James gentoo org> AuthorDate: Sat May 20 00:53:59 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 20 00:53:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=849dd38f kde-frameworks/extra-cmake-modules: Stabilize 5.104.0 arm, #906793 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild index 400478a31430..a050de926f4c 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 0a201c8741d0f6f40404b20aba87b898267295c2 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Apr 20 04:38:11 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Apr 20 04:38:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a201c87 kde-frameworks/extra-cmake-modules: Stabilize 5.104.0 ppc, #899706 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild index a96dc9fd82c8..77f27bf769d1 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 942fb2380e5f1e6d29bdc8bf6321bfde1435a078 Author: Sam James gentoo org> AuthorDate: Thu Apr 20 04:02:06 2023 + Commit: Sam James gentoo org> CommitDate: Thu Apr 20 04:02:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942fb238 kde-frameworks/extra-cmake-modules: Stabilize 5.104.0 ppc64, #899706 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild index 4f1be6b93a0d..a96dc9fd82c8 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.104.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 248eac61e35f2efaca0e34dae6716ab6adcc091e Author: Sam James gentoo org> AuthorDate: Sun Feb 5 15:19:30 2023 + Commit: Sam James gentoo org> CommitDate: Sun Feb 5 15:19:30 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=248eac61 kde-frameworks/extra-cmake-modules: Stabilize 5.102.0 ppc64, #891927 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild index e1137bb57f82..77f27bf769d1 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: d71e366747f95051ab72c3bc91873be66ae8eac4 Author: Sam James gentoo org> AuthorDate: Sun Feb 5 15:19:29 2023 + Commit: Sam James gentoo org> CommitDate: Sun Feb 5 15:19:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71e3667 kde-frameworks/extra-cmake-modules: Stabilize 5.102.0 ppc, #891927 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild index 4f1be6b93a0d..e1137bb57f82 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.102.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 4b3ad46e89da820dd758447e2a8f86afb9ecb2fe Author: Arthur Zamarin gentoo org> AuthorDate: Thu Nov 10 18:17:43 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Nov 10 18:17:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b3ad46e kde-frameworks/extra-cmake-modules: Stabilize 5.99.0 ppc, #876484 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild index b706f74f16a0..985674a9d2b5 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e00a0659aac8213aeed1f144ff71b282d9c45886 Author: Arthur Zamarin gentoo org> AuthorDate: Thu Nov 10 18:17:42 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Thu Nov 10 18:17:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00a0659 kde-frameworks/extra-cmake-modules: Stabilize 5.99.0 ppc64, #876484 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild index eec8444546c2..b706f74f16a0 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.99.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 1b938617dae0a3feeeb08085489bf6fd25671911 Author: Sam James gentoo org> AuthorDate: Thu Aug 11 10:20:21 2022 + Commit: Sam James gentoo org> CommitDate: Thu Aug 11 10:20:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b938617 kde-frameworks/extra-cmake-modules: fix PythonAnyMismatchedDepHasVersionCheck has_version was checking DEPEND, not BDEPEND, so change to python_has_version for better defaults (defaults to BDEPEND) but also nicer output. Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild index 1b4ae376bf48..83620fe6072e 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild @@ -38,7 +38,7 @@ PATCHES=( ) python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" + python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: c1238783ac0a950fe2db564358064d860af000e1 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Aug 7 09:56:47 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 7 15:51:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1238783 kde-frameworks/extra-cmake-modules: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.12 Closes: https://github.com/gentoo/gentoo/pull/26769 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ke-modules-5.72.0-skip-ecm_add_test-early.patch | 54 --- ...make-modules-5.91.0-disable-qmlplugindump.patch | 76 -- 2 files changed, 130 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch deleted file mode 100644 index 72541d73e72e.. --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch +++ /dev/null @@ -1,54 +0,0 @@ -From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 11 Jul 2020 23:04:16 +0200 -Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt5::Test is not available - -Signed-off-by: Andreas Sturmlechner - modules/ECMAddTests.cmake| 9 + - tests/ECMAddTests/CMakeLists.txt | 5 + - 2 files changed, 14 insertions(+) - -diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake -index 4bc7fb8..12825aa 100644 a/modules/ECMAddTests.cmake -+++ b/modules/ECMAddTests.cmake -@@ -81,6 +81,10 @@ function(ecm_add_test) - message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") - endif() - -+ if(NOT TARGET Qt5::Test) -+return() -+ endif() -+ - set(_testname ${ARG_NAME_PREFIX}${_targetname}) - set(gui_args) - if(ARG_GUI) -@@ -122,6 +126,11 @@ function(ecm_add_tests) - endif() - set(test_names) - set(target_names) -+ -+ if(NOT TARGET Qt5::Test) -+return() -+ endif() -+ - foreach(_test_source ${ARG_UNPARSED_ARGUMENTS}) - ecm_add_test(${_test_source} - NAME_PREFIX ${ARG_NAME_PREFIX} -diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt -index e77b33f..4e191fe 100644 a/tests/ECMAddTests/CMakeLists.txt -+++ b/tests/ECMAddTests/CMakeLists.txt -@@ -1,3 +1,8 @@ -+if(NOT TARGET Qt5::Test) -+message(STATUS "WARNING: skipping tests that require Qt5::Test") -+return() -+endif() -+ - macro(add_check NAME) - string(REPLACE "." "/" dir "${NAME}") - string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}") --- -2.27.0 - diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch deleted file mode 100644 index fbec9a441e37.. --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.91.0-disable-qmlplugindump.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 76ee984d5094990c2bd79c71b84ba9f82b3bf3da Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 8 Dec 2019 15:01:33 +0100 -Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to - avoid sandbox violations - -See also: https://phabricator.kde.org/D25812 - -Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 -BUG: 387753 - modules/ECMFindQmlModule.cmake.in | 45 ++- - 1 file changed, 27 insertions(+), 18 deletions(-) - -diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in -index 6c054bf0..1c17c981 100644 a/modules/ECMFindQmlModule.cmake.in -+++ b/modules/ECMFindQmlModule.cmake.in -@@ -7,27 +7,36 @@ - include(FindPackageHandleStandardArgs) - include("${ECM_MODULE_DIR}/QtVersionOption.cmake") - --if (QT_MAJOR_VERSION EQUAL "5") --include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") --query_qmake(qt_binaries_dir QT_HOST_BINS) --find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) --elseif (QT_MAJOR_VERSION EQUAL "6") --find_package(Qt6 COMPONENTS QmlTools REQUIRED) --get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) --endif() -- --if(NOT QMLPLUGINDUMP_PROGRAM) --message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") --endif() -+option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) - --execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30) -- --if(ExitCode EQUAL 0) -+if(ECM_DISABLE_QMLPLUGINDUMP) -+message(NOTICE "@GENMODU
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: f30dbd1a16606bc1eb14fb2e5ba1815e8b0221d6 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Jul 31 19:37:11 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Jul 31 19:37:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30dbd1a kde-frameworks/extra-cmake-modules: Stabilize 5.96.0 ppc64, #853325 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild index d79b4733f567..bc74104f534f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 6a5b1377a9c1b7b0c14e290e78591347edbe0eb7 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Jul 31 17:12:21 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Jul 31 17:12:21 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a5b1377 kde-frameworks/extra-cmake-modules: Stabilize 5.96.0 ppc, #853325 Signed-off-by: Arthur Zamarin gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild index 41e80df740a8..d79b4733f567 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.96.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, sci-visualization/paraview/
commit: ab871130d1f6a4e51758a0923901e27f693c4ff4 Author: Matthias Maier gentoo org> AuthorDate: Wed May 25 04:08:03 2022 + Commit: Matthias Maier gentoo org> CommitDate: Wed May 25 05:32:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab871130 sci-visualization/paraview: add 5.10.1 - drop USE=mysql, this doesn't seem to be functional at the moment. Closes: https://bugs.gentoo.org/831373 Closes: https://bugs.gentoo.org/831392 Closes: https://bugs.gentoo.org/846299 Signed-off-by: Matthias Maier gentoo.org> ...make-modules-5.93.0-disable-qmlplugindump.patch | 2 +- sci-visualization/paraview/Manifest| 1 + sci-visualization/paraview/paraview-5.10.1.ebuild | 232 + 3 files changed, 234 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch index 0683bd3effd9..06406a7eaf6d 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch @@ -6,7 +6,7 @@ Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to See also: https://phabricator.kde.org/D25812 -Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 +Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744136 BUG: 387753 --- modules/ECMFindQmlModule.cmake.in | 45 ++- diff --git a/sci-visualization/paraview/Manifest b/sci-visualization/paraview/Manifest index 681c4522e3f1..657b09e18500 100644 --- a/sci-visualization/paraview/Manifest +++ b/sci-visualization/paraview/Manifest @@ -1,2 +1,3 @@ +DIST ParaView-v5.10.1.tar.xz 70218088 BLAKE2B 3134c5df35994a3a153ebd97770066b9963911ae7fb1877681135e01a19c4a879306ae844ef3a29719be5cd509f35117f74eb3c264f1a101fa19180d9a126011 SHA512 1feb855432ea7bc40f77ee214e5877d5170e4f31f520dc7198d72a271506b65a4bc79922875d2c176e54219818a428497c606390a2b9da2770de403bd1593e6c DIST ParaView-v5.9.0.tar.xz 62784788 BLAKE2B f07bfce50304b2bfba0de4ba3127d686cf4c32633f8c707fbb2d93c19685f7e8a119ba211e27c29b986ca5b22afab4f57c273077a1c0a7ab0abefa55c8874e28 SHA512 44d93b49449262aa3f068aa990419415c3197916a002555d914efc407ed7ccd57b15b829f0fe711afee780e5e63fb1bd072175fc382f3afd36daecc541c382d5 DIST ParaView-v5.9.1.tar.xz 62835572 BLAKE2B ba15771de9d972de533627ce3e2c74fd5f25df08884680ea6f1ceea0adb513c024f58e4436691bf17b11728f8e1c09f6ce1d55d9875729169dbc5f4b38c05de8 SHA512 d424e22d962f21c32971ca0001c10c266a1768713a3d0ae9d4c73dc83260c4661326cfbed7773845cf31dedc0474096ed9d6eb8a42ab7677cdde95f9f6abd2f2 diff --git a/sci-visualization/paraview/paraview-5.10.1.ebuild b/sci-visualization/paraview/paraview-5.10.1.ebuild new file mode 100644 index ..c7ac19439bf6 --- /dev/null +++ b/sci-visualization/paraview/paraview-5.10.1.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit cmake desktop python-single-r1 qmake-utils toolchain-funcs xdg-utils + +MAIN_PV=$(ver_cut 0-1) +MAJOR_PV=$(ver_cut 1-2) +MY_P="ParaView-v${PV}" + +DESCRIPTION="Powerful scientific data visualization application" +HOMEPAGE="https://www.paraview.org"; +SRC_URI="https://www.paraview.org/files/v${MAJOR_PV}/${MY_P}.tar.xz"; + +LICENSE="paraview GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="boost cg doc examples ffmpeg mpi nvcontrol openmp offscreen plugins python +qt5 +sqlite test tk +webengine" + +RESTRICT="mirror test" + +REQUIRED_USE=" + python? ( mpi ${PYTHON_REQUIRED_USE} ) + webengine? ( qt5 ) + qt5? ( sqlite ) + ?? ( offscreen qt5 )" + +# TODO: Verify that these two are not needed any more for the catalyst +# module: +# - dev-python/PyQt5 +# - dev-qt/qtgui:5[-gles2-only] +RDEPEND=" + app-arch/lz4 + dev-libs/expat + dev-libs/jsoncpp:= + dev-libs/libxml2:2 + dev-libs/protobuf:= + dev-libs/pugixml + media-libs/freetype + media-libs/glew:0 + media-libs/libpng:0 + media-libs/libtheora + media-libs/tiff:0= + sci-libs/cgnslib + sci-libs/hdf5:=[mpi=] + >=sci-libs/netcdf-4.2[hdf5] + >=sci-libs/netcdf-cxx-4.2:3 + sys-libs/zlib + virtual/glu + media-libs/libjpeg-turbo:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXmu + x11-libs/libXt + ffmpeg? ( media-video/ffmpeg ) + mpi? ( virtual/mpi[cxx,romio] ) + offscreen? ( >=media-libs/mesa-18.3.6[osmesa] ) + !offscreen? ( virtual/opengl ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/constantly[${PYTHON_USEDEP}] + dev-py
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 042ba40b22a3a7bb75e86ecca6f763714d727ede Author: WANG Xuerui gentoo org> AuthorDate: Thu May 19 05:05:00 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Thu May 19 05:07:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042ba40b kde-frameworks/extra-cmake-modules: keyword 5.94.0 for ~loong Tests passed on real hardware. Signed-off-by: WANG Xuerui gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild index 194480ed41f6..6dd4ecb8e60f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.94.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: bc38f6cf5c4b4e41624c21422a5b8a10b859e7f8 Author: Sam James gentoo org> AuthorDate: Fri Apr 29 04:06:29 2022 + Commit: Sam James gentoo org> CommitDate: Fri Apr 29 04:06:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc38f6cf kde-frameworks/extra-cmake-modules: Stabilize 5.92.0 ppc64, #838502 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild index 6d81a4644d8a..478bac7ab204 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 6d5c58b2153b847d63cadf4e653343c60d339932 Author: Sam James gentoo org> AuthorDate: Fri Apr 29 04:06:33 2022 + Commit: Sam James gentoo org> CommitDate: Fri Apr 29 04:06:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d5c58b2 kde-frameworks/extra-cmake-modules: Stabilize 5.92.0 ppc, #838502 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild index 478bac7ab204..408c253bc7f6 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.92.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: 1ced84c2e271684949e56356a178a0318c28e056 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 10 21:26:37 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 10 21:32:26 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ced84c2 kde-frameworks/extra-cmake-modules: Fix cmake code in patch skip-ecm_add_test-early.patch broke cmake. Closes: https://bugs.gentoo.org/837608 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...ake-modules-5.93.0-skip-ecm_add_test-early.patch | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch index f9eef600724c..84e192919c78 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch @@ -1,4 +1,4 @@ -From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001 +From 36e435f059ee44da78e6900fded348709ea865df Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 11 Jul 2020 23:04:16 +0200 Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not @@ -7,8 +7,8 @@ Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not Signed-off-by: Andreas Sturmlechner --- modules/ECMAddTests.cmake| 9 + - tests/ECMAddTests/CMakeLists.txt | 4 - 2 files changed, 13 insertions(+) + tests/ECMAddTests/CMakeLists.txt | 5 + + 2 files changed, 14 insertions(+) diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake index 58c78d05..994ed1e4 100644 @@ -38,20 +38,21 @@ index 58c78d05..994ed1e4 100644 ecm_add_test(${_test_source} NAME_PREFIX ${ARG_NAME_PREFIX} diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt -index aa7e73a1..5fbc1cc7 100644 +index aa7e73a1..f9fb10cb 100644 --- a/tests/ECMAddTests/CMakeLists.txt +++ b/tests/ECMAddTests/CMakeLists.txt -@@ -2,6 +2,10 @@ if (QT_MAJOR_VERSION EQUAL "6") - set(QT_VERSION_OPT "-DBUILD_WITH_QT6=ON") - else() +@@ -4,6 +4,11 @@ else() set(QT_VERSION_OPT "-DBUILD_WITH_QT6=OFF") -+ + endif() + +if(NOT TARGET Qt::Test) +message(STATUS "WARNING: skipping tests that require Qt::Test") +return() - endif() - ++endif() ++ macro(add_check NAME) + string(REPLACE "." "/" dir "${NAME}") + string(REGEX REPLACE "[^.]*\\." "" proj "${NAME}") -- 2.35.1
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: 86e8bf343485dc910db31d883e55aa8c02ebaac9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 9 22:02:28 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 9 22:02:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e8bf34 kde-frameworks/extra-cmake-modules: Add missing patches Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ...make-modules-5.93.0-disable-qmlplugindump.patch | 76 ++ ...ke-modules-5.93.0-skip-ecm_add_test-early.patch | 57 2 files changed, 133 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch new file mode 100644 index ..0683bd3effd9 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch @@ -0,0 +1,76 @@ +From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 8 Dec 2019 15:01:33 +0100 +Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to + avoid sandbox violations + +See also: https://phabricator.kde.org/D25812 + +Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135 +BUG: 387753 +--- + modules/ECMFindQmlModule.cmake.in | 45 ++- + 1 file changed, 27 insertions(+), 18 deletions(-) + +diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in +index 0ee5665e..d6e1f14c 100644 +--- a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in +@@ -7,27 +7,36 @@ + include(FindPackageHandleStandardArgs) + include("${ECM_MODULE_DIR}/QtVersionOption.cmake") + +-if (QT_MAJOR_VERSION EQUAL "5") +-include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") +-ecm_query_qt(qt_binaries_dir QT_HOST_BINS) +-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) +-elseif (QT_MAJOR_VERSION EQUAL "6") +-find_package(Qt6 COMPONENTS QmlTools REQUIRED) +-get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) +-endif() +- +-if(NOT QMLPLUGINDUMP_PROGRAM) +-message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") +-endif() ++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) + +-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30) +- +-if(ExitCode EQUAL 0) ++if(ECM_DISABLE_QMLPLUGINDUMP) ++message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.") + set(@GENMODULE@_FOUND TRUE) +-set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") ++set(@GENMODULE@_VERSION @VERSION@) + else() +-message(STATUS "qmlplugindump failed for @MODULE_NAME@.") +-set(@GENMODULE@_FOUND FALSE) ++ ++if (QT_MAJOR_VERSION EQUAL "5") ++include("${ECM_MODULE_DIR}/ECMQueryQt.cmake") ++ecm_query_qt(qt_binaries_dir QT_HOST_BINS) ++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) ++elseif (QT_MAJOR_VERSION EQUAL "6") ++find_package(Qt6 COMPONENTS QmlTools REQUIRED) ++get_target_property(QMLPLUGINDUMP_PROGRAM Qt6::qmlplugindump LOCATION) ++endif() ++ ++if(NOT QMLPLUGINDUMP_PROGRAM) ++message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") ++endif() ++ ++execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode TIMEOUT 30) ++ ++if(ExitCode EQUAL 0) ++set(@GENMODULE@_FOUND TRUE) ++set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") ++else() ++message(STATUS "qmlplugindump failed for @MODULE_NAME@.") ++set(@GENMODULE@_FOUND FALSE) ++endif() + endif() + + find_package_handle_standard_args(@GENMODULE@ +-- +2.35.1 + diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch new file mode 100644 index ..f9eef600724c --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch @@ -0,0 +1,57 @@ +From 9b53dd107af153b88658ffa246de728a8a6fbd9d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 11 Jul 2020 23:04:16 +0200 +Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt::Test is not + available + +Signed-off-by: Andreas Sturmlechner +--- + modules/ECMAddTests.cmake| 9
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: b34ad3706fa4d52e40cc8560c4fd055ac31c9d6a Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Feb 8 14:49:44 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Feb 8 14:49:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34ad370 kde-frameworks/extra-cmake-modules: ppc64 stable wrt bug #831587 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild index 25d8b146dcb8..6cdd999213c5 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e1c605ef6ccc9e4bd71dec24f28aa34b2f50b4f5 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Feb 8 07:22:30 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Feb 8 07:22:30 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c605ef kde-frameworks/extra-cmake-modules: ppc stable wrt bug #831587 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild index ce19268ac9d8..f2a9355f0776 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.90.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 2e0cce3b44b04d72b4157a4db458589c20a00635 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 10 19:46:57 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 10 20:01:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e0cce3b kde-frameworks/extra-cmake-modules: ppc/ppc64 allarches stable Bug: https://bugs.gentoo.org/816042 Package-Manager: Portage-3.0.29, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild index e71f569de493..59a314608aef 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.88.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: a538456d17bee41fc25c274e5f8ce16b8b5fabaa Author: Sam James gentoo org> AuthorDate: Tue Sep 14 05:27:16 2021 + Commit: Sam James gentoo org> CommitDate: Tue Sep 14 05:27:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a538456d kde-frameworks/extra-cmake-modules: Stabilize 5.85.0 ppc, #808216 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild index 773d44dd301..706ddafde48 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 6cbfcc5c59d7a4c496c7c39770d27e0fd17a1043 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Sep 13 06:59:12 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Sep 13 06:59:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbfcc5c kde-frameworks/extra-cmake-modules: ppc64 stable wrt bug #808216 Package-Manager: Portage-3.0.20, Repoman-3.0.2 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild index 51f4525c56d..731982d48e5 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.85.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~x86" IUSE="doc test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: dc42662b21adc9fde4bcc074fc27cc3bd35c0919 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Jun 7 06:28:05 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Jun 7 06:28:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc42662b kde-frameworks/extra-cmake-modules: stable 5.82.0 for ppc64 stable wrt bug #788820 Package-Manager: Portage-3.0.19, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild index 3a6ed56d80f..8d8b8249034 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" IUSE="doc test" RESTRICT+=" !test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 64a2392310cce9b6b4b8f38a177bd07c576f2af9 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Jun 7 06:22:39 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Jun 7 06:25:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a23923 kde-frameworks/extra-cmake-modules: stable 5.82.0 for ppc stable wrt bug #788820 Package-Manager: Portage-3.0.19, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild index c5dfbb52213..3a6ed56d80f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ~ppc64 x86" IUSE="doc test" RESTRICT+=" !test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 82e55d83028f8d2c25d1ad14dd72c12ea6b979c8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 14 19:01:18 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 14 19:07:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e55d83 kde-frameworks/extra-cmake-modules: Fix IUSE=doc w/ dev-python/sphinx-4 See also: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/121 Closes: https://bugs.gentoo.org/789096 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.82.0.ebuild | 15 ++-- .../extra-cmake-modules-5.82.0-sphinx-4.patch | 81 ++ 2 files changed, 91 insertions(+), 5 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild index 6bd09789c61..41f98627db4 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.82.0.ebuild @@ -16,10 +16,16 @@ IUSE="doc test" RESTRICT+=" !test? ( test )" +RDEPEND=" + app-arch/libarchive[bzip2] +" BDEPEND=" doc? ( ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}] + ') >=dev-qt/qthelp-${QTMIN}:5 ) test? ( @@ -27,18 +33,17 @@ BDEPEND=" >=dev-qt/qtcore-${QTMIN}:5 ) " -RDEPEND=" - app-arch/libarchive[bzip2] -" PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" "${FILESDIR}/${PN}-5.74.0-disable-qmlplugindump.patch" + "${FILESDIR}/${P}-sphinx-4.patch" # bug 789096, pending upstream MR 121 ) python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]" } pkg_setup() { diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch new file mode 100644 index 000..7ccd024affc --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.82.0-sphinx-4.patch @@ -0,0 +1,81 @@ +From 02abfc3695b71e05e3d5df83514f50ec0ab60bdf Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Fri, 14 May 2021 20:42:02 +0200 +Subject: [PATCH] Fix doc build with Sphinx 4 + +Port away from removed functions. In particular, port to the new index structure which was introduced in 1.4 (released november 2016). +Also account for the new default location of built man pages. + +BUG: 436818 +--- + docs/CMakeLists.txt| 3 ++- + docs/sphinx/ext/ecm.py | 13 - + 2 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt +index 84cca9ea..32687b64 100644 +--- a/docs/CMakeLists.txt b/docs/CMakeLists.txt +@@ -110,7 +110,8 @@ if(BUILD_MAN_DOCS) + set(name "${CMAKE_MATCH_1}") + set(sec "${CMAKE_MATCH_2}") + install( +-FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} ++FILES ${CMAKE_CURRENT_BINARY_DIR}/man/${name}.${sec} ${CMAKE_CURRENT_BINARY_DIR}/man/${sec}/${name}.${sec} ++OPTIONAL + DESTINATION ${MAN_INSTALL_DIR}/man${sec} + ) + endif() +diff --git a/docs/sphinx/ext/ecm.py b/docs/sphinx/ext/ecm.py +index 8667b367..a09e4890 100644 +--- a/docs/sphinx/ext/ecm.py b/docs/sphinx/ext/ecm.py +@@ -5,6 +5,7 @@ + # + # SPDX-License-Identifier: BSD-3-Clause + ++import html + import os + import re + +@@ -19,8 +20,11 @@ CMakeLexer.tokens["args"].append(('(\\$<)(.+?)(>)', + + # Monkey patch for sphinx generating invalid content for qcollectiongenerator + # https://bitbucket.org/birkenfeld/sphinx/issue/1435/qthelp-builder-should-htmlescape-keywords +-from sphinx.util.pycompat import htmlescape +-from sphinx.builders.qthelp import QtHelpBuilder ++try: ++ from sphinxcontrib.qthelp import QtHelpBuilder ++except ImportError: ++ # sphinx < 4.0 ++ from sphinx.builders.qthelp import QtHelpBuilder + old_build_keywords = QtHelpBuilder.build_keywords + def new_build_keywords(self, title, refs, subitems): + old_items = old_build_keywords(self, title, refs, subitems) +@@ -29,13 +33,12 @@ def new_build_keywords(self, title, refs, subitems): + before, rest = item.split("ref=\"", 1) + ref, after = rest.split("\"") + if ("<" in ref and ">" in ref): +- new_items.append(before + "ref=\"" + htmlescape(ref) + "
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 127b46f67d608d8122dc4bc754a71d00e96ced04 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Apr 11 12:21:41 2021 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Apr 11 12:21:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=127b46f6 kde-frameworks/extra-cmake-modules: Stabilize 5.80.0 ppc, #779994 Signed-off-by: Mikle Kolyada gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild index 5e763657070..95c051fc761 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.80.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86" IUSE="doc test" RESTRICT+=" !test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 99c853d7de983895e45867ea5af33ddb9db8764c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 13 23:17:47 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 13 23:17:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c853d7 kde-frameworks/extra-cmake-modules: KDEFetchTranslations test broken It can't work on release tarballs, even local clone only works if .git/config url is pointed at the full invent.kde.org url instead of kde: alias. Not worth "fixing". See also: https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/36 Closes: https://bugs.gentoo.org/764953 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild | 3 ++- kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild index 15ca6a51bc8..1f1a776db32 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild @@ -67,10 +67,11 @@ src_configure() { src_test() { # ECMToolchainAndroidTest passes but then breaks src_install # ECMPoQmToolsTest is broken, bug #627806 + # KDEFetchTranslations can not possibly succeed in releases, bug #764953 # possible race condition with multiple jobs, bug #701854 local myctestargs=( -j1 - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)" ) cmake_src_test diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild index a6510f2e655..c635f424c81 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.78.0.ebuild @@ -67,10 +67,11 @@ src_configure() { src_test() { # ECMToolchainAndroidTest passes but then breaks src_install # ECMPoQmToolsTest is broken, bug #627806 + # KDEFetchTranslations can not possibly succeed in releases, bug #764953 # possible race condition with multiple jobs, bug #701854 local myctestargs=( -j1 - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest|KDEFetchTranslations)" ) cmake_src_test
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 63fb1d83801d50c554c150a15278677d9ebc8c10 Author: Sam James gentoo org> AuthorDate: Sat Jan 9 23:17:50 2021 + Commit: Sam James gentoo org> CommitDate: Sat Jan 9 23:17:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fb1d83 kde-frameworks/extra-cmake-modules: Stabilize 5.77.0 ppc64, #759625 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild index 9f35fb9678f..af03a7b3886 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: b3e5edbd28309e894fcffd040da3475128548603 Author: Sam James gentoo org> AuthorDate: Sat Jan 9 22:08:12 2021 + Commit: Sam James gentoo org> CommitDate: Sat Jan 9 22:08:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e5edbd kde-frameworks/extra-cmake-modules: Stabilize 5.77.0 ppc, #759625 Signed-off-by: Sam James gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild index d5afc98321e..9f35fb9678f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.77.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 4a46e5fb42ca6c71b6a66c2eb6b7d4defce605d5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Oct 8 08:13:41 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 8 12:54:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a46e5fb kde-frameworks/extra-cmake-modules: 5.74.0 ALLARCHES stable Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild index dc579863f5a..9348c8a5348 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.74.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 56a7b2504facbae74297ebc5a931b59b0a9e7541 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 14 20:10:05 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 14 21:11:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a7b250 kde-frameworks/extra-cmake-modules: Drop 5.72.0 (r0) Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.72.0.ebuild | 76 -- 1 file changed, 76 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.72.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.72.0.ebuild deleted file mode 100644 index 6f3757ab313..000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.72.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -QTMIN=5.14.2 -inherit cmake kde.org python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="doc test" - -BDEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - >=dev-qt/qthelp-${QTMIN}:5 - ) - test? ( - >=dev-qt/linguist-tools-${QTMIN}:5 - >=dev-qt/qtcore-${QTMIN}:5 - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -RESTRICT+=" !test? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" - "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch" -) - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - # Requires PyQt5, bug #680256 - sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ - tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" -} - -src_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" - -DBUILD_QTHELP_DOCS=$(usex doc) - -DBUILD_HTML_DOCS=$(usex doc) - -DBUILD_MAN_DOCS=$(usex doc) - -DBUILD_TESTING=$(usex test) - ) - - cmake_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - # possible race condition with multiple jobs, bug #701854 - local myctestargs=( - -j1 - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" - ) - - cmake_src_test -}
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: d94bc055c78c6c94bd16f71978787ee8876d1f4a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 12 16:11:53 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 12 23:07:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94bc055 kde-frameworks/extra-cmake-modules: Skip ecm_add_test w/o Qt5::Test Bug: https://bugs.gentoo.org/651978 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.72.0-r1.ebuild | 77 ++ ...ke-modules-5.72.0-skip-ecm_add_test-early.patch | 54 +++ 2 files changed, 131 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.72.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.72.0-r1.ebuild new file mode 100644 index 000..aedbbe8565e --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.72.0-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +QTMIN=5.14.2 +inherit cmake kde.org python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="doc test" + +BDEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + >=dev-qt/qthelp-${QTMIN}:5 + ) + test? ( + >=dev-qt/linguist-tools-${QTMIN}:5 + >=dev-qt/qtcore-${QTMIN}:5 + ) +" +RDEPEND=" + app-arch/libarchive[bzip2] +" + +RESTRICT+=" !test? ( test )" + +PATCHES=( + "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" + "${FILESDIR}/${PN}-5.65.0-disable-qmlplugindump.patch" + "${FILESDIR}/${PN}-5.72.0-skip-ecm_add_test-early.patch" +) + +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + # Requires PyQt5, bug #680256 + sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ + tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" +} + +src_configure() { + local mycmakeargs=( + -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" + -DBUILD_QTHELP_DOCS=$(usex doc) + -DBUILD_HTML_DOCS=$(usex doc) + -DBUILD_MAN_DOCS=$(usex doc) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + # ECMPoQmToolsTest is broken, bug #627806 + # possible race condition with multiple jobs, bug #701854 + local myctestargs=( + -j1 + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + ) + + cmake_src_test +} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch new file mode 100644 index 000..72541d73e72 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.72.0-skip-ecm_add_test-early.patch @@ -0,0 +1,54 @@ +From ad3aec71ed7f8820e69fe55489368a19d0735ab5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 11 Jul 2020 23:04:16 +0200 +Subject: [PATCH] ECMAddTests.cmake: Skip ecm_add_test early if Qt5::Test is not available + +Signed-off-by: Andreas Sturmlechner +--- + modules/ECMAddTests.cmake| 9 + + tests/ECMAddTests/CMakeLists.txt | 5 + + 2 files changed, 14 insertions(+) + +diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake +index 4bc7fb8..12825aa 100644 +--- a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake +@@ -81,6 +81,10 @@ function(ecm_add_test) + message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") + endif() + ++ if(NOT TARGET Qt5::Test) ++return() ++ endif() ++ + set(_testname ${ARG_NAME_PREFIX}${_targetname}) + set(gui_args) + if(ARG_GUI) +@@ -122,6 +126,11 @@ function(ecm_add_tests) + endif() + set(test_names) + set(target_names) ++ ++ if(NOT TARGET Qt5::Test) ++return() ++ endif() ++ + foreach(_test_source ${ARG_UNPARSED_ARGUMENTS}) + ecm_add_test(${_test_source} + NAME_PREFIX ${ARG_NAME_PREFIX} +diff --git a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt +index e77b33f..4e191fe 100644 +--- a/tests/ECMAddTests/CMakeLists.txt b/tests/ECMAddTests/CMakeLists.txt +@@ -1,3 +1,8 @@ ++if(NOT TARGET Qt5::Test) ++message(STATUS "WARNING: skipping tests that r
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: fcef26edf3a9d3cddeac29932484b504f6ef9507 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 31 20:38:39 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 31 21:08:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcef26ed kde-frameworks/extra-cmake-modules: 5.70.0 ppc/allarches stable Closes: https://bugs.gentoo.org/724346 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild index eaf18c8dfec..36c1e259b30 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e0d4fa750e0db57251fb7388c8149621b0d7bb5e Author: Sergei Trofimovich gentoo org> AuthorDate: Sun May 31 19:11:55 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun May 31 19:11:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0d4fa75 kde-frameworks/extra-cmake-modules: stable 5.70.0 for ppc64 stable wrt bug #724346 Package-Manager: Portage-2.3.100, Repoman-2.3.22 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild index 0490e979a84..eaf18c8dfec 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.70.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: ca7fe1699ec68b0ab53ff36d8cbb7ced66391902 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 1 13:24:45 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 1 13:25:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca7fe169 kde-frameworks/extra-cmake-modules: 5.67.0 ALLARCHES stable Package-Manager: Portage-2.3.90, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild index 18d8d526ca0..20db90ad378 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: efa62cf9d39061334ac24ca5bf767f047d51cfcd Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Feb 11 14:54:53 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 11 14:55:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efa62cf9 kde-frameworks/extra-cmake-modules: Don't run tests in parallel Reported-by: Paolo Pedroni iol.it> Closes: https://bugs.gentoo.org/701854 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild index 35862e15da7..5a9859acaa9 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.67.0.ebuild @@ -66,7 +66,9 @@ src_configure() { src_test() { # ECMToolchainAndroidTest passes but then breaks src_install # ECMPoQmToolsTest is broken, bug #627806 + # possible race condition with multiple jobs, bug #701854 local myctestargs=( + -j1 -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" )
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: 6d01c0493fa5fa86c7a8ee665e75bdd02c8147ac Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 15 13:06:24 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 15 13:06:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d01c049 kde-frameworks/extra-cmake-modules: Add missing patch Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> ...make-modules-5.65.0-disable-qmlplugindump.patch | 65 ++ 1 file changed, 65 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch new file mode 100644 index 000..2cbfba7d5eb --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.65.0-disable-qmlplugindump.patch @@ -0,0 +1,65 @@ +From 8d30a7dd4517130bf1f6904b0969aaa78e44e16b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sun, 8 Dec 2019 15:01:33 +0100 +Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to + avoid sandbox violations + +Back story: https://bugzilla.gnome.org/show_bug.cgi?id=744135 +BUG: 387753 +--- + modules/ECMFindQMLModule.cmake.in | 35 +++ + 1 file changed, 22 insertions(+), 13 deletions(-) + +diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in +index 8109ab8..1edc01d 100644 +--- a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in +@@ -26,23 +26,32 @@ + #= + + include(FindPackageHandleStandardArgs) +-include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") + +-query_qmake(qt_binaries_dir QT_INSTALL_BINS) ++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF) + +-find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) +-if(NOT QMLPLUGINDUMP_PROGRAM) +-message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") +-endif() +- +-execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) +- +-if(ExitCode EQUAL 0) ++if(ECM_DISABLE_QMLPLUGINDUMP) ++message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.") + set(@GENMODULE@_FOUND TRUE) +-set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") ++set(@GENMODULE@_VERSION @VERSION@) + else() +-message(STATUS "qmlplugindump failed for @MODULE_NAME@.") +-set(@GENMODULE@_FOUND FALSE) ++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") ++ ++query_qmake(qt_binaries_dir QT_INSTALL_BINS) ++ ++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) ++if(NOT QMLPLUGINDUMP_PROGRAM) ++message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") ++endif() ++ ++execute_process(COMMAND "${QMLPLUGINDUMP_PROGRAM}" "@MODULE_NAME@" "@VERSION@" ERROR_VARIABLE ERRORS_OUTPUT OUTPUT_VARIABLE DISREGARD_VARIABLE RESULT_VARIABLE ExitCode) ++ ++if(ExitCode EQUAL 0) ++set(@GENMODULE@_FOUND TRUE) ++set(@GENMODULE@_VERSION "${PACKAGE_FIND_VERSION}") ++else() ++message(STATUS "qmlplugindump failed for @MODULE_NAME@.") ++set(@GENMODULE@_FOUND FALSE) ++endif() + endif() + + find_package_handle_standard_args(@GENMODULE@ +-- +2.24.0 +
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 11440669ef79d268e9c108281cced1cff1761210 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 2 17:00:04 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 3 05:03:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11440669 kde-frameworks/extra-cmake-modules: ALLARCHES stable Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild index 2a81fd6150d..85906ba2af7 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e46b7bad1e301c3c5475552c92f1470cec287043 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Nov 26 21:00:40 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 2 15:55:12 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46b7bad kde-frameworks/extra-cmake-modules: Mark for ALLARCHES stabilization Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml b/kde-frameworks/extra-cmake-modules/metadata.xml index 2fdbf33d963..ce744e04eaf 100644 --- a/kde-frameworks/extra-cmake-modules/metadata.xml +++ b/kde-frameworks/extra-cmake-modules/metadata.xml @@ -5,4 +5,5 @@ k...@gentoo.org Gentoo KDE Project +
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 3711b047c17bf2b9e4edf2d931ed29e13c5f4413 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 14 18:34:54 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 14 18:35:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3711b047 kde-frameworks/extra-cmake-modules: Fix tests Reported-by: Paolo Pedroni iol.it> Closes: https://bugs.gentoo.org/699804 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.64.0.ebuild | 5 +- .../files/extra-cmake-modules-5.64.0-tests.patch | 124 + 2 files changed, 128 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild index fc744aa15d8..c0a33ce5a2a 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild @@ -31,7 +31,10 @@ RDEPEND=" RESTRICT+=" !test? ( test )" -PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" + "${FILESDIR}/${P}-tests.patch" +) python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch new file mode 100644 index 000..511342cd2b9 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.64.0-tests.patch @@ -0,0 +1,124 @@ +From d2810741c2166354d7c95d4101eea52035d4fdf5 Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" +Date: Mon, 4 Nov 2019 12:04:56 +0100 +Subject: Fix ECMSetupVersion tests for old policy with project() wo/ VERSION + +With min required cmake version now bumped to 3.5, the policy for CMP0048 +needs to be set explicitly to old now to prepare what the tests check. + +Fixup for 5ca01895e3c50322f79feeef5054d7f28b164d68 +--- + tests/ECMSetupVersionTest/old_header/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_simple/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_version_file_abspath/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_version_file_anynewer/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_version_file_exact/CMakeLists.txt | 1 + + tests/ECMSetupVersionTest/old_version_file_samemajor/CMakeLists.txt | 1 + + 9 files changed, 9 insertions(+) + +(limited to 'tests') + +diff --git a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt +index ea5ef2b..2bf8374 100644 +--- a/tests/ECMSetupVersionTest/old_header/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 3.5) + ++cmake_policy(SET CMP0048 OLD) + project(old_header) + + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) +diff --git a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt +index 8fbc211..1080a0e 100644 +--- a/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt b/tests/ECMSetupVersionTest/old_header_abspath/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 3.5) + ++cmake_policy(SET CMP0048 OLD) + project(old_header_abspath) + + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) +diff --git a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt +index 80e670e..30a26fd 100644 +--- a/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt b/tests/ECMSetupVersionTest/old_simple/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 3.5) + ++cmake_policy(SET CMP0048 OLD) + project(old_simple) + + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) +diff --git a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt +index 9d87e14..3e16b99 100644 +--- a/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt b/tests/ECMSetupVersionTest/old_soversion/CMakeLists.txt +@@ -1,5 +1,6 @@ + cmake_minimum_required(VERSION 3.5) + ++cmake_policy(SET CMP0048 OLD) + project(old_soversion) + + set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) +diff --git a/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt b/tests/ECMSetupVersionTest/old_version_file/CMakeLists.txt +index 8544e37..712a55a 100644 +--- a/tests/ECMSetupVersionTest/old_version_fil
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e7164ac3eefe8b88ad386362538cc145b48be32c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 11 07:29:25 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 11 09:33:56 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7164ac3 kde-frameworks/extra-cmake-modules: Add BUILD_TESTING cmakearg Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild index 7baf6aa4ba4..fc744aa15d8 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild @@ -50,10 +50,11 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" -DBUILD_QTHELP_DOCS=$(usex doc) -DBUILD_HTML_DOCS=$(usex doc) -DBUILD_MAN_DOCS=$(usex doc) - -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" + -DBUILD_TESTING=$(usex test) ) cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 91a45774cc1dbbbe8dff4645c7650c3bb0da34a5 Author: Michał Górny gentoo org> AuthorDate: Fri Oct 11 15:35:55 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 11 15:35:55 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a45774 kde-frameworks: Remove *-fbsd KEYWORDS Signed-off-by: Michał Górny gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild | 2 +- kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.62.0.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild index 61889b6a387..ace24c894f9 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86" IUSE="doc test" BDEPEND=" diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.62.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.62.0.ebuild index b32d244d967..b3ba591a28e 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.62.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.62.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: b0938bf3f8861beb3e6dd5dba2db0ad3a07cefd7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 28 09:37:39 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 28 09:38:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0938bf3 kde-frameworks/extra-cmake-modules: 5.60.0 allarches stable Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild index a605a3ef6c6..61889b6a387 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.60.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd" +KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 083456fb31257bdec3e1a39db7ff1f69eeddcc3d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 16 12:39:07 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 16 12:41:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=083456fb kde-frameworks/extra-cmake-modules: 5.57 ppc,ppc64,x86 stable ALLARCHES Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild index a605a3ef6c6..b7ca395d9d3 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.57.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" IUSE="doc test" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: a56a804593126014855c235b7f39c7c16f15af2f Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 17 22:09:06 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 17 22:40:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56a8045 kde-frameworks/extra-cmake-modules: Fix unused CMake variable warning Closes: https://bugs.gentoo.org/680256 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild index 3a8e3d7b382..b32d244d967 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.56.0.ebuild @@ -43,6 +43,13 @@ pkg_setup() { use doc && python-any-r1_pkg_setup } +src_prepare() { + kde5_src_prepare + # Requires PyQt5, bug #680256 + sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \ + tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests" +} + src_configure() { local mycmakeargs=( -DBUILD_QTHELP_DOCS=$(usex doc) @@ -50,7 +57,6 @@ src_configure() { -DBUILD_MAN_DOCS=$(usex doc) -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" ) - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) kde5_src_configure }
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/
commit: 5b18d984c1f305d8dc873d0ed8e5bc3db445d4d4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Feb 9 15:29:50 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Feb 9 15:30:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b18d984 kde-frameworks/extra-cmake-modules: Add missing patch Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.55.0-clazy-1.5.patch | 41 ++ 1 file changed, 41 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch new file mode 100644 index 000..0ac07a60ee2 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.55.0-clazy-1.5.patch @@ -0,0 +1,41 @@ +From ba3341c83b186e021337761e5fd689614fe14177 Mon Sep 17 00:00:00 2001 +From: Elvis Angelaccio +Date: Sat, 2 Feb 2019 18:46:27 +0100 +Subject: Fix ENABLE_CLAZY option with clazy >= 1.5 + +Summary: +clazy 1.5 renamed its plugin from from `ClangLazy.so` to +`ClazyPlugin.so` and from `clang-lazy` to `clazy`. + +Reviewers: apol, smartins + +Subscribers: kde-frameworks-devel, kde-buildsystem + +Tags: #frameworks, #build_system + +Differential Revision: https://phabricator.kde.org/D18680 +--- + kde-modules/KDECMakeSettings.cmake | 7 ++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake +index 3f7f5a8..17d79a0 100644 +--- a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake +@@ -293,7 +293,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + option(ENABLE_CLAZY "Enable Clazy warnings" OFF) + + if(ENABLE_CLAZY) +-set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") ++find_library(CLAZY_v1_5_FOUND ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX}) ++if(CLAZY_v1_5_FOUND) # clazy >= 1.5 ++set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClazyPlugin${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clazy") ++else() # clazy < 1.5 ++set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_CXX_COMPILE_OBJECT} -Xclang -load -Xclang ClangLazy${CMAKE_SHARED_LIBRARY_SUFFIX} -Xclang -add-plugin -Xclang clang-lazy") ++endif() + endif() + endif() + +-- +cgit v1.1 +
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: b4810c5739b28b61ad3922a8d4f80d1d392e0902 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 6 18:11:37 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 6 18:11:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4810c57 kde-frameworks/extra-cmake-modules: 5.54.0 ppc/ppc64 ALLARCHES stable Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild index 2ec3eb999f3..7d9d2f30c7b 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.54.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: cb6d8776b126c76e4c84aae443d839841f35a175 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 5 22:45:08 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 5 23:46:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6d8776 kde-frameworks/extra-cmake-modules: Add missing USE=doc DEPEND Reported-by: Nick Bowler draconx.ca> Closes: https://bugs.gentoo.org/674532 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild | 3 ++- kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild index 9f3d2cfead0..50ce271fe96 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,6 +22,7 @@ DEPEND=" doc? ( ${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + $(add_qt_dep qthelp) ) test? ( $(add_qt_dep qtcore) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild index 4f32e710bac..1d15c03c25d 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.53.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,6 +22,7 @@ DEPEND=" doc? ( ${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + $(add_qt_dep qthelp) ) test? ( $(add_qt_dep qtcore)
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 043b970a7def992bd730f5ca32ce14d4b9160457 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 1 18:03:56 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 1 18:03:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043b970a kde-frameworks/extra-cmake-modules: 5.52.0 ALLARCHES stable Closes: https://bugs.gentoo.org/671822 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild index a3e7712945f..9f3d2cfead0 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 072ad719c6c03a0d303800152caedfa7b8f4cdfe Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 18 09:05:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 18 09:36:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072ad719 kde-frameworks/extra-cmake-modules: FindQHelpGenerator: Find Qt5Help Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.52.0-r1.ebuild | 68 ++ ...ake-modules-5.52.0-fix-FindQHelpGenerator.patch | 47 +++ 2 files changed, 115 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild new file mode 100644 index 000..058394d8887 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +ECM_KDEINSTALLDIRS="false" +KDE_AUTODEPS="false" +KDE_DEBUG="false" +KDE_QTHELP="false" +KDE_TEST="false" +inherit kde5 python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" +IUSE="doc test" + +DEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + ) + test? ( + $(add_qt_dep qtcore) + $(add_qt_dep linguist-tools) + ) +" +RDEPEND=" + app-arch/libarchive[bzip2] +" + +PATCHES=( + "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" + "${FILESDIR}/${P}-fix-FindQHelpGenerator.patch" +) + +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_QTHELP_DOCS=$(usex doc) + -DBUILD_HTML_DOCS=$(usex doc) + -DBUILD_MAN_DOCS=$(usex doc) + -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" + ) + use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) + + kde5_src_configure +} + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + # ECMPoQmToolsTest is broken, bug #627806 + local myctestargs=( + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + ) + + kde5_src_test +} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch new file mode 100644 index 000..9e4200121fe --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.52.0-fix-FindQHelpGenerator.patch @@ -0,0 +1,47 @@ +From 96d169b87292d935646b1924952829b0f4d5d669 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Sat, 17 Nov 2018 08:57:09 +0100 +Subject: FindQHelpGenerator: try to find Qt5Help instead of Qt5Core + +Summary: +The Qt5Help CMake modules contain the Qt5::qhelpgenerator target, so +look for that instead of Qt5Core. Otherwise, the Qt5::qhelpgenerator +is available only if Qt5Help was searched previously (which does not +happen often). + +Using the Qt5::qhelpgenerator is more reliable than the search for the +qhelpgenerator executable based on the qmake path. + +Test Plan: +build some framework with -DBUILD_QCH=ON, and notice that +the right path of qhelpgenerator is found directly with the +Qt5::qhelpgenerator target. + +Reviewers: kossebau + +Reviewed By: kossebau + +Subscribers: kde-frameworks-devel, kde-buildsystem + +Tags: #frameworks, #build_system + +Differential Revision: https://phabricator.kde.org/D16938 +--- + find-modules/FindQHelpGenerator.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/find-modules/FindQHelpGenerator.cmake b/find-modules/FindQHelpGenerator.cmake +index 50aef27..272e587 100644 +--- a/find-modules/FindQHelpGenerator.cmake b/find-modules/FindQHelpGenerator.cmake +@@ -33,7 +33,7 @@ + # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #= + +-find_package(Qt5Core QUIET) ++find_package(Qt5Help QUIET) + if (TARGET Qt5::qhelpgenerator) + get_target_property(QHelpGenerator_EXECUTABLE Qt5::qhelpgenerator LOCATION) + else() +-- +cgit v0.11.2
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: fbd7c59d80e6367a5d552078606b32b3b53b2ceb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 18 09:07:52 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 18 09:36:53 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd7c59d kde-frameworks/extra-cmake-modules: Drop 5.52.0 (r0) Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules-5.52.0.ebuild | 65 -- 1 file changed, 65 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0.ebuild deleted file mode 100644 index 4f32e710bac..000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.52.0.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) -ECM_KDEINSTALLDIRS="false" -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_QTHELP="false" -KDE_TEST="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" -IUSE="doc test" - -DEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_QTHELP_DOCS=$(usex doc) - -DBUILD_HTML_DOCS=$(usex doc) - -DBUILD_MAN_DOCS=$(usex doc) - -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" - ) - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) - - kde5_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - local myctestargs=( - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" - ) - - kde5_src_test -}
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 3635ec05538933d41f84075292a887c91d8cd985 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 10 18:02:47 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 11 18:35:09 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3635ec05 kde-frameworks/extra-cmake-modules: allarches stable Signed-off-by: Andreas Sturmlechner gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild index 447cedb9643..3b13c99a355 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild @@ -15,7 +15,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: baf4366a47ebf04c794108bb4fca5abfe1700464 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 30 08:15:10 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 30 08:38:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baf4366a kde-frameworks/extra-cmake-modules: Bind BUILD_QTHELP_DOCS to USE=doc Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Andreas Sturmlechner gentoo.org> .../extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild index 5c672c66a8d..4f32e710bac 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild @@ -44,9 +44,10 @@ pkg_setup() { src_configure() { local mycmakeargs=( - -DBUILD_HTML_DOCS="$(usex doc)" - -DBUILD_MAN_DOCS="$(usex doc)" - -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" + -DBUILD_QTHELP_DOCS=$(usex doc) + -DBUILD_HTML_DOCS=$(usex doc) + -DBUILD_MAN_DOCS=$(usex doc) + -DDOC_INSTALL_DIR=/usr/share/doc/"${PF}" ) use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: c0bebb60eecd2ea6da965080fa63acae175e33dd Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 29 21:05:28 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 30 08:38:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0bebb60 kde-frameworks/extra-cmake-modules: Fix src_configure Package-Manager: Portage-2.3.50, Repoman-2.3.11 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild index 74bb9282f34..5c672c66a8d 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.50.0.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +ECM_KDEINSTALLDIRS="false" KDE_AUTODEPS="false" KDE_DEBUG="false" KDE_QTHELP="false" @@ -49,7 +50,7 @@ src_configure() { ) use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) - cmake-utils_src_configure + kde5_src_configure } src_test() {
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: a49d8c2a95711b9f166c59e3be0df26b75b88290 Author: Michael Palimaka gentoo org> AuthorDate: Sun Aug 19 14:03:30 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Aug 19 14:07:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49d8c2a kde-frameworks/extra-cmake-modules: avoid build failure with GCC8 and ld.gold Bug: https://bugs.gentoo.org/663512 Package-Manager: Portage-2.3.44, Repoman-2.3.10 0.ebuild => extra-cmake-modules-5.49.0-r1.ebuild} | 2 ++ ...extra-cmake-modules-5.49.0-no-fatal-warnings.patch | 19 +++ 2 files changed, 21 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild similarity index 95% rename from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild rename to kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild index 376fd431589..7003678df8f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.49.0-r1.ebuild @@ -31,6 +31,8 @@ RDEPEND=" app-arch/libarchive[bzip2] " +PATCHES=( "${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch" ) + python_check_deps() { has_version "dev-python/sphinx[${PYTHON_USEDEP}]" } diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch new file mode 100644 index 000..f71d19d5fc8 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.49.0-no-fatal-warnings.patch @@ -0,0 +1,19 @@ +Avoid triggering a build failure with GCC8 and ld.gold producing warnings. + +Bug: https://bugs.gentoo.org/663512 + +diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake +index 44358fb..0270aa5 100644 +--- a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake +@@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)) + # Linker warnings should be treated as errors +-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") +-set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}") ++#set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") ++#set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_MODULE_LINKER_FLAGS}") + + # Do not allow undefined symbols, even in non-symbolic shared libraries + set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: c529aadf3debfd046347a0fdf6521a19e10ecbf8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 10 20:17:27 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 10 20:17:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c529aadf kde-frameworks/extra-cmake-modules: 5.46.0 ppc/ppc64 ALLARCHES stable Bug: https://bugs.gentoo.org/656330 Package-Manager: Portage-2.3.40, Repoman-2.3.9 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild index d5cb5b137fc..a557df1f65c 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.46.0.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-fbsd" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e928dde180adb5894bd946583d7e193f2cc38fae Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 6 19:04:56 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 10 14:16:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e928dde1 kde-frameworks/extra-cmake-modules: De-stabilise arm Package-Manager: Portage-2.3.36, Repoman-2.3.9 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild index dc003c96c9f..4e7d895d7fe 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 122a5125fab006072b5239f0e2b61a5eeae4d026 Author: Michał Górny gentoo org> AuthorDate: Tue Mar 13 19:43:22 2018 + Commit: Michał Górny gentoo org> CommitDate: Tue Mar 13 19:51:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122a5125 kde-frameworks/extra-cmake-modules: Tested on ~amd64-fbsd kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild index 8b14f01dc79..376fd431589 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.44.0.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: d445126125e03f8d193bc24143c0eefd41242940 Author: Michael Palimaka gentoo org> AuthorDate: Sun Mar 11 12:38:46 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Mar 11 12:38:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4451261 kde-frameworks/extra-cmake-modules: stabilise 5.43.0 for arm/ppc/ppc64 using ALLARCHES Package-Manager: Portage-2.3.19, Repoman-2.3.6 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild index 8b271d0dca5..dc003c96c9f 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.43.0.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 0b20f4f1e705cfdaeffb8bb40ecf9542574a9dd2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 31 15:14:57 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jan 31 15:14:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b20f4f1 kde-frameworks/extra-cmake-modules: Update patch by upstream review Package-Manager: Portage-2.3.21, Repoman-2.3.6 ...ebuild => extra-cmake-modules-5.42.0-r1.ebuild} | 0 ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 55 ++ 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild similarity index 100% rename from kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild rename to kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0-r1.ebuild diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch index d1bcf791fd4..a5b12aac357 100644 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch @@ -1,6 +1,6 @@ -From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001 +From 099fc991b85e91aa4bbfd20ba005f0c3a0002f97 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner -Date: Sat, 2 Dec 2017 19:04:10 +0100 +Date: Wed, 31 Jan 2018 15:32:46 +0100 Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump Summary: @@ -11,28 +11,65 @@ Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. Reviewers: apol -Subscribers: #frameworks, #build_system +Subscribers: aacid, dfaure, cgiboudeaux, #frameworks, #build_system Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D9116 --- - modules/ECMFindQMLModule.cmake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + modules/ECMFindQMLModule.cmake.in | 5 - + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in -index 428d60a..d72c52b 100644 +index 428d60a..8109ab8 100644 --- a/modules/ECMFindQMLModule.cmake.in +++ b/modules/ECMFindQMLModule.cmake.in -@@ -27,7 +27,7 @@ +@@ -26,8 +26,11 @@ + #= include(FindPackageHandleStandardArgs) ++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") -find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump) -+find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) ++query_qmake(qt_binaries_dir QT_INSTALL_BINS) ++ ++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS ${qt_binaries_dir}) if(NOT QMLPLUGINDUMP_PROGRAM) message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.") endif() -- -2.15.1 +2.16.1 + +From 3e3ac52aef1bbe22d293a05253c69b755f59428c Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 31 Jan 2018 15:58:10 +0100 +Subject: [PATCH] FindQtWaylandScanner.cmake: Use qmake-query for HINT + +Instead of hardcoded /usr/lib, same solution as in D9116 +--- + find-modules/FindQtWaylandScanner.cmake | 5 - + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake +index 79a1b05..37ebbdb 100644 +--- a/find-modules/FindQtWaylandScanner.cmake b/find-modules/FindQtWaylandScanner.cmake +@@ -86,11 +86,14 @@ + #= + + include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake) ++include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") + + ecm_find_package_version_check(QtWaylandScanner) + ++query_qmake(qt_binaries_dir QT_INSTALL_BINS) ++ + # Find qtwaylandscanner +-find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/) ++find_program(QtWaylandScanner_EXECUTABLE NAMES qtwaylandscanner HINTS ${qt_binaries_dir}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(QtWaylandScanner +-- +2.16.1
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 00066137e4b81a48daf0960db942ec46b77bbc25 Author: David Seifert gentoo org> AuthorDate: Sun Dec 10 17:08:24 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Dec 10 17:14:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00066137 kde-frameworks/extra-cmake-modules: stabilise 5.40.0-r1 for ppc64 using ALLARCHES Package-Manager: Portage-2.3.16, Repoman-2.3.6 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild index 36036462fbd..fb737e2f204 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: bc892623b31a5e3a039606daf43ca48628b0d06b Author: David Seifert gentoo org> AuthorDate: Sun Dec 10 17:12:02 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Dec 10 17:14:19 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc892623 kde-frameworks/extra-cmake-modules: stabilise 5.40.0-r1 for arm using ALLARCHES Package-Manager: Portage-2.3.16, Repoman-2.3.6 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild index fb737e2f204..9e3b717fdaf 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 134208f4aa164359cea882a7a100ea837cd7b771 Author: Michael Palimaka gentoo org> AuthorDate: Sun Dec 10 12:14:22 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Dec 10 12:15:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134208f4 kde-frameworks/extra-cmake-modules: stabilise 5.40.0-r1 for ppc using ALLARCHES Package-Manager: Portage-2.3.14, Repoman-2.3.6 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild index 624f852a71c..36036462fbd 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 66ff66d0157c6306aa890c6940139212809a78b0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 2 18:30:20 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 2 18:33:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ff66d0 kde-frameworks/extra-cmake-modules: Drop 5.40.0 (r0) Package-Manager: Portage-2.3.16, Repoman-2.3.6 .../extra-cmake-modules-5.40.0.ebuild | 61 -- 1 file changed, 61 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild deleted file mode 100644 index f565f9c0be7..000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 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} ) -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_QTHELP="false" -KDE_TEST="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="doc test" - -DEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HTML_DOCS="$(usex doc)" - -DBUILD_MAN_DOCS="$(usex doc)" - -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" - ) - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) - - cmake-utils_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - # ECMPoQmToolsTest is broken, bug #627806 - local myctestargs=( - -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" - ) - - kde5_src_test -}
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
commit: 13dec085bcd84e7c7c67ae53cd5152c08bc9213e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 2 18:29:26 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 2 18:33:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13dec085 kde-frameworks/extra-cmake-modules: Fix ECMFindQMLModule.cmake.in See also: https://phabricator.kde.org/D9116 Bug: https://bugs.gentoo.org/639460 Package-Manager: Portage-2.3.16, Repoman-2.3.6 kde-frameworks/extra-cmake-modules/Manifest| 2 +- .../extra-cmake-modules-5.40.0-r1.ebuild | 63 ++ ...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 + 3 files changed, 102 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index a5966730bab..f466f82d096 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,2 +1,2 @@ DIST extra-cmake-modules-5.37.0.tar.xz 311696 SHA256 26198cf05c084c158bb23f0585a9df5bba1aa16b746252c80bdf4f0261b527cb SHA512 eb064dcf03960913c41c61dcb02ed12fa1b83abe507f9b161770bae8fe32b74dee45a29b12af26e636e896b97b17221adf67ea8465fcc9ab319b4ee55ab4f8bf WHIRLPOOL 0085edc89a6ac6369b509cd16ee79447f3d6c924aa06ca8bf73471772ae03afd8d57223fad70c5d5e4e3256ffc12e1de0b9176dfdbb2526015b41230a16da12d -DIST extra-cmake-modules-5.40.0.tar.xz 312532 SHA256 83e48889c84474e4f560e10e4eea0cc529f8511b3bd0415fcb898ac0496e630a SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c WHIRLPOOL 8b41b776a90c4126c9291a0bd7cde6a417240e0976b6d3325fbe7d534a90bf51e9f36871b76ebe9a11e06510367620fe63351e625b4b4665b896ed7f17ecd201 +DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild new file mode 100644 index 000..76f08e6ba7c --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.40.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 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} ) +KDE_AUTODEPS="false" +KDE_DEBUG="false" +KDE_QTHELP="false" +KDE_TEST="false" +inherit kde5 python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"; + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="doc test" + +DEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + ) + test? ( + $(add_qt_dep qtcore) + $(add_qt_dep linguist-tools) + ) +" +RDEPEND=" + app-arch/libarchive[bzip2] +" + +PATCHES=( "${FILESDIR}/${P}-qmlplugindump-path.patch" ) + +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_HTML_DOCS="$(usex doc)" + -DBUILD_MAN_DOCS="$(usex doc)" + -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" + ) + use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) + + cmake-utils_src_configure +} + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + # ECMPoQmToolsTest is broken, bug #627806 + local myctestargs=( + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" + ) + + kde5_src_test +} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch new file mode 100644 index 000..d1bcf791fd4 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch @@ -0,0 +1,38 @@ +From 32d596b8c64c1c963b053788f67ef012b836 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Sat, 2 Dec 2017 19:04:10 +0100 +Subject: [PATCH] Make sure to search for Qt5-based qmlplugindump + +Summary: +Without any hint, qmlplugindump version is whatever default is set by qtchooser. +Fix uses the same approach as FindQtWaylandScanner.cmake. + +Test Plan: ecm_find_qmlmodule now works properly for e.g. kirigami. + +Reviewers: apol + +Subscribers: #frameworks, #build_system + +Tags: #frameworks, #build_system + +Differential Revision: h
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 1adc6dbf22a8a1fff4084e1b00cae4794c4a244d Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 16 11:33:25 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 16 12:27:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1adc6dbf kde-frameworks/extra-cmake-modules: Revert hppa ALLARCHES stable This reverts commit 287cefbc6f82a4622f9bca7370d745ed58a9839e. kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild index 28f65ffe267..a3875005ed0 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 287cefbc6f82a4622f9bca7370d745ed58a9839e Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 13 19:27:18 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 13 19:30:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287cefbc kde-frameworks/extra-cmake-modules: hppa ALLARCHES stable Maintainer stabilisation. Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild index a3875005ed0..28f65ffe267 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" +KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: fd0de387959fb48cf05eba85b94161cca18b062c Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 13 14:48:25 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 13 19:30:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0de387 kde-frameworks/extra-cmake-modules: Drop 5.34.0 Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-frameworks/extra-cmake-modules/Manifest| 1 - .../extra-cmake-modules-5.34.0.ebuild | 58 -- 2 files changed, 59 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest index 218a1f81834..8648b8ca41c 100644 --- a/kde-frameworks/extra-cmake-modules/Manifest +++ b/kde-frameworks/extra-cmake-modules/Manifest @@ -1,3 +1,2 @@ -DIST extra-cmake-modules-5.34.0.tar.xz 312800 SHA256 05da02a2db64d20a7a92be6dc642df39da39f957dea8fba9bcb99fb3f3f66de4 SHA512 afea8dce05e8dcb10e5c32d5062e550da19802179155d68d8282b048e7eedcb66461160e6c7da9a2b2f46d3f7398f7883a8cb5ed7cc9064214fb45ad3f127873 WHIRLPOOL dd96c53727cbb2d9c6830adde5a2c29acf3822277534fe3173577d98aa375ead2193f3bf1ae1857ec25e7cf0a012a1e2b66b00a1321caf0789a4528e921c836c DIST extra-cmake-modules-5.37.0.tar.xz 311696 SHA256 26198cf05c084c158bb23f0585a9df5bba1aa16b746252c80bdf4f0261b527cb SHA512 eb064dcf03960913c41c61dcb02ed12fa1b83abe507f9b161770bae8fe32b74dee45a29b12af26e636e896b97b17221adf67ea8465fcc9ab319b4ee55ab4f8bf WHIRLPOOL 0085edc89a6ac6369b509cd16ee79447f3d6c924aa06ca8bf73471772ae03afd8d57223fad70c5d5e4e3256ffc12e1de0b9176dfdbb2526015b41230a16da12d DIST extra-cmake-modules-5.38.0.tar.xz 312532 SHA256 6188a8ac8d799439204f69a1eb229431fc9f196790b88d6fb72bb3d57edb2332 SHA512 c1fd65593732e57fb0822fd5bc2b06f9e35713a78f35269f387f6d9e4c87520b46f3cde039a42993139b478da5aebf1764d0111746af75bb0e5a33822684e501 WHIRLPOOL f4bf5e501f28d9e501b67772b8822eb72af934f37710d085dad6259544e1cf0e1081e18a7967e6439f126699891420014ea014f16b1080491079bd4d1dec61a6 diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.34.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.34.0.ebuild deleted file mode 100644 index 401fc1470af..000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.34.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 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} ) -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_TEST="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"; - -LICENSE="BSD" -KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86" -IUSE="doc test" - -DEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON - -DBUILD_HTML_DOCS="$(usex doc)" - -DBUILD_MAN_DOCS="$(usex doc)" - -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" - ) - - cmake-utils_src_configure -} - -src_test() { - local myctestargs=( - -E "(ECMToolchainAndroidTest|KDEInstallDirsTest.relative_or_absolute_usr)" - ) - - kde5_src_test -}
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 191c397fb1dd504e04cbdefe6f48bc1f5056e2c1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Sep 12 18:01:35 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Sep 12 20:32:51 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=191c397f kde-frameworks/extra-cmake-modules: arm/ppc/ppc64 ALLARCHES stable Maintainer stabilisation. Package-Manager: Portage-2.3.6, Repoman-2.3.1 kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild index e26e294f3dc..a3875005ed0 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Extra modules and scripts for CMake" HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"; LICENSE="BSD" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86" +KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86" IUSE="doc test" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 1ed40691c0e230d4c362ace76d7847d7c137d6bb Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 3 15:19:11 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 3 15:19:36 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed40691 kde-frameworks/extra-cmake-modules: Disable broken test Gentoo-bug: 627806 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild index a1079a58999..6cb0dc2df74 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild @@ -52,8 +52,9 @@ src_configure() { src_test() { # ECMToolchainAndroidTest passes but then breaks src_install + # ECMPoQmToolsTest is broken, bug #627806 local myctestargs=( - -E "(ECMToolchainAndroidTest)" + -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)" ) kde5_src_test
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 4471820ca78d6d360a37c46da30cc94e826c2f51 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 15 07:55:54 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 15 09:10:54 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4471820c kde-frameworks/extra-cmake-modules: Drop ECMAddTest patch Seems like a dead end. Package-Manager: Portage-2.3.7, Repoman-2.3.3 .../extra-cmake-modules-5.37.0-r1.ebuild | 60 ++ 1 file changed, 60 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild new file mode 100644 index 000..a1079a58999 --- /dev/null +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2017 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} ) +KDE_AUTODEPS="false" +KDE_DEBUG="false" +KDE_QTHELP="false" +KDE_TEST="false" +inherit kde5 python-any-r1 + +DESCRIPTION="Extra modules and scripts for CMake" +HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"; + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="doc test" + +DEPEND=" + doc? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') + ) + test? ( + $(add_qt_dep qtcore) + $(add_qt_dep linguist-tools) + ) +" +RDEPEND=" + app-arch/libarchive[bzip2] +" + +python_check_deps() { + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_HTML_DOCS="$(usex doc)" + -DBUILD_MAN_DOCS="$(usex doc)" + -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" + ) + use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) + + cmake-utils_src_configure +} + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + local myctestargs=( + -E "(ECMToolchainAndroidTest)" + ) + + kde5_src_test +}
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/files/, kde-frameworks/extra-cmake-modules/
commit: 51e316e8aa8dded60a0b5decbd2e0943828146c9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 15 09:10:34 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 15 09:10:55 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51e316e8 kde-frameworks/extra-cmake-modules: Drop old Package-Manager: Portage-2.3.7, Repoman-2.3.3 .../extra-cmake-modules-5.37.0.ebuild | 62 -- .../extra-cmake-modules-5.37.0-ecmaddtest.patch| 74 -- 2 files changed, 136 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0.ebuild deleted file mode 100644 index 231e84818f0..000 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.37.0.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2017 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} ) -KDE_AUTODEPS="false" -KDE_DEBUG="false" -KDE_QTHELP="false" -KDE_TEST="false" -inherit kde5 python-any-r1 - -DESCRIPTION="Extra modules and scripts for CMake" -HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"; - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="doc test" - -DEPEND=" - doc? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) - test? ( - $(add_qt_dep qtcore) - $(add_qt_dep linguist-tools) - ) -" -RDEPEND=" - app-arch/libarchive[bzip2] -" - -PATCHES=( "${FILESDIR}/${P}-ecmaddtest.patch" ) - -python_check_deps() { - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HTML_DOCS="$(usex doc)" - -DBUILD_MAN_DOCS="$(usex doc)" - -DDOC_INSTALL_DIR="/usr/share/doc/${PF}" - ) - use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON ) - - cmake-utils_src_configure -} - -src_test() { - # ECMToolchainAndroidTest passes but then breaks src_install - local myctestargs=( - -E "(ECMToolchainAndroidTest)" - ) - - kde5_src_test -} diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch deleted file mode 100644 index fe867541889..000 --- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.37.0-ecmaddtest.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b99d2d2c5dedcaba9745dddc1dd7b8d4811babf1 Mon Sep 17 00:00:00 2001 -From: Kevin Funk -Date: Mon, 7 Aug 2017 15:50:25 +0200 -Subject: RFC: Make ECMAddTests respect BUILD_TESTING - -Summary: -Use-case: Make building unit tests optional, by just following the CMake -BUILD_TESTING option. - -The usual approach to conditionally build tests is to do: -``` -if (BUILD_TESTING) -add_executable(TestOne TestOne.cpp) -target_link_libraries(TestOne my_library) -endif() -``` - -or: - -``` -if (BUILD_TESTING) -add_subdirectory(tests) -endif() -``` - -This patch just turns all calls to ecm_add_test(...) into no-ops if -BUILD_TESTING=OFF. - -See: - https://cmake.org/cmake/help/v3.6/module/CTest.html - -Reviewers: vkrause - -Reviewed By: vkrause - -Subscribers: kossebau, vkrause, elvisangelaccio, asturmlechner, apol, #frameworks, #build_system - -Tags: #frameworks, #build_system - -Differential Revision: https://phabricator.kde.org/D7187 - modules/ECMAddTests.cmake | 10 ++ - 1 file changed, 10 insertions(+) - -diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake -index 9667388..c77a7aa 100644 a/modules/ECMAddTests.cmake -+++ b/modules/ECMAddTests.cmake -@@ -49,6 +49,12 @@ - # be given; this will be used for both the target and test names (and, as with - # ecm_add_tests(), the NAME_PREFIX argument will be prepended to the test name). - # -+# If BUILD_TESTING is set to OFF, ecm_add_test will turn into a no-op and thus -+# will not add any test-related targets -+# -+# BUILD_TESTING is created as a cache variable by the CTest module and by the -+# :kde-module:`KDECMakeSettings` module. -+# - # - # Since pre-1.0.0. - -@@ -84,6 +90,10 @@ include(ECMMarkAsTest) - include(ECMMarkNonGuiExecutable) - - function(ecm_add_test) -+ if(NOT BUILD_TESTING) -+ return() # turn this function into a no-op -+ endif() -+ - set(options GUI) - # TARGET_NAME_VAR and TEST_NAME_VAR are undocumented args used by - # ecm_add_tests --- -cgit v0.11.2
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: e71ff8a49cd79225acfbf8eb647b3be27ca6c68c Author: Michael Palimaka gentoo org> AuthorDate: Mon Jul 10 12:05:35 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jul 10 12:05:48 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71ff8a4 kde-frameworks/extra-cmake-modules: restrict broken test Gentoo-bug: 624408 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild| 9 + 1 file changed, 9 insertions(+) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild index 9f9bcda4685..ff23b376c2d 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild @@ -49,3 +49,12 @@ src_configure() { cmake-utils_src_configure } + +src_test() { + # ECMToolchainAndroidTest passes but then breaks src_install + local myctestargs=( + -E "(ECMToolchainAndroidTest)" + ) + + kde5_src_test +}
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/
commit: 750a9235c97fb74d26856f07d609a74c60b011f6 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jul 9 14:07:44 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jul 9 14:14:55 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=750a9235 kde-frameworks/extra-cmake-modules: unrestrict fixed tests Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild | 8 1 file changed, 8 deletions(-) diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild index 9bcac075430..9f9bcda4685 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.36.0.ebuild @@ -49,11 +49,3 @@ src_configure() { cmake-utils_src_configure } - -src_test() { - local myctestargs=( - -E "(ECMToolchainAndroidTest|KDEInstallDirsTest.relative_or_absolute_usr)" - ) - - kde5_src_test -}