Updates for building with Qt6

This commit is contained in:
István Váradi 2024-06-30 13:41:01 +02:00
parent de04763fc0
commit c8c1f57607
3 changed files with 29 additions and 14 deletions

30
debian/control vendored
View File

@ -15,24 +15,26 @@ Build-Depends: appstream,
libcmocka-dev,
libdbus-1-dev,
libinotify-dev [kfreebsd-any],
libkf5archive-dev,
libkf5coreaddons-dev (>= 5.16.0~),
libkf5kio-dev (>= 5.16.0~),
libqt5svg5-dev,
libqt5webkit5-dev,
libqt5websockets5-dev,
libkf6archive-dev,
libqt6opengl6-dev,
libgl-dev,
libqt6svg6-dev,
libqt6websockets6-dev,
libsqlite3-dev (>= 3.8.0~),
libssl-dev (>= 1.1~),
pkg-config,
python3-all,
python3-sphinx,
qt5keychain-dev,
qtbase5-dev (>= 5.6~),
qtquickcontrols2-5-dev,
qttools5-dev,
qttools5-dev-tools,
qtwebengine5-dev (>= 5.6~),
qtbase5-private-dev,
qtkeychain-qt6-dev,
qt6-base-dev (>= 6.4~),
qt6-tools-dev,
qt6-tools-dev-tools,
qt6-webengine-dev (>= 6.4~),
qt6-webengine-dev-tools,
qt6-base-private-dev,
qt6-l10n-tools,
libqt6core5compat6-dev,
texlive-latex-base,
zlib1g-dev,
xauth,
@ -46,7 +48,7 @@ Vcs-Git: https://salsa.debian.org/owncloud-team/nextcloud-desktop.git
Package: nextcloud-desktop
Architecture: any
Depends: libnextcloudsync0 (= ${binary:Version}),
libqt5sql5-sqlite,
libqt6sql6-sqlite,
nextcloud-desktop-common,
nextcloud-desktop-l10n,
qml-module-qtqml-models2,
@ -147,7 +149,7 @@ Description: Nextcloud folder synchronization - localization
Package: nextcloud-desktop-cmd
Architecture: any
Depends: libnextcloudsync0 (= ${binary:Version}),
libqt5sql5-sqlite,
libqt6sql6-sqlite,
nextcloud-desktop-common,
nextcloud-desktop-l10n,
${misc:Depends},

12
debian/patches/0008-qt6.patch vendored Normal file
View File

@ -0,0 +1,12 @@
diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt
index 02035d863..ba2438305 100644
--- a/shell_integration/libcloudproviders/CMakeLists.txt
+++ b/shell_integration/libcloudproviders/CMakeLists.txt
@@ -26,6 +26,7 @@ endmacro(libcloudproviders_add_config _sources)
if (Qt6_FOUND)
+ set(QT_NO_CREATE_VERSIONLESS_TARGETS TRUE)
find_package(Qt6 COMPONENTS COMPONENTS DBus)
else()
set(REQUIRED_QT_VERSION "5.15.0")

View File

@ -2,3 +2,4 @@
0003-use_system_buildflags.patch
0004-sane-cmake.patch
0007-vfs-plugin.patch
0008-qt6.patch