public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/
Date: Sat, 23 Nov 2024 22:23:15 +0000 (UTC)	[thread overview]
Message-ID: <1732400583.572156f3d542f502f1beeac9db939ceeebcf0642.chewi@gentoo> (raw)

commit:     572156f3d542f502f1beeac9db939ceeebcf0642
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Nov 23 16:35:34 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> 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 <mmk <AT> levelnine.at>
Signed-off-by: James Le Cuirot <chewi <AT> 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 <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


             reply	other threads:[~2024-11-23 22:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-23 22:23 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-02-22 18:27 [gentoo-commits] repo/gentoo:master commit in: net-misc/nextcloud-client/files/ Florian Schmaus
2021-12-29 11:16 Bernard Cafarelli
2018-09-24 10:13 Bernard Cafarelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1732400583.572156f3d542f502f1beeac9db939ceeebcf0642.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox