mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the Qt6 patch

Browse Source
This commit is contained in:
István Váradi 2025-10-16 20:01:13 +02:00
parent b6f435f092
commit f4caffbe57
1 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
debian/patches/0008-qt6.patch vendored
View File

@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d306001c9..6627f8399 100644
index 800e561448..2ebc72d236 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
@ -11,7 +11,22 @@ index d306001c9..6627f8399 100644
# CfAPI Shell Extensions
set( CFAPI_SHELL_EXTENSIONS_LIB_NAME CfApiShellExtensions )
@@ -139,7 +139,7 @@ if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)
@@ -84,13 +84,11 @@ endif()
set(APPLE_SUPPRESS_X11_WARNING ON)
-find_package(ECM 6.0.0 REQUIRED NO_MODULE)
+find_package(ECM 5.0.0 REQUIRED NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://invent.kde.org/frameworks/extra-cmake-modules")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
-include(KDEInstallDirs)
-include(KDECMakeSettings)
include(ECMMarkNonGuiExecutable)
include(ECMSetupVersion)
@@ -152,7 +150,7 @@ if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)
add_definitions(-DBUILD_OWNCLOUD_OSX_BUNDLE)
endif()
@ -21,7 +36,7 @@ index d306001c9..6627f8399 100644
# this option removes Http authentication, keychain, shibboleth etc and is intended for
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f584246eb..efa56ae18 100644
index f584246eb7..efa56ae181 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,7 +3,7 @@
@ -34,7 +49,7 @@ index f584246eb..efa56ae18 100644
find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} CONFIG QUIET)
set_package_properties(Qt${QT_MAJOR_VERSION}Core PROPERTIES
diff --git a/src/common/common.cmake b/src/common/common.cmake
index 5a19933dc..6f5dabcb7 100644
index 5a19933dc9..6f5dabcb7c 100644
--- a/src/common/common.cmake
+++ b/src/common/common.cmake
@@ -39,3 +39,5 @@ elseif(UNIX AND NOT APPLE)
@ -45,14 +60,14 @@ index 5a19933dc..6f5dabcb7 100644
+find_package(Qt6 REQUIRED COMPONENTS Widgets)
diff --git a/src/common/qtcompat.cpp b/src/common/qtcompat.cpp
new file mode 100644
index 000000000..ccded5d62
index 0000000000..ccded5d62e
--- /dev/null
+++ b/src/common/qtcompat.cpp
@@ -0,0 +1 @@
+#include "qtcompat.h"
diff --git a/src/common/qtcompat.h b/src/common/qtcompat.h
new file mode 100644
index 000000000..4a4c59b35
index 0000000000..4a4c59b354
--- /dev/null
+++ b/src/common/qtcompat.h
@@ -0,0 +1,290 @@
@ -347,7 +362,7 @@ index 000000000..4a4c59b35
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp
index 0855b028d..5c5ec1f6a 100644
index fa3c97c487..c0505b76f7 100644
--- a/src/csync/csync_exclude.cpp
+++ b/src/csync/csync_exclude.cpp
@@ -21,6 +21,7 @@
@ -381,7 +396,7 @@ index 0855b028d..5c5ec1f6a 100644
continue;
}
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 01bbae79a..96b4848b0 100644
index 9ce24e95a0..9e8723203d 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -3,7 +3,7 @@
@ -393,7 +408,7 @@ index 01bbae79a..96b4848b0 100644
find_package(KF6GuiAddons)
if(CMAKE_BUILD_TYPE MATCHES Debug)
@@ -581,9 +581,16 @@ target_link_libraries(nextcloudCore
@@ -551,9 +551,16 @@ target_link_libraries(nextcloudCore
Qt::Quick
Qt::QuickControls2
Qt::QuickWidgets
@ -411,7 +426,7 @@ index 01bbae79a..96b4848b0 100644
if(KF6GuiAddons_FOUND)
target_link_libraries(nextcloudCore
PUBLIC
@@ -792,3 +799,10 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32)
@@ -762,3 +769,10 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32)
endif()
configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h)
@ -423,7 +438,7 @@ index 01bbae79a..96b4848b0 100644
+endif()
+configure_file(tray/TrayFoldersMenuButton.qml.in ${CMAKE_CURRENT_SOURCE_DIR}/tray/TrayFoldersMenuButton.qml)
diff --git a/src/gui/application.cpp b/src/gui/application.cpp
index d2951a1f1..bb345934a 100644
index f2f6a0503e..cc972dd676 100644
--- a/src/gui/application.cpp
+++ b/src/gui/application.cpp
@@ -36,6 +36,7 @@
@ -434,7 +449,7 @@ index d2951a1f1..bb345934a 100644
#include "config.h"
@@ -1017,7 +1018,7 @@ void Application::setupTranslations()
@@ -1019,7 +1020,7 @@ void Application::setupTranslations()
{
qCInfo(lcApplication) << "System UI languages are:" << QLocale::system().uiLanguages();
const auto enforcedLocale = enforcedLanguage();
@ -444,7 +459,7 @@ index d2951a1f1..bb345934a 100644
auto *translator = new QTranslator(this);
diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 3ea264172..999f139f8 100644
index 17d693bf71..f7105f131c 100644
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -16,6 +16,7 @@
@ -456,7 +471,7 @@ index 3ea264172..999f139f8 100644
#include <pushnotifications.h>
#include <syncengine.h>
diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp
index 29301107a..442a52a84 100644
index 3dc10ad198..637b58acf5 100644
--- a/src/gui/folderwizard.cpp
+++ b/src/gui/folderwizard.cpp
@@ -15,6 +15,7 @@
@ -477,7 +492,7 @@ index 29301107a..442a52a84 100644
});
_virtualFilesCheckBox->setChecked(bestAvailableVfsMode() == Vfs::WindowsCfApi);
diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp
index c0e833d02..b739e8821 100644
index c0e833d023..b739e88214 100644
--- a/src/gui/generalsettings.cpp
+++ b/src/gui/generalsettings.cpp
@@ -44,6 +44,7 @@
@ -525,7 +540,7 @@ index c0e833d02..b739e8821 100644
void GeneralSettings::slotShowLegalNotice()
{
diff --git a/src/gui/generalsettings.h b/src/gui/generalsettings.h
index b62a7b3c0..85de6f00a 100644
index b62a7b3c07..85de6f00a1 100644
--- a/src/gui/generalsettings.h
+++ b/src/gui/generalsettings.h
@@ -52,7 +52,9 @@ private slots:
@ -539,7 +554,7 @@ index b62a7b3c0..85de6f00a 100644
void slotShowLegalNotice();
void slotRemotePollIntervalChanged(int seconds);
diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp
index 9b85245ae..76e9012fd 100644
index cc0397f295..c4753ab48d 100644
--- a/src/gui/sslerrordialog.cpp
+++ b/src/gui/sslerrordialog.cpp
@@ -7,6 +7,7 @@
@ -560,7 +575,7 @@ index 9b85245ae..76e9012fd 100644
msg += tr("Fingerprint (SHA1): <tt>%1</tt>").arg(sha1sum) + QL("<br/>");
}
diff --git a/src/gui/tray/ActivityItemContent.qml b/src/gui/tray/ActivityItemContent.qml
index 9f365b609..2c761678f 100644
index 9f365b6096..2c761678fd 100644
--- a/src/gui/tray/ActivityItemContent.qml
+++ b/src/gui/tray/ActivityItemContent.qml
@@ -14,7 +14,7 @@ import com.nextcloud.desktopclient
@ -576,7 +591,7 @@ diff --git a/src/gui/tray/TrayFoldersMenuButton.qml b/src/gui/tray/TrayFoldersMe
similarity index 99%
rename from src/gui/tray/TrayFoldersMenuButton.qml
rename to src/gui/tray/TrayFoldersMenuButton.qml.in
index 10421db5f..9c09a569a 100644
index 10421db5f4..9c09a569af 100644
--- a/src/gui/tray/TrayFoldersMenuButton.qml
+++ b/src/gui/tray/TrayFoldersMenuButton.qml.in
@@ -2,7 +2,7 @@
@ -589,7 +604,7 @@ index 10421db5f..9c09a569a 100644
import QtQuick.Controls
import QtQuick.Layouts
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 5820fc0c8..a70abc9c8 100644
index 5820fc0c8a..a70abc9c8d 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -2,7 +2,7 @@
@ -628,7 +643,7 @@ index 5820fc0c8..a70abc9c8 100644
PRIVATE
cxx_std_17
diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
index 6f42b1425..400b51576 100644
index e7bde80a84..b37b5831b3 100644
--- a/src/libsync/account.cpp
+++ b/src/libsync/account.cpp
@@ -22,6 +22,7 @@
@ -639,7 +654,7 @@ index 6f42b1425..400b51576 100644
#include "clientsideencryption.h"
#include "ocsuserstatusconnector.h"
@@ -1238,7 +1239,8 @@ void Account::listRemoteFolder(QPromise<OCC::PlaceholderCreateInfo> *promise, co
@@ -1239,7 +1240,8 @@ void Account::listRemoteFolder(QPromise<OCC::PlaceholderCreateInfo> *promise, co
serverHasMountRootProperty() ? RemotePermissions::MountedPermissionAlgorithm::UseMountRootProperty : RemotePermissions::MountedPermissionAlgorithm::WildGuessMountedSubProperty,
newEntry);
@ -650,7 +665,7 @@ index 6f42b1425..400b51576 100644
promise->start();
diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index 2e32527f6..be2e695a7 100644
index 9ce1b567fa..ef19a95180 100644
--- a/src/libsync/clientsideencryption.cpp
+++ b/src/libsync/clientsideencryption.cpp
@@ -18,7 +18,7 @@
@ -718,7 +733,7 @@ index 2e32527f6..be2e695a7 100644
return decryptedAndUnGzipped;
}
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 1046e5587..78e6fe969 100644
index 1832fc904d..c6e3c1088f 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -23,6 +23,7 @@
@ -730,7 +745,7 @@ index 1046e5587..78e6fe969 100644
#include "csync.h"
diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp
index 32f8db83b..5f773c409 100644
index b6a8708498..4e4f991c50 100644
--- a/src/libsync/filesystem.cpp
+++ b/src/libsync/filesystem.cpp
@@ -7,6 +7,7 @@
@ -743,7 +758,7 @@ index 32f8db83b..5f773c409 100644
#include "std/c_time.h"
diff --git a/src/libsync/kfcompat.cpp b/src/libsync/kfcompat.cpp
new file mode 100644
index 000000000..09a055288
index 0000000000..09a0552883
--- /dev/null
+++ b/src/libsync/kfcompat.cpp
@@ -0,0 +1,176 @@
@ -925,7 +940,7 @@ index 000000000..09a055288
+#endif // HAVE_KARCHIVE
diff --git a/src/libsync/kfcompat.h b/src/libsync/kfcompat.h
new file mode 100644
index 000000000..ba7eb4406
index 0000000000..ba7eb44067
--- /dev/null
+++ b/src/libsync/kfcompat.h
@@ -0,0 +1,7 @@
@ -937,7 +952,7 @@ index 000000000..ba7eb4406
+
+QByteArray unGzipData(const QByteArray& inputData);
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index b5b7a0968..c32e58051 100644
index b5b7a0968a..c32e580513 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -10,6 +10,7 @@
@ -958,7 +973,7 @@ index b5b7a0968..c32e58051 100644
emit finishedWithError(reply());
diff --git a/src/libsync/pushnotifications.cpp b/src/libsync/pushnotifications.cpp
index c7c259ab0..e7ab6d6ad 100644
index c7c259ab0f..e7ab6d6ad9 100644
--- a/src/libsync/pushnotifications.cpp
+++ b/src/libsync/pushnotifications.cpp
@@ -3,6 +3,7 @@
@ -997,7 +1012,7 @@ index c7c259ab0..e7ab6d6ad 100644
_webSocket->open(webSocketUrl);
}
diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp
index 81342a629..c0507f205 100644
index 81342a629e..c0507f205c 100644
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -9,6 +9,7 @@
@ -1065,10 +1080,10 @@ index 81342a629..c0507f205 100644
bool Theme::displayLegacyImportDialog() const
diff --git a/test/syncenginetestutils.cpp b/test/syncenginetestutils.cpp
index 589e190bb..5fc8d24c5 100644
index f6cac33740..8520969d29 100644
--- a/test/syncenginetestutils.cpp
+++ b/test/syncenginetestutils.cpp
@@ -416,8 +416,8 @@ FakePropfindReply::FakePropfindReply(FileInfo &remoteRootFileInfo, QNetworkAcces
@@ -417,8 +417,8 @@ FakePropfindReply::FakePropfindReply(FileInfo &remoteRootFileInfo, QNetworkAcces
xml.writeTextElement(davUri, QStringLiteral("getlastmodified"), stringDate);
xml.writeTextElement(davUri, QStringLiteral("getcontentlength"), QString::number(fileInfo.size));
xml.writeTextElement(davUri, QStringLiteral("getetag"), QStringLiteral("\"%1\"").arg(QString::fromLatin1(fileInfo.etag)));
@ -1080,7 +1095,7 @@ index 589e190bb..5fc8d24c5 100644
if (fileInfo.isShared) {
if (fileInfo.downloadForbidden) {
diff --git a/test/testdatefieldbackend.cpp b/test/testdatefieldbackend.cpp
index 850e9c919..fc0371170 100644
index 850e9c919c..fc0371170e 100644
--- a/test/testdatefieldbackend.cpp
+++ b/test/testdatefieldbackend.cpp
@@ -10,6 +10,7 @@
@ -1092,7 +1107,7 @@ index 850e9c919..fc0371170 100644
using namespace OCC;
diff --git a/test/testfolder.cpp b/test/testfolder.cpp
index b45cf4911..060f9aca0 100644
index b45cf49114..060f9aca0b 100644
--- a/test/testfolder.cpp
+++ b/test/testfolder.cpp
@@ -12,6 +12,7 @@
@ -1104,7 +1119,7 @@ index b45cf4911..060f9aca0 100644
#include "account.h"
diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
index c7be00218..59b832146 100644
index 503454e4d7..5f073a2a9e 100644
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -17,6 +17,7 @@
@ -1116,7 +1131,7 @@ index c7be00218..59b832146 100644
#include <QFile>
#include <QtTest>
diff --git a/test/testsyncjournaldb.cpp b/test/testsyncjournaldb.cpp
index 1e71e25ff..7bb62edcd 100644
index 1e71e25ff7..7bb62edcd7 100644
--- a/test/testsyncjournaldb.cpp
+++ b/test/testsyncjournaldb.cpp
@@ -14,6 +14,7 @@
@ -1128,7 +1143,7 @@ index 1e71e25ff..7bb62edcd 100644
using namespace OCC;
diff --git a/test/testsyncvirtualfiles.cpp b/test/testsyncvirtualfiles.cpp
index c4840c030..c531e0424 100644
index c4840c0308..c531e0424e 100644
--- a/test/testsyncvirtualfiles.cpp
+++ b/test/testsyncvirtualfiles.cpp
@@ -11,6 +11,7 @@