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/ktimer | |
| parent | e68d405c5d712af4387159df07e226217bdda049 (diff) | |
gentoo resync : 16.04.2022
Diffstat (limited to 'kde-apps/ktimer')
| -rw-r--r-- | kde-apps/ktimer/Manifest | 3 | ||||
| -rw-r--r-- | kde-apps/ktimer/files/ktimer-21.12.3-use-KDECompilerSettings.patch | 49 | ||||
| -rw-r--r-- | kde-apps/ktimer/ktimer-21.12.3.ebuild | 4 |
3 files changed, 54 insertions, 2 deletions
diff --git a/kde-apps/ktimer/Manifest b/kde-apps/ktimer/Manifest index 6306d0f591fe..728ce2f60c71 100644 --- a/kde-apps/ktimer/Manifest +++ b/kde-apps/ktimer/Manifest @@ -1,5 +1,6 @@ +AUX ktimer-21.12.3-use-KDECompilerSettings.patch 1349 BLAKE2B c0653850023c817ca361019844d383ee45679cfb52ffa39b86d848da3fbe156e2f64614a173bd004c4cd1101c52cafce2c54805894fa3ae70b9f8c6154f7e09a SHA512 c899dab5fa07fb3073103ef217037c7c762fcc0db9626aee57f8a72ced37e21b39fda222e7b9d18fd0b3071f25f1d4319b60851c9e103d2b105ea51c9954490f DIST ktimer-21.08.3.tar.xz 388772 BLAKE2B 6324641d6244dfbcaf2ed01d3b53ce963bd6e294cbb0a8a12f613ff6c1d26ae208193c0403dae2ea39c6fdff070504769c0e8042eea03449f1f5f0d5f7209d81 SHA512 bfd9583f6a89e6b87146c731f4fdfa51fcbb855566707574854bbf4b2cd3044cf886f74ab114bbc5027337c26a04fc7d901ac4630922a3e8958907f39c95339e DIST ktimer-21.12.3.tar.xz 392772 BLAKE2B 342d51c0eb24a08f657944806f01166f247e18db42a4704276474148a369e7419290e0e44837b24e0d97d4fd69bfc855fbcc17ea2ffe1bc81dcb7f009e1ead0e SHA512 341fa18b066be5f8dbedf4c519df9298880c782315592c620ef2ad3aac8b9b362bb0444498117cbf6609cd70597690b0e8b57516eb5360f907d2b7b44f4d2f6a EBUILD ktimer-21.08.3.ebuild 828 BLAKE2B f17aaa0b665ed6806d213697ff07cceff0e92cabed01ba88fe129baaa8e9c72d14e9f3022981443ede77bc66761a433e4ce107d2cbbaca3c3d8dec2cb49517a2 SHA512 44ab9575bf61898cd878ff15d119ad0e4782f19ccc3438a7bb421807c19c798adf62db0f7829069a3362e00c9d252f03c83a43c014c583e85e648529add6e43f -EBUILD ktimer-21.12.3.ebuild 831 BLAKE2B 38d50a8301e023beac1e3483658beef4f279d66751643399f9fe5f3636ff80e759ffd69dbdfeff7b54934cc1e7d3b9e20137b37dcc3e3b622cff8aa3a04cb4a1 SHA512 bcd714b119d4498fef1f3a45411fff7983339711de1077d9755c3369e65c9d3939ed0d9c8df04eeca219273fa6d6ddfaba9dee513b586153d01dd03eb302420a +EBUILD ktimer-21.12.3.ebuild 904 BLAKE2B 576c5758d70f4e209c09ade1a574b01904433217bcc522e95a70195eb0a1b10a152d4c01f5a162d616a508226cb5571d36b71bb3d11d4f9e4fa4b088fe2121a3 SHA512 2b4a9172cb04b6be39421397458c428d37a3dc23b83e883f44ab6eb5e888599e1480cef733710ed128a9d0ab40c2d502b20f60750e49eff670fcf96c427bf30e MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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" <kossebau@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 e467bcc64e4a..b3b1839c4218 100644 --- a/kde-apps/ktimer/ktimer-21.12.3.ebuild +++ b/kde-apps/ktimer/ktimer-21.12.3.ebuild @@ -14,7 +14,7 @@ https://utils.kde.org/projects/ktimer/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -30,3 +30,5 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-use-KDECompilerSettings.patch" ) # bug 838040 |