From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6177515821F for ; Sat, 23 Nov 2024 22:23:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B2BBE08A4; Sat, 23 Nov 2024 22:23:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6980E0871 for ; Sat, 23 Nov 2024 22:23:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08C74342FAD for ; Sat, 23 Nov 2024 22:23:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43F011E74 for ; Sat, 23 Nov 2024 22:23:15 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1732400583.572156f3d542f502f1beeac9db939ceeebcf0642.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch X-VCS-Directories: net-misc/nextcloud-client/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 572156f3d542f502f1beeac9db939ceeebcf0642 X-VCS-Branch: master Date: Sat, 23 Nov 2024 22:23:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1db0cdf3-587e-45c9-b2c5-7845277119d7 X-Archives-Hash: 890a3d377fb65345c82fe29659152aeb commit: 572156f3d542f502f1beeac9db939ceeebcf0642 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Nov 23 16:35:34 2024 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sat Nov 23 22:23:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572156f3 net-misc/nextcloud-client: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: James Le Cuirot gentoo.org> .../nextcloud-client-3.13.2-fix_build_kf6.patch | 38 ---------------------- 1 file changed, 38 deletions(-) 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 deleted file mode 100644 index 3898dcbcef3c..000000000000 --- a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b2974a504f67e4af9c376927d1d0fd3c99de3255 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -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 ---- - 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