diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
| commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
| tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /kde-apps/kmouth | |
| parent | e68d405c5d712af4387159df07e226217bdda049 (diff) | |
gentoo resync : 16.04.2022
Diffstat (limited to 'kde-apps/kmouth')
| -rw-r--r-- | kde-apps/kmouth/Manifest | 3 | ||||
| -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 | 4 |
3 files changed, 58 insertions, 2 deletions
diff --git a/kde-apps/kmouth/Manifest b/kde-apps/kmouth/Manifest index fc1ebcebd010..c1a0cd4cbd34 100644 --- a/kde-apps/kmouth/Manifest +++ b/kde-apps/kmouth/Manifest @@ -1,5 +1,6 @@ +AUX kmouth-21.12.3-use-KDECompilerSettings.patch 1403 BLAKE2B d02f6782767e36ddd44fca329dbae87067a63b839c40e8a257f145769e76cfe48f3e295d97aac2689cddafcaeb6d80f67c422905d5937449534a519f4bc486cc SHA512 5d865eae0eb474a680b787728327223e8b43f939627a73348a3a28fed4255802123551d02e34c66a69ca6bd4beb04e906c49507d7247c5f17ccd5d51abf80d62 DIST kmouth-21.08.3.tar.xz 2100844 BLAKE2B 6be97d79629b29ce603106471bf36cae6efaabc0578ce6a5445ba5a502232ebad870addfd51c3eecd39cf18d9353feb147381f1e62972ed57bb86c3250e53c66 SHA512 9dcbdb8ad7e58f0320554d859ad43cab2192437efe34014e9ee4f370356ab52572b4929eab7ddb2f1a661c635965329117649636657bf9e2ad1ce960bfa72917 DIST kmouth-21.12.3.tar.xz 2107316 BLAKE2B 1ad2c4eb6490291cb8b70c61c9d188d360d70e2151b20824d8f624c5e9107983a1c08cf86f5fe9f6c7bd2f8b8d6e0b897b63273de7f70da8d505b3352b5da716 SHA512 ea7d7c418c33f7b9773d30d233f26d4ec1d7e05983fb48808398605ae4bb2442317e1d7dd4fe2ba2168947fec793ea053548aa1246b808589422263628247688 EBUILD kmouth-21.08.3.ebuild 893 BLAKE2B 5c8498fa822a000548ade704da736dc108dbe338dcbf4aceb53efef24b1ecbaf7e194ad1e6bdb44a60fbc00bb8d91f84390c301994cf2552b901270a6420af42 SHA512 dd7a96ce724acd2b94b06e27f04d70160b0b0f671887e02e5bdfe5d77f6211e99f26b66e1b4e7ab95806badc3e6b6ae2f2bb79ebca121346a72fd3e12157e2ec -EBUILD kmouth-21.12.3.ebuild 896 BLAKE2B e0ab20f26adcf25212f4361958b0b4e2376f5091947d28a654e61792e50edeca7aa5f11dc08adebd9ff3d560b8e393a1a0671492e0586277e951c938a154ca64 SHA512 861efab30eb3ebecb43abdef5069ba12a6410a23291e861f5721466d7095b8f17d6ef95515864423279b67ad698dbd9c0e16f4cdfea98c6fff41397390194035 +EBUILD kmouth-21.12.3.ebuild 969 BLAKE2B aa2c2f2f551ce1165e300778e934837d88d692b31f6ce19785efef7df6b3b4f5f9e11ac1de6b2e017f47f03f2b9c75ecc907274b54b807c3c270d0b02cefd9b1 SHA512 3815d9b11e0bcc5e0a9f18aca441df543247aff29f79566e0e6110b07bc60cd47d9e8c264da378e4c4f4fa60d0e320c19330c0bf5244802c9914d085b8fc4099 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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 2f5d304c3bf7..7e3dd81478e2 100644 --- a/kde-apps/kmouth/kmouth-21.12.3.ebuild +++ b/kde-apps/kmouth/kmouth-21.12.3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/kmouth/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="" DEPEND=" @@ -33,3 +33,5 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-use-KDECompilerSettings.patch" ) # bug 838193 |