* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
@ 2017-12-02 18:33 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-12-02 18:33 UTC (permalink / raw
To: gentoo-commits
commit: 13dec085bcd84e7c7c67ae53cd5152c08bc9213e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 2 18:29:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 2 18:33:32 2017 +0000
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
| 2 +-
| 63 ++++++++++++++++++++++
...a-cmake-modules-5.40.0-qmlplugindump-path.patch | 38 +++++++++++++
3 files changed, 102 insertions(+), 1 deletion(-)
--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
--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 00000000000..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 00000000000..d1bcf791fd4
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.40.0-qmlplugindump-path.patch
@@ -0,0 +1,38 @@
+From 32d596b8c64c1c963b053788feeee67ef012b836 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+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: https://phabricator.kde.org/D9116
+---
+ modules/ECMFindQMLModule.cmake.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/ECMFindQMLModule.cmake.in b/modules/ECMFindQMLModule.cmake.in
+index 428d60a..d72c52b 100644
+--- a/modules/ECMFindQMLModule.cmake.in
++++ b/modules/ECMFindQMLModule.cmake.in
+@@ -27,7 +27,7 @@
+
+ include(FindPackageHandleStandardArgs)
+
+-find_program(QMLPLUGINDUMP_PROGRAM qmlplugindump)
++find_program(QMLPLUGINDUMP_PROGRAM NAMES qmlplugindump HINTS /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/bin/)
+ if(NOT QMLPLUGINDUMP_PROGRAM)
+ message(WARNING "Could not find qmlplugindump. It is necessary to look up qml module dependencies.")
+ endif()
+--
+2.15.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
@ 2024-08-15 17:48 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-08-15 17:48 UTC (permalink / raw
To: gentoo-commits
commit: 3e6dcb8a38f69cf8edad355295a2aed5e477f869
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 21:06:19 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 17:46:49 2024 +0000
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 <asturm <AT> gentoo.org>
| 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(+)
--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 000000000000..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 000000000000..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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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 000000000000..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: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 13 Aug 2024 22:15:40 +0200
+Subject: [PATCH] KDEGitCommitHooks.cmake: Add ECM_DISABLE_GIT to silence
+ useless Git search/hooks
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ kde-modules/KDEGitCommitHooks.cmake | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/kde-modules/KDEGitCommitHooks.cmake b/kde-modules/KDEGitCommitHooks.cmake
+index 6122cc7a..fef735a2 100644
+--- a/kde-modules/KDEGitCommitHooks.cmake
++++ b/kde-modules/KDEGitCommitHooks.cmake
+@@ -59,7 +59,12 @@ set(GIT_DIR "${CMAKE_SOURCE_DIR}/.git")
+ set(GIT_HOOKS_DIR "${GIT_DIR}/hooks")
+ set(JSON_SCHEMA_OUT "${GIT_HOOKS_DIR}/scripts/combined.schema.json")
+
++option (ECM_DISABLE_GIT "Disable Git commit hooks (for e.g. distro package build)" OFF)
++
+ function(KDE_CONFIGURE_GIT_PRE_COMMIT_HOOK)
++ if(ECM_DISABLE_GIT)
++ return()
++ endif()
+ set(_oneValueArgs "")
+ set(_multiValueArgs CHECKS CUSTOM_SCRIPTS)
+ cmake_parse_arguments(ARG "" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+--
+2.45.2
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/
@ 2024-08-31 10:47 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-08-31 10:47 UTC (permalink / raw
To: gentoo-commits
commit: c17598fbbaa12c67798d045dc1d6798d494941c9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 15:42:28 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 31 10:47:04 2024 +0000
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 <asturm <AT> gentoo.org>
| 1 -
| 70 --------------------
| 70 --------------------
...make-modules-5.93.0-disable-qmlplugindump.patch | 76 ----------------------
4 files changed, 217 deletions(-)
--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 104e02638042498e9fae486542a30a8f454c11d5c8c7099c10a88e0c34cbfffff1563905a79705ce59a5448af19479ec130bc23182138083e5ff06e312f4c488 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..000000000000
--- 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..000000000000
--- 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]
- )
- 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"
-)
-
-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-5.93.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
deleted file mode 100644
index 06406a7eaf6d..000000000000
--- a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.93.0-disable-qmlplugindump.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1c79ef2189dc156bbe0f182411bcc136f140a21d Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-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=744136
-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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-31 10:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-02 18:33 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/extra-cmake-modules/, kde-frameworks/extra-cmake-modules/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-15 17:48 Andreas Sturmlechner
2024-08-31 10:47 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox