diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-15 20:57:37 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-04-15 20:57:58 +0200 |
| commit | 2397bbb66c9735355db26be14d2dfbd1fcc0a3b2 (patch) | |
| tree | c302872d7f3feb43646975660d8b61e8a60094b6 /kde-apps/kmouth | |
| parent | kde-apps/ktimer: Fix build with >=KF-5.93 (diff) | |
| download | gentoo-2397bbb66c9735355db26be14d2dfbd1fcc0a3b2.tar.gz gentoo-2397bbb66c9735355db26be14d2dfbd1fcc0a3b2.tar.bz2 gentoo-2397bbb66c9735355db26be14d2dfbd1fcc0a3b2.zip | |
kde-apps/kmouth: Fix build with >=KF-5.93
Closes: https://bugs.gentoo.org/838193
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/kmouth')
| -rw-r--r-- | kde-apps/kmouth/files/kmouth-21.12.3-use-KDECompilerSettings.patch | 53 | ||||
| -rw-r--r-- | kde-apps/kmouth/kmouth-21.12.3.ebuild | 2 |
2 files changed, 55 insertions, 0 deletions
diff --git a/kde-apps/kmouth/files/kmouth-21.12.3-use-KDECompilerSettings.patch b/kde-apps/kmouth/files/kmouth-21.12.3-use-KDECompilerSettings.patch new file mode 100644 index 000000000000..b57440c53477 --- /dev/null +++ b/kde-apps/kmouth/files/kmouth-21.12.3-use-KDECompilerSettings.patch @@ -0,0 +1,53 @@ +From cfb889ab38befe1e378d92ab9915aed14ec5843b Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" <kossebau@kde.org> +Date: Wed, 8 Dec 2021 20:29:29 +0100 +Subject: [PATCH] Use KDECompilerSettings instead of + KDEFrameworkCompilerSettings + +The latter is only for KF modules to use. + +Also include the KDE cmake modules as first thing, as their settings +can influence other included macros. + +GIT_SILENT +--- + CMakeLists.txt | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9b89f16..42f1b5b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,18 +14,25 @@ set(QT_MIN_VERSION "5.15.0") + set(KF5_MIN_VERSION "5.85.0") + + +-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core PrintSupport TextToSpeech Xml Widgets) +- + find_package(ECM ${KF5_MIN_VERSION} NO_MODULE REQUIRED) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) + +-include(ECMAddAppIcon) + include(KDEInstallDirs) + include(KDECMakeSettings) +-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++ ++include(ECMAddAppIcon) + include(ECMInstallIcons) + include(ECMAddAppIcon) + ++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS ++ Core ++ PrintSupport ++ TextToSpeech ++ Xml ++ Widgets ++) ++ + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + Crash + Completion +-- +GitLab + diff --git a/kde-apps/kmouth/kmouth-21.12.3.ebuild b/kde-apps/kmouth/kmouth-21.12.3.ebuild index 1bd3c50ae49c..7e3dd81478e2 100644 --- a/kde-apps/kmouth/kmouth-21.12.3.ebuild +++ b/kde-apps/kmouth/kmouth-21.12.3.ebuild @@ -33,3 +33,5 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-use-KDECompilerSettings.patch" ) # bug 838193 |