gentoo auto-resync : 17:07:2024 - 12:28:31

5 files changed, 41 insertions, 237 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 574cc572b68a..66e29c2267a9 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,12 +1,9 @@
+AUX nextcloud-client-3.13.2-fix_build_kf6.patch 1249 BLAKE2B d7dc92c12e2c952519cbba96ff557ef46bb98172805304c64744d1c7c7ba0fb30d0f665af0f750021781c1284afa3cd0eff29717d274e38565bcbc72c439c616 SHA512 a1685627081c2d362eb51cc2192cdfbc25609a384d0ea219807297504410a3633384504c2091783d07bd3f88d938e742e04f0089c6d38f467565117d7bb11ab7
 AUX nextcloud-client-3.6.6-no-redefine-fortify-source.patch 1447 BLAKE2B 14a3a1a1206a0a0027aa9c59e07b6d81174428aaaf90fba5706e9c7a2f076753a4b2f364ffa0f22dabf785d58832dde1aeba61e3cb3cc92feffa8b4b614c5d65 SHA512 808c10f8ea1905d54f62f895b2089c2acb602e838143f6a4268a5ab1e966ffe6ff01f132b8b65e0eebde21435a859cc7fb4f868a2ca81da4dcaa02292a337ed7
 DIST nextcloud-client-3.11.1.tar.gz 13598448 BLAKE2B b1e9070c55972facd72c65b571128f55c041f2fa1d38f7d22ed0f3ebca2b4ad9faef56d5699a48a70f062d13385c39123185b50ebba3d035d4e5af1320ce1844 SHA512 fc8700f36e3a2e8f07d219f9e7065a97e46d162d8c4f9a576e322dc45470e8b95321a1e176c4739a4fa212a69ff2782049096b32dcfe656a9e9cbedb8c7ed50e
-DIST nextcloud-client-3.13.0.tar.gz 13779791 BLAKE2B a0817a13af27e7fb57bb8a5644654cf3f8a461b7cb4afc71762b7bde5a7611ec57168939c07670d159e54ab11a49e991eda609a855e756d39ecca839a8f79586 SHA512 bf41a63a92e7e970e0b85d6df6e53e6ed8cd2c70fdfdfc86b144b01f82759a05f4bb016fd3009516bb405a589f26f84a8c6cf54191dc906a37d3dddf20dbcfbb
-DIST nextcloud-client-3.13.1.tar.gz 13783306 BLAKE2B 0ac012a612b8c6ba0ec530712393af970afe6a4570078cf87ef991005c9d0481bd68eaf5e39c37a589397af67a3b6ee9c08680c54196de20197bb4d8a854e7b2 SHA512 c78b3ed0a72a7e82028f62529fe00cdd387932d396a402fd3760a8a52bc6083a4b833ca28aea3b35637065de0fe6ca6a4f12c31fbf4b2a560d9001696194ae0b
 DIST nextcloud-client-3.13.2.tar.gz 13782506 BLAKE2B 867ae6ac056bc818d544d22b3a08c8876c093ca75746217822e3111c9de1e8a6b90ba9e0954e0b8c952082ea39f6f732c8914e267b4b1f1d8af3d8ebf6dbd73e SHA512 4dff6394d26445c124a9c93494b71dfa74fe696c147f765e0cbe053f800ec53fe47ba59e2c8e74c704b58e5fce02d2b40bb96a8777bc7580198e89be5d998ae6
 DIST nextcloud-client-3.9.4.tar.gz 15768508 BLAKE2B 7c06434538e9e95bed284ba07692d0d4d594639a145c2f3b67b8e81586fb98e1592eca54b9ee3cc638f8226ebb83e89e60a79238c76696fe9ca033209646eb13 SHA512 9f99278deb024ce105bae14d8dadc626b835486858e94f5483e9da3d06340a29e0941648cccfc30714c15ce25a6b77c4aa05a17fc213d7aa84803ffc13dca5a4
 EBUILD nextcloud-client-3.11.1.ebuild 2749 BLAKE2B 2365c6846ceda8e2acda8dabeaf6d7d3283133027baaf021e1d83e165d6d3188f6bf93768ca0d7bf599b10db4d3d26b8c3ebb577b6c53a7ef1c3bf4bec3cf22f SHA512 98c9ae0a2c2b35a0cd48ff4aa12050babeecf21a3c668476f2d2a8b0024a64e4e2838e1765e2929bb7bd8fa311c374da3b2c3b11464dc24bad1689df672baf67
-EBUILD nextcloud-client-3.13.0.ebuild 2765 BLAKE2B 27362ab34eae0c143332ae341a13dbfa194f71a43e9ddf9a928eb823bd4fca2c2bbce8a177a0bd77b28e2ece43401de0d90e50b4cd0027607d4c8f115e32b5b3 SHA512 3f68d7155dd026f9f00886f50c70cfd8b227c24f7ee35f622629f86870b2c98bd9b3292b031be13f25ff70bf5bdd210dde77d275b2420631210d5556e8793bb6
-EBUILD nextcloud-client-3.13.1.ebuild 2774 BLAKE2B df1d531ef33a79a997d8b2b5faf25c6cc8bacb7f85c9aeba384a25276aacc42f95cc976b4257036e7143b76086fe007868d261541aecdbba1805de36b823f443 SHA512 45c9653e599ed1ad563d8c2bcecbed38d66b31cd4d47b14b3b6b516e895d1922071e38af132c31d2d4bf3fed9670cbca219283f2476830db4fcace5b9e3965f1
-EBUILD nextcloud-client-3.13.2.ebuild 2774 BLAKE2B df1d531ef33a79a997d8b2b5faf25c6cc8bacb7f85c9aeba384a25276aacc42f95cc976b4257036e7143b76086fe007868d261541aecdbba1805de36b823f443 SHA512 45c9653e599ed1ad563d8c2bcecbed38d66b31cd4d47b14b3b6b516e895d1922071e38af132c31d2d4bf3fed9670cbca219283f2476830db4fcace5b9e3965f1
+EBUILD nextcloud-client-3.13.2.ebuild 2822 BLAKE2B 38b39edcbf78370524c9f6a000d61a92dd21d1b49d844ce59925ef34ad93cc61fd4b3c91871163b642072eed8b2c6874314e7899d8ce5fecb026a2b1d913c20b SHA512 aea13b2864a93f812e6f2a54471718dc0638005bab2dfb732d279535c5f8d6e39c8fe0a3e1d7146e7da9955d8d7b8b35693c941c3c8e9ca7ff2fd65fc75f043f
 EBUILD nextcloud-client-3.9.4.ebuild 2717 BLAKE2B 637408938ba4ae238a40ae275860ee1db8e4f036d921cd7eac6c20500dd78ab86f3aa2c98fa12edf402f14550755bd993a0e55adb0dc99f1cb1da1952dcb3d3c SHA512 57d91d98de4ff61ba6f5c32a8e122c290ace8c135bfccadb0279b78580f9d05870a59580edf1fa774728132f8653e1ef5a098fa090f2f19cadb50ac916c4a047
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
new file mode 100644
index 000000000000..3898dcbcef3c
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch
@@ -0,0 +1,38 @@
+From b2974a504f67e4af9c376927d1d0fd3c99de3255 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 1 Apr 2024 20:00:25 +0200
+Subject: [PATCH] Fix build with KF6
+
+Set QT_NO_CREATE_VERSIONLESS_FUNCTIONS, otherwise Qt5 and Qt6 conflict
+
+Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de>
+---
+ CMakeLists.txt         | 1 +
+ src/gui/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 687733588813..07d3266cb9dc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,6 +9,7 @@ endif()
+ 
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED 17)
++set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON)
+ 
+ include(FeatureSummary)
+ 
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 6e4acf203d19..37f459db4384 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -58,7 +58,7 @@ set(client_UI_SRCS
+ if(QUICK_COMPILER)
+     qtquick_compiler_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
+ else()
+-    qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
++    qt5_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc)
+ endif()
+ 
+ set(client_SRCS
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild
deleted file mode 100644
index 0812c7b1c004..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="
-	https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
-"
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-# slot op for qtqui as this package uses private API parts of qtqui
-# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
-RDEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	net-libs/libcloudproviders
-	kde-frameworks/karchive:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	|| ( gnome-base/librsvg media-gfx/inkscape )
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-qt/qttest:5
-		dev-util/cmocka
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
-)
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	TEST_VERBOSE=1 virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
-		elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
-		elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
-		elog "have to authenticate manually every time you start the nextlcoud client."
-		elog "See https://bugs.gentoo.org/912844 for more information."
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.1.ebuild
deleted file mode 100644
index 7abc2102345e..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake virtualx xdg
-
-DESCRIPTION="Desktop Syncing Client for Nextcloud"
-HOMEPAGE="https://github.com/nextcloud/desktop"
-SRC_URI="
-	https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
-"
-S="${WORKDIR}/desktop-${PV/_/-}"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="doc dolphin nautilus test webengine"
-RESTRICT="!test? ( test )"
-
-# slot op for qtqui as this package uses private API parts of qtqui
-# src/gui/generalsettings.cpp:#include <private/qzipwriter_p.h>
-RDEPEND="
-	>=dev-db/sqlite-3.34:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain:=[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtgui:5=
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtquickcontrols2:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebsockets:5
-	dev-qt/qtwidgets:5
-	net-libs/libcloudproviders
-	kde-frameworks/karchive:5
-	sys-libs/zlib
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtxml:5
-	|| ( gnome-base/librsvg media-gfx/inkscape )
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	test? (
-		dev-qt/qttest:5
-		dev-util/cmocka
-	)
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
-)
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DBUILD_UPDATER=OFF
-		$(cmake_use_find_package doc Sphinx)
-		$(cmake_use_find_package doc PdfLatex)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
-		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	TEST_VERBOSE=1 virtx cmake_src_test
-}
-
-src_compile() {
-	local compile_targets=(all)
-	if use doc; then
-		compile_targets+=(doc doc-man)
-	fi
-	cmake_src_compile ${compile_targets[@]}
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version -r "dev-libs/qtkeychain[keyring]"; then
-		elog "dev-libs/qtkeychain has not been build with the 'keyring' USE flag."
-		elog "Please consider enabling the 'keyring' USE flag. Otherwise you may"
-		elog "have to authenticate manually every time you start the nextlcoud client."
-		elog "See https://bugs.gentoo.org/912844 for more information."
-	fi
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
index 7abc2102345e..151c9bcdf637 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.13.2.ebuild
@@ -67,6 +67,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.6-no-redefine-fortify-source.patch
+	"${FILESDIR}"/${PN}-3.13.2-fix_build_kf6.patch
 )
 
 src_prepare() {