commit: 98c0b03a30e0905e9d56b83e5214cef56d16f224 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Apr 15 18:45:43 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Apr 15 18:57:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98c0b03a
kde-apps/ktimer: Fix build with >=KF-5.93 Closes: https://bugs.gentoo.org/838040 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../ktimer-21.12.3-use-KDECompilerSettings.patch | 49 ++++++++++++++++++++++ kde-apps/ktimer/ktimer-21.12.3.ebuild | 2 + 2 files changed, 51 insertions(+) diff --git a/kde-apps/ktimer/files/ktimer-21.12.3-use-KDECompilerSettings.patch b/kde-apps/ktimer/files/ktimer-21.12.3-use-KDECompilerSettings.patch new file mode 100644 index 000000000000..b096f82c93e0 --- /dev/null +++ b/kde-apps/ktimer/files/ktimer-21.12.3-use-KDECompilerSettings.patch @@ -0,0 +1,49 @@ +From cb9b5d87331a36dc4e80177bbd16c44444d0eb4d Mon Sep 17 00:00:00 2001 +From: "Friedrich W. H. Kossebau" <kosse...@kde.org> +Date: Wed, 8 Dec 2021 20:21:06 +0100 +Subject: [PATCH] Use KDECompilerSettings instead of + KDEFrameworkCompilerSettings + +The latter is only for KF modules to use. + +GIT_SILENT + +* asturmlechner 2022-04-15: Backport to 21.12.3 + +--- + CMakeLists.txt | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0409983..cff6350 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,8 +13,9 @@ find_package (ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + + include(KDEInstallDirs) +-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(KDECMakeSettings) ++include(KDECompilerSettings NO_POLICY_SCOPE) ++ + include(ECMInstallIcons) + include(ECMAddAppIcon) + +@@ -32,8 +33,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + Notifications + ) + +-add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +-add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055600) ++add_definitions( ++ -DQT_DISABLE_DEPRECATED_BEFORE=0x050f00 ++ -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 ++ -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800 ++ -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 ++) + + add_executable(ktimer) + +-- +GitLab + diff --git a/kde-apps/ktimer/ktimer-21.12.3.ebuild b/kde-apps/ktimer/ktimer-21.12.3.ebuild index 8b2868352e7c..b3b1839c4218 100644 --- a/kde-apps/ktimer/ktimer-21.12.3.ebuild +++ b/kde-apps/ktimer/ktimer-21.12.3.ebuild @@ -30,3 +30,5 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-use-KDECompilerSettings.patch" ) # bug 838040
