mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-17 02:39:08 -07:00
kde-frameworks/extra-cmake-modules: Silence cmake warnings
Allen Winter (1):
CMakeLists.txt - remove trailing '/' to fix CMP0177 warning
Friedrich W. H. Kossebau (1):
ECMSetupQtPluginMacroNames: fix setting up names for own build
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
@@ -0,0 +1,82 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
QTMIN=6.7.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]"
|
||||
DEPEND="
|
||||
test? (
|
||||
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:6
|
||||
)
|
||||
"
|
||||
BDEPEND="
|
||||
doc? (
|
||||
${PYTHON_DEPS}
|
||||
$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
|
||||
>=dev-qt/qttools-${QTMIN}:6[assistant]
|
||||
)
|
||||
test? (
|
||||
>=dev-qt/qtbase-${QTMIN}:6
|
||||
>=dev-qt/qttools-${QTMIN}:6[linguist]
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
|
||||
"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
|
||||
"${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"
|
||||
"${FILESDIR}/${P}-ECMSetupQtPluginMacroNames.patch" # in 6.20
|
||||
"${FILESDIR}/${P}-fix-CMP0177-warning.patch" # in 6.20
|
||||
)
|
||||
|
||||
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)
|
||||
)
|
||||
if use test; then
|
||||
mycmakeargs+=( -DQT_MAJOR_VERSION=6 ) # bug 938316
|
||||
fi
|
||||
|
||||
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
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
From ce890f958bf86f4af4a2357e73709d4338c35588 Mon Sep 17 00:00:00 2001
|
||||
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
|
||||
Date: Tue, 7 Oct 2025 13:33:01 +0200
|
||||
Subject: [PATCH] ECMSetupQtPluginMacroNames: fix setting up names for own
|
||||
build
|
||||
|
||||
* asturm 2025-10-09: amends b18a78882894b813aec21a64f9d5e4ee358a1143 (in 6.18)
|
||||
|
||||
---
|
||||
modules/ECMSetupQtPluginMacroNames.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/ECMSetupQtPluginMacroNames.cmake b/modules/ECMSetupQtPluginMacroNames.cmake
|
||||
index 1e023211..22658df0 100644
|
||||
--- a/modules/ECMSetupQtPluginMacroNames.cmake
|
||||
+++ b/modules/ECMSetupQtPluginMacroNames.cmake
|
||||
@@ -139,7 +139,7 @@ macro(ecm_setup_qtplugin_macro_names)
|
||||
|
||||
|
||||
# CMAKE_AUTOMOC_MACRO_NAMES
|
||||
- list(APPEND CMAKE_AUTOMOC_MACRO_NAMES $[_macro_names})
|
||||
+ list(APPEND CMAKE_AUTOMOC_MACRO_NAMES ${_macro_names})
|
||||
|
||||
# CMAKE_AUTOMOC_DEPEND_FILTERS
|
||||
# CMake's automoc needs help to find names of plugin metadata files in case Q_PLUGIN_METADATA
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 850ef6c884f24773abced96ba65cf497aae946e1 Mon Sep 17 00:00:00 2001
|
||||
From: Allen Winter <winter@kde.org>
|
||||
Date: Thu, 2 Oct 2025 09:10:21 -0400
|
||||
Subject: [PATCH] CMakeLists.txt - remove trailing '/' to fix CMP0177 warning
|
||||
|
||||
KDE_MODULES_INSTALL_DIR needs to be normalized for
|
||||
the install(PROGRAMS) command. The easiest solution
|
||||
is to not have a trailing '/'.
|
||||
|
||||
Fixes:
|
||||
```
|
||||
CMake Warning (dev) at CMakeLists.txt:96 (install):
|
||||
Policy CMP0177 is not set: install() DESTINATION paths are normalized.
|
||||
```
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a8de8636..2896268b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -40,7 +40,7 @@ set(SHARE_INSTALL_DIR share
|
||||
set(CMAKECONFIG_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/cmake/)
|
||||
|
||||
set(FIND_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/find-modules/)
|
||||
-set(KDE_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/kde-modules/)
|
||||
+set(KDE_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/kde-modules)
|
||||
set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/modules/)
|
||||
set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/)
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
Reference in New Issue
Block a user