gentoo auto-resync : 18:12:2023 - 01:48:11

4 files changed, 119 insertions, 1 deletions

diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index 30b2bd21bdf0..4b837c34fdf4 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,9 +1,12 @@
 AUX extra-cmake-modules-5.112.0-disable-tests-requiring-PyQt5.patch 788 BLAKE2B b89cfc798ad341509974926f9c3cf2772271309cfd1f14d23f55e285833b9c956c7fbb2894ec242ce185efe59f97e36a83a8e10a387e8229865cd14914d048d2 SHA512 7c904a40446f20871adb00e83e3346791faa7fb5580f023026cd6509afe16564441bf3ec3072abc7e04b49688b2563f45ac4a70eebe339f27d10147cae69efac
+AUX extra-cmake-modules-5.245.0-disable-qmlplugindump.patch 1570 BLAKE2B 2890d1eb2c2443419e893ba834e1ee96b57775d1944009d93f6fb15bf56b9b33a6f60e04712d636f9e714607ab406a9c947712c4e5dc4d79b012f282b4ba9df3 SHA512 c1f8bab2a122765f2de407dcc5cc42dbd179d013c6bdb58020c27611f4bf7c436dfa288c9875607b0cac4b5dea378e9a8a37a0e7305a5daffd4b3623ffdeda63
 AUX extra-cmake-modules-5.49.0-no-fatal-warnings.patch 1104 BLAKE2B 9f70e75ed92696e0856a5f1962d9c420ce67b13591dceb0b24990407e3c2b567f5a8c59f16bd97464be40fb291184f0825542e48f0c287ea47536f34eada1a56 SHA512 0aae30715bd5e7ac7eb65bef5caafdcdd22b46a81ba6f3fa9dcca356b146793b6877c7bfbe67ea3f38114c4cba8094c063470421ebf44c06289ef61398200697
 AUX extra-cmake-modules-5.93.0-disable-qmlplugindump.patch 3151 BLAKE2B f10ceecfbfdad60f628cf1b0c0972f8ebc8db615938b23f300f80855bcc77a6f21d35cb56130df760e3e893ee025689869023048434a3f6329f25181304b4eb6 SHA512 8f046619df65df32736a217ca94439e9c567f6a84a3c736507259b20958c1972d21ee7dcda79b11cc220713010fbfb69f516f0ea1ea2b730e5efb7c32a2fdd04
 AUX extra-cmake-modules-5.93.0-skip-ecm_add_test-early.patch 1703 BLAKE2B 71d07fcfb3a93caf5f73f818cff7f0139c4866ef3a1abaede189e171217ec9a4e6825ec6d37c344ab8d94989493647f4d7b5749d3db1767b54bb9c6e328ca571 SHA512 8b015810e455aa0a54535f594668595900b0b2d700685c952cbb9a2dd46e3c413815b33fef69f4251bb20c93e4c3a4e6b9691680b3ffcf1bac5cf48931bb5e3b
 DIST extra-cmake-modules-5.112.0.tar.xz 331976 BLAKE2B 96437040b605c9306bb9dae5f9450b6c1e2267fd2da5fbb24812033d29078a9057e68550809edf7522694cd028bee042e17112ae77a049eaf1e88b56b742dfb4 SHA512 4c19fdfa879f0aee27a261e6b47c1ca03d8bc62735caa70f2122834a1d74dde3276d08831def7800c5182b057d9a7c33af29f5734508a9479884d627117ce63f
 DIST extra-cmake-modules-5.113.0.tar.xz 332464 BLAKE2B 2bc33b2799151d0658125160609ff67ef5bc3d02dde868be6db6cbdf74e8030899db45a8d94a6b336f8168bd71aafbe1e4afa63ac4c434ed97429c54ad0c3540 SHA512 63a9bc19432a51bfaf1618b0e2cb4ce4ae188f0a2dfc44717c9a666df3f38222c3f5ebf9f210f33d400b0405e07b1574ff4de98b7dae23003785a9ea2a430e52
+DIST extra-cmake-modules-5.246.1.tar.xz 337720 BLAKE2B fc2c36df234b752ab1f2416bfcb1af8d9504a41bc9e9f4d8f141de638e41ff1c843de4104ccb42c02697632de3be4265199e3d4b4cfbc647a5cb7143e812ab68 SHA512 6e17b47d26b809a2c7e3111c2b1afa66ed2837cd498b72ea92f1ee1a1d2a6c560f0b40caf42ccced292c776602a716ce9f18d5bc09bda95c2faf75bcfcc1c05c
 EBUILD extra-cmake-modules-5.112.0-r1.ebuild 1694 BLAKE2B 5405481a3e3a8a7230225cc399f8ef2eaf15348888cd94aa8469007d3fa3de22ee4bd756d7e3de127d32cd5fa54848699ebf1b302d9badf7ff464bc0a808669f SHA512 edb73cd02d96f93f982e47c6c6e5d42c27c7c9d34aff52327cd415321e28f20b5c5504eff9210df7a51731400e014d4999c40f8159f6ef690aae1be6cd86cbb4
 EBUILD extra-cmake-modules-5.113.0.ebuild 1638 BLAKE2B a57ab2986109b6311d45de3cea15958210de7ec9587982f0197741cda0e0da14a481efb3e00fdd6ed66eec87162c3042b8be618780d633881be8f8ce2e7686c4 SHA512 47c48f3283f707484ab161be22397665070fd5cf9d3d36f6076bf127ee440c412c79274154a5d01bf9f8797d4f20585cdbb860166ca0fbed9e7cbc2f8dc620ba
-MISC metadata.xml 480 BLAKE2B ab8e3f4e0a74a0e856bba9cf47e40254738c6d545a569bf12fae38e8e6d1e5d0cfd5a0ffaf6d5266a1532ea455d5f7f5421f1b88fa09539af6e31d2e85e170ad SHA512 0161373d45e5fd9a1c3c4f47892fcf1173419481f8de3ee73cc029ac628d36551516d0b99acc8b227b336ec5ce138844fd2654555edff3a73b8c07dbd931e468
+EBUILD extra-cmake-modules-5.246.1.ebuild 1716 BLAKE2B 7ba0f7bd312054e4eeea35e3749d787012e179a6c5ab26235eee26f3d44719bdf16dd0b25052bf3aa5e4022ca924371995dc52486d8c2c0e59221cadf161427d SHA512 44aa2ba45c0f581508d3215f2cc1b05727abc1fc119199e319686ae854fd62c74d1f428f29d379266037818f7aa2076305df55538f755bb4ab74779e6d09a5af
+MISC metadata.xml 554 BLAKE2B 7af82aeb7ce6ab40ccaabe8c60c232d0832a6995fed4449777bfd3df39191007080672bfb6d8fbebb756e3380666b9790ab175dd8ea76743fefcecb52d3e1511 SHA512 199c85f33ac9628f012c917e8af4d95ce67a2e0ff6c66b27d46293f9fce37c893e67d0a92587bef076e38ed3553b09c0f40e9757b24c2de608f8411be6045f62
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.246.1.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.246.1.ebuild
new file mode 100644
index 000000000000..eb3283f4a3d4
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.246.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+QTMIN=6.6.0
+inherit cmake frameworks.kde.org python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://invent.kde.org/frameworks/extra-cmake-modules"
+SRC_URI="mirror://kde/unstable/frameworks/5.246.0/${P}.tar.xz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-arch/libarchive[bzip2]"
+BDEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+		>=dev-qt/qttools-${QTMIN}:6[assistant]
+	)
+	test? (
+		>=dev-qt/qttools-${QTMIN}:6[linguist]
+		>=dev-qt/qtbase-${QTMIN}:6
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.49.0-no-fatal-warnings.patch"
+	"${FILESDIR}/${PN}-5.93.0-skip-ecm_add_test-early.patch"
+	"${FILESDIR}/${PN}-5.112.0-disable-tests-requiring-PyQt5.patch" # bug 680256
+	"${FILESDIR}/${PN}-5.245.0-disable-qmlplugindump.patch"
+)
+
+python_check_deps() {
+	python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOC_INSTALL_DIR=/usr/share/doc/"${PF}"
+		-DBUILD_QTHELP_DOCS=$(usex doc)
+		-DBUILD_HTML_DOCS=$(usex doc)
+		-DBUILD_MAN_DOCS=$(usex doc)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# passes, but then breaks src_install
+		ECMToolchainAndroidTest
+		# broken, bug #627806
+		ECMPoQmToolsTest
+		# can not possibly succeed in releases, bug #764953
+		KDEFetchTranslations
+	)
+	# possible race condition with multiple jobs, bug #701854
+	cmake_src_test -j1
+}
diff --git a/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch
new file mode 100644
index 000000000000..a684745d3965
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/files/extra-cmake-modules-5.245.0-disable-qmlplugindump.patch
@@ -0,0 +1,43 @@
+From 528cdf38261239d8475e2a3e82dd1b5cb73c770b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 8 Dec 2019 15:01:33 +0100
+Subject: [PATCH] ECMFindQMLModule.cmake.in: Add ECM_DISABLE_QMLPLUGINDUMP to
+ avoid sandbox violations
+
+See also: https://phabricator.kde.org/D25812
+
+Backstory: https://bugzilla.gnome.org/show_bug.cgi?id=744135
+BUG: 387753
+---
+ modules/ECMFindQmlModule.cmake.in | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/modules/ECMFindQmlModule.cmake.in b/modules/ECMFindQmlModule.cmake.in
+index 3da55ced..46e8b0ce 100644
+--- a/modules/ECMFindQmlModule.cmake.in
++++ b/modules/ECMFindQmlModule.cmake.in
+@@ -9,6 +9,13 @@ include(FindPackageHandleStandardArgs)
+ include("${ECM_MODULE_DIR}/QtVersionOption.cmake")
+ include("${ECM_MODULE_DIR}/ECMQueryQt.cmake")
+ 
++option (ECM_DISABLE_QMLPLUGINDUMP "Do not use qmlplugindump which may segfault in some sandboxed environments" OFF)
++
++if(ECM_DISABLE_QMLPLUGINDUMP)
++    message(NOTICE "@GENMODULE@: qmlplugindump disabled - assuming dependency is available as >= @VERSION@.")
++    set(@GENMODULE@_FOUND TRUE)
++    set(@GENMODULE@_VERSION @VERSION@)
++else()
+ if (QT_MAJOR_VERSION EQUAL "6")
+     include(${ECM_MODULE_DIR}/ECMQmlModule.cmake)
+     # Get the qmldir file
+@@ -68,6 +75,7 @@ if (NOT CMAKE_CROSSCOMPILING AND NOT MODULE_NOTFOUND AND NOT @GENMODULE@_FOUND)
+         set(@GENMODULE@_FOUND FALSE)
+     endif()
+ endif()
++endif()
+ 
+ set(@GENMODULE@_FOUND ${@GENMODULE@_FOUND} PARENT_SCOPE)
+ set(@GENMODULE@_VERSION ${@GENMODULE@_VERSION} PARENT_SCOPE)
+-- 
+2.42.1
+
diff --git a/kde-frameworks/extra-cmake-modules/metadata.xml b/kde-frameworks/extra-cmake-modules/metadata.xml
index 007a8286d371..465dd12c5a8d 100644
--- a/kde-frameworks/extra-cmake-modules/metadata.xml
+++ b/kde-frameworks/extra-cmake-modules/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">frameworks/extra-cmake-modules</remote-id>
 	</upstream>
 	<slots>
 		<subslots>