diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-08-24 14:56:08 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-08-24 14:56:08 +0100 |
| commit | c9b5a916efac64df2a39870a92cc6b67116d1b9f (patch) | |
| tree | 126347f55a7e5eeddecc17d5a26886ffb11249f4 /kde-frameworks | |
| parent | b818f6a820dceae80d6e3faac5fdf7be0c6fcbe2 (diff) | |
gentoo auto-resync : 24:08:2024 - 14:56:07
Diffstat (limited to 'kde-frameworks')
| -rw-r--r-- | kde-frameworks/Manifest.gz | bin | 14076 -> 14083 bytes | |||
| -rw-r--r-- | kde-frameworks/prison/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/prison/files/prison-6.5.0-cmake.patch | 42 | ||||
| -rw-r--r-- | kde-frameworks/prison/prison-6.5.0.ebuild | 2 |
4 files changed, 46 insertions, 1 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz Binary files differindex eb88b203a232..1af6992cfbee 100644 --- a/kde-frameworks/Manifest.gz +++ b/kde-frameworks/Manifest.gz diff --git a/kde-frameworks/prison/Manifest b/kde-frameworks/prison/Manifest index 88abb22c865e..5ad401e17ced 100644 --- a/kde-frameworks/prison/Manifest +++ b/kde-frameworks/prison/Manifest @@ -1,5 +1,6 @@ +AUX prison-6.5.0-cmake.patch 1216 BLAKE2B 157394ccd4edd5275015e12b08d47eca30c50f19acf76d42d154b15d42092c4168f13a6e69eaecbff00605ed5d44c96dd6a26ae3e067937c00a2ef06ce92e7e1 SHA512 f4ff65be02a7b20489d609e6247905005cbc1929a81082c13e21895c625de2158aab56523c2065c4aa2ed966a4e15ff72931112815eaf8afa8f844ea479834ad DIST prison-5.116.0.tar.xz 55276 BLAKE2B a45dada4b4c7e6a8f811e37a7241f5399bbeea4f47805b5311a2393a64ef3beaebbf20c5c35bd7fd4e1670a626ea455454a7f46c104302e96399f484457cf33f SHA512 fa7ad2393a25b8b7d7cea60891ab27e114ea069a78479a90a6e7df219963991e89f477c061fea0d6c680cfe72502e4b40fdf05b55858072825543ca52635bfd0 DIST prison-6.5.0.tar.xz 56552 BLAKE2B 28cb0788a2cf9b7672b53ad1ffb811c1452c8f797f72282a4054f559b2e1c9c1becac9d2d088f633332a8d5c8ce01d90b08323276504001500c354ceea35d64f SHA512 17e949646671a63da6e6e926281b435c70a0e634aaf9be31d28522841893b1e0b16c53e76cc48e885751d439feab3691556bd6fb3aa4c0d688a9e9c6a54fe1d5 EBUILD prison-5.116.0.ebuild 696 BLAKE2B 1c8f598f9e50616ae965726125c25365ace66e4e750a6b58da729d87b09cd818a2a89fac8e77c318182d0c3e16dd0cd4905f69b567633682f62c433432497d0c SHA512 7d68f90391989a518241b23f8b0f9b1bf54da4908ea29643f77889bed97ffd97a9f318bc56f765b89c4c6207def694478daa8b84cf518fe18252af034b8d6fdf -EBUILD prison-6.5.0.ebuild 722 BLAKE2B 7f2d3f9d9d6647aafc8ea1d0b47b5e46704123f2b48d4b355b3b90a69a9a03d062e2c61f654f3f4937f8031433446d00f314cf74f465e05a9c7ac070c62cb36a SHA512 0d1aab3e967219342c4733e795b03b1d3faca3c16755119b21159123b569428b8752e52ef3f1f2cdf75b73e6b65213bb62b7e7446ec332c07e580232406f6f33 +EBUILD prison-6.5.0.ebuild 779 BLAKE2B 23eb15fae829e831f637224f8aa3ee638de01d165295af575d691bb1dfad9b29e84f484da4dc790967479571332dd234bc0ba0e17ead36aecf53c25664022a5a SHA512 7a10af5f04476c67a3d360d8423ac76d2541856fa600a7475be698d60388feb4d4df3a5db17e890b4fbbe411025e3b828f2a381b834854954fbd9830988ecbd5 MISC metadata.xml 621 BLAKE2B cc6fb027c9515b19741acf2c94eeb2f515da988aae118d5f4ec07e24455ee8fa6fc0b0f6f0292c4caa0a2db2af2510999dd40f59ee243dc018fd8b7dfab720a3 SHA512 60766c63c2ca0afefa01f81c679dac78a359f7a5334c5d10a94a2567879de88338466b566a439554618afd81fcc33fbf6f8fe57bd5752ab940668a2899fafdd0 diff --git a/kde-frameworks/prison/files/prison-6.5.0-cmake.patch b/kde-frameworks/prison/files/prison-6.5.0-cmake.patch new file mode 100644 index 000000000000..dbd3e7c612f6 --- /dev/null +++ b/kde-frameworks/prison/files/prison-6.5.0-cmake.patch @@ -0,0 +1,42 @@ +From 073c611f0027ca1d7e5de18003993d3a85c2968e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sat, 24 Aug 2024 12:31:03 +0200 +Subject: [PATCH] Fix WITH_QUICK=OFF by moving ECMQmlModule behind the + conditional + +Otherwise we still end up with + +> -- Could NOT find Qt6Qml (missing: Qt6Qml_DIR) + +and finally + +> Failed setting up ECMQmlModule + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6a97368..11f3a52 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -23,7 +23,6 @@ include(ECMAddTests) + include(CMakePackageConfigHelpers) + include(ECMSetupVersion) + include(ECMQtDeclareLoggingCategory) +-include(ECMQmlModule) + include(ECMDeprecationSettings) + + set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") +@@ -39,6 +38,7 @@ option(WITH_MULTIMEDIA "Build scanner support" ON) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui) + + if (WITH_QUICK) ++ include(ECMQmlModule) + find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Quick) + endif() + +-- +2.46.0 + diff --git a/kde-frameworks/prison/prison-6.5.0.ebuild b/kde-frameworks/prison/prison-6.5.0.ebuild index 873cd7cc7ee6..ac1b1b471eb0 100644 --- a/kde-frameworks/prison/prison-6.5.0.ebuild +++ b/kde-frameworks/prison/prison-6.5.0.ebuild @@ -25,6 +25,8 @@ DEPEND="${RDEPEND} test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent,widgets] ) " +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) # bug 938343 + src_configure() { local mycmakeargs=( # TODO: WITH_MULTIMEDIA? |