[gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/, net-misc/nextcloud-client/files/

["Bernard Cafarelli" <voyageur@gentoo.org>]

commit:     b0c1e8c85956eeb654ebdaddfd399ab0f24cf17b
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 20:25:43 2024 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 20:27:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0c1e8c8

net-misc/nextcloud-client: fix build if kio:6 is installed

Closes: https://bugs.gentoo.org/930943
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 .../nextcloud-client-3.13.2-fix_build_kf6.patch    | 38 ++++++++++++++++++++++
 .../nextcloud-client-3.13.2.ebuild                 |  1 +
 2 files changed, 39 insertions(+)

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.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() {