diff --git a/nextcloud-desktop-3.13.4.tar.gz b/nextcloud-desktop-3.13.4.tar.gz deleted file mode 100644 index d726c87..0000000 --- a/nextcloud-desktop-3.13.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f484b78cee84315e1d0cdf74d6752999b654ab28de66e133a5ae8b1f06e191a -size 13784649 diff --git a/nextcloud-desktop-3.14.1.tar.gz b/nextcloud-desktop-3.14.1.tar.gz new file mode 100644 index 0000000..d8b84a9 --- /dev/null +++ b/nextcloud-desktop-3.14.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83ddff511684c7b56a0a428c1a50630042a4c64d7b382d13b083509051cac8b9 +size 13956052 diff --git a/nextcloud-desktop.changes b/nextcloud-desktop.changes index 11dbed2..ca28a42 100644 --- a/nextcloud-desktop.changes +++ b/nextcloud-desktop.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Sat Sep 28 18:32:24 UTC 2024 - Atri Bhattacharya + +- Update to version 3.14.1: + * Bugfix/fix vfs folder state when remote move is forbidden + (gh#nextcloud/desktop#7131). + * Revert always enable http2 (gh#nextcloud/desktop#7192). + * Add ability to provide multiple hardcoded server URLs via + CMake define (gh#nextcloud/desktop#7197). + * Bugfix/fix upload locked files (gh#nextcloud/desktop#7201). + * Use version of linuxdeploy-plugin-qt from PR in the project + (gh#nextcloud/desktop#7207). + * Bugfix/missing unlock command (gh#nextcloud/desktop#7213). + * Fix alignment and size of buttons (gh#nextcloud/desktop#7217). + * disable our code for network timeout + (gh#nextcloud/desktop#7218). + * Only check for leading/trailing space for files on Windows + (gh#nextcloud/desktop#7224). +- Changes from version 3.14.0: + * Too many to list, see + . +- Switch to building with Qt6; upstream no longer supports Qt5. +- Drop nextcloud-fix-HiDPI-window-size.patch: Not needed with Qt6. + ------------------------------------------------------------------- Sat Sep 14 05:24:42 UTC 2024 - Natasha Ament diff --git a/nextcloud-desktop.spec b/nextcloud-desktop.spec index c40684c..9876bf6 100644 --- a/nextcloud-desktop.spec +++ b/nextcloud-desktop.spec @@ -20,19 +20,12 @@ %define sover 0 %define __builder ninja -# For dolphin KF5/KF6 integration -%if 0%{?suse_version} < 1650 -%bcond_with qt6_dolphin -%else -%bcond_without qt6_dolphin -%endif - # std=c++17 and now required, use GCC >= 8 for Leap %if 0%{?suse_version} < 1650 %define gcc_ver 9 %endif Name: nextcloud-desktop -Version: 3.13.4 +Version: 3.14.1 Release: 0 Summary: Nextcloud desktop synchronisation client License: GPL-2.0-or-later AND LGPL-3.0-or-later @@ -41,8 +34,6 @@ URL: https://nextcloud.com/ Source: https://github.com/nextcloud/desktop/archive/v%{version}/%{name}-%{version}.tar.gz Source1: sysctl-sync-inotify.conf Source2: README.vfs.md -# PATCH-FIX-UPSTREAM nextcloud-fix-HiDPI-window-size.patch badshah400@gmail.com -- Fix huge size of the nextcloud client settings and crash-reporter windows on HiDPI systems -Patch0: nextcloud-fix-HiDPI-window-size.patch BuildRequires: AppStream BuildRequires: cmake >= 3.8.0 BuildRequires: fdupes @@ -50,50 +41,43 @@ BuildRequires: gcc%{?gcc_ver}-c++ BuildRequires: glibc-devel BuildRequires: gobject-introspection-devel BuildRequires: hicolor-icon-theme +BuildRequires: kf6-extra-cmake-modules BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libqt5-linguist-devel BuildRequires: ninja BuildRequires: pkgconfig -BuildRequires: qtkeychain-qt5-devel BuildRequires: rsvg-convert BuildRequires: update-desktop-files -BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5GuiAddons) -###BuildRequires: cmake(Qt5Keychain) -BuildRequires: pkgconfig(Qt5Concurrent) -BuildRequires: pkgconfig(Qt5Core) >= 5.15 -BuildRequires: pkgconfig(Qt5DBus) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5PrintSupport) -BuildRequires: pkgconfig(Qt5QuickControls2) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5Svg) -BuildRequires: pkgconfig(Qt5WebEngineWidgets) -BuildRequires: pkgconfig(Qt5WebSockets) -BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: cmake(KF6Archive) +BuildRequires: cmake(KF6GuiAddons) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(Qt6Keychain) +BuildRequires: cmake(Qt6XcbQpaPrivate) +BuildRequires: pkgconfig(Qt6Concurrent) +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Core5Compat) +BuildRequires: pkgconfig(Qt6DBus) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6Linguist) +BuildRequires: pkgconfig(Qt6Network) +BuildRequires: pkgconfig(Qt6PrintSupport) +BuildRequires: pkgconfig(Qt6QuickControls2) +BuildRequires: pkgconfig(Qt6Sql) +BuildRequires: pkgconfig(Qt6Svg) +BuildRequires: pkgconfig(Qt6Test) +BuildRequires: pkgconfig(Qt6WebEngineWidgets) +BuildRequires: pkgconfig(Qt6WebSockets) +BuildRequires: pkgconfig(Qt6Xml) BuildRequires: pkgconfig(cloudproviders) BuildRequires: pkgconfig(cmocka) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(openssl) >= 1.1 BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(zlib) -%if %{with qt6_dolphin} -BuildRequires: kf6-extra-cmake-modules -BuildRequires: cmake(KF6KIO) -BuildRequires: pkgconfig(Qt6Core) -BuildRequires: pkgconfig(Qt6DBus) -BuildRequires: pkgconfig(Qt6Network) BuildRequires: rpm_macro(_qt6_pluginsdir) -%else -BuildRequires: extra-cmake-modules -BuildRequires: cmake(KF5KIO) >= 5.16 -%endif # Recommends: cloudproviders-extension-nextcloud = %{version} Requires: %{soname}%{sover} = %{version} -Requires: libqt5-qtgraphicaleffects -Requires: libqt5-qtquickcontrols2 Requires: nextcloud-cli = %{version} Provides: nextcloud-client = %{version} Obsoletes: nextcloud-client < %{version} @@ -276,8 +260,8 @@ done # %%{buildroot}%%{_sysconfdir}/sysctl.d/99-%%{name}-sync-inotify.conf # Needs the following symlinks for VFS support, otherwise client crashes when VFS is enabled -mkdir -p %{buildroot}%{_libqt5_plugindir} -ln -s -t %{buildroot}%{_libqt5_plugindir}/ %{_libdir}/nextcloudsync_vfs_{suffix,xattr}.so +mkdir -p %{buildroot}%{_qt6_pluginsdir} +ln -s -t %{buildroot}%{_qt6_pluginsdir}/ %{_libdir}/nextcloudsync_vfs_{suffix,xattr}.so %fdupes %{buildroot}%{_datadir}/ @@ -352,17 +336,10 @@ needed to enable the plugin." || true %files dolphin %{_libdir}/libnextclouddolphinpluginhelper.so -%if %{with qt6_dolphin} %dir %{_qt6_pluginsdir}/kf6/kfileitemaction %{_qt6_pluginsdir}/kf6/kfileitemaction/nextclouddolphinactionplugin.so %dir %{_qt6_pluginsdir}/kf6/overlayicon %{_qt6_pluginsdir}/kf6/overlayicon/nextclouddolphinoverlayplugin.so -%else -%dir %{_libqt5_plugindir}/kf5/kfileitemaction -%{_libqt5_plugindir}/kf5/kfileitemaction/nextclouddolphinactionplugin.so -%dir %{_libqt5_plugindir}/kf5/overlayicon -%{_libqt5_plugindir}/kf5/overlayicon/nextclouddolphinoverlayplugin.so -%endif # /SECTION %endif @@ -376,6 +353,6 @@ needed to enable the plugin." || true %license COPYING %doc README.vfs.md %{_libdir}/nextcloudsync_vfs_*.so -%{_libqt5_plugindir}/*.so +%{_qt6_pluginsdir}/*.so %changelog diff --git a/nextcloud-fix-HiDPI-window-size.patch b/nextcloud-fix-HiDPI-window-size.patch deleted file mode 100644 index d887a8d..0000000 --- a/nextcloud-fix-HiDPI-window-size.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: desktop-3.9.0/src/gui/main.cpp -=================================================================== ---- desktop-3.9.0.orig/src/gui/main.cpp -+++ desktop-3.9.0/src/gui/main.cpp -@@ -65,6 +65,8 @@ int main(int argc, char **argv) - - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); -+ QApplication::setHighDpiScaleFactorRoundingPolicy( -+ Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); - #ifdef Q_OS_MAC - Mac::CocoaInitializer cocoaInit; // RIIA - #endif -Index: desktop-3.9.0/src/crashreporter/main.cpp -=================================================================== ---- desktop-3.9.0.orig/src/crashreporter/main.cpp -+++ desktop-3.9.0/src/crashreporter/main.cpp -@@ -25,6 +25,8 @@ - int main(int argc, char *argv[]) - { - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); -+ QApplication::setHighDpiScaleFactorRoundingPolicy( -+ Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); - #ifdef Q_OS_WIN - QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); - #endif // !Q_OS_WIN -