forked from pool/nextcloud-desktop
Compare commits
58 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 6d75d61519 | |||
| 6b12cdb15c | |||
| 92b22bb608 | |||
| 2fb1d7078e | |||
| 7c031dfe65 | |||
| d25f275d71 | |||
| 10f8cdc83a | |||
| cda14ea8f2 | |||
| 99f23e2568 | |||
| 50ff399a2d | |||
| 6b2c232b58 | |||
| 404c17aaab | |||
| dc2b1115b6 | |||
| aa59fed0a2 | |||
| 3907182743 | |||
| 9f056a24bd | |||
| e9165c9616 | |||
| f3cd8c1d5a | |||
| 33747d8292 | |||
| 501b5d4242 | |||
| 399d11b812 | |||
| 21ade741be | |||
| d754e44d0d | |||
| 8b6a85d12b | |||
| 7c99c89b08 | |||
| 99c1281337 | |||
| b5677cd5fb | |||
| 654219f316 | |||
| aec3eddb79 | |||
| 22ad1044c4 | |||
| cb4a22b7f2 | |||
| 8da401cfab | |||
| c0721b9222 | |||
| 2b9e24fb1d | |||
| d2db219568 | |||
| 2606f0dc60 | |||
| 5dccbae4be | |||
| a210f9a40b | |||
| 174980a15b | |||
| 823a3da9bf | |||
| 534db2e588 | |||
| 3bc512247c | |||
| d7a418336e | |||
| 712a8e4043 | |||
| f4ffcb9bbe | |||
| 0c6c9c494a | |||
| 21f90d4672 | |||
| ee0a0d9fc9 | |||
| 4862a0d25f | |||
| 513ad0166b | |||
| 61f1a67b9c | |||
| ad44ff97be | |||
| ff3ff46162 | |||
| 6b204c7bc9 | |||
| b0b588144f | |||
| cdd7d0f966 | |||
| e46fe5487b | |||
| af5c9585d7 |
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f1b0ffae207a8ab29d10f9cb6d51e107263cf45d138234bd8be1554eb12661f
|
||||
size 13784545
|
||||
3
nextcloud-desktop-4.0.6.tar.gz
Normal file
3
nextcloud-desktop-4.0.6.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:34079396b306be6e99c2f4073e23547ad1723b3da1988e04959b28ec7b9d1c9c
|
||||
size 8788779
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package nextcloud-desktop
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2026 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -18,21 +18,13 @@
|
||||
|
||||
%define soname libnextcloudsync
|
||||
%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
|
||||
%ifarch x86_64 aarch64 riscv64
|
||||
%define with_qtwebengine 1
|
||||
%endif
|
||||
|
||||
# std=c++17 and <filesystem> now required, use GCC >= 8 for Leap
|
||||
%if 0%{?suse_version} < 1650
|
||||
%define gcc_ver 9
|
||||
%endif
|
||||
Name: nextcloud-desktop
|
||||
Version: 3.13.3
|
||||
Version: 4.0.6
|
||||
Release: 0
|
||||
Summary: Nextcloud desktop synchronisation client
|
||||
License: GPL-2.0-or-later AND LGPL-3.0-or-later
|
||||
@@ -41,71 +33,57 @@ 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
|
||||
BuildRequires: gcc%{?gcc_ver}-c++
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRequires: libQt5Gui-private-headers-devel
|
||||
BuildRequires: libqt5-linguist-devel
|
||||
BuildRequires: ninja
|
||||
BuildRequires: kf6-extra-cmake-modules
|
||||
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: systemd-rpm-macros
|
||||
BuildRequires: cmake(KF6Archive)
|
||||
BuildRequires: cmake(KF6GuiAddons)
|
||||
BuildRequires: cmake(KF6KIO)
|
||||
BuildRequires: cmake(Qt6Concurrent)
|
||||
BuildRequires: cmake(Qt6Core) >= 6.5.0
|
||||
BuildRequires: cmake(Qt6Core5Compat)
|
||||
BuildRequires: cmake(Qt6DBus)
|
||||
BuildRequires: cmake(Qt6Gui)
|
||||
BuildRequires: cmake(Qt6Keychain)
|
||||
BuildRequires: cmake(Qt6LinguistTools)
|
||||
BuildRequires: cmake(Qt6Network)
|
||||
BuildRequires: cmake(Qt6Qml)
|
||||
BuildRequires: cmake(Qt6Quick)
|
||||
BuildRequires: cmake(Qt6QuickControls2)
|
||||
BuildRequires: cmake(Qt6QuickWidgets)
|
||||
BuildRequires: cmake(Qt6Sql)
|
||||
BuildRequires: cmake(Qt6Svg)
|
||||
BuildRequires: cmake(Qt6Test)
|
||||
%if 0%{?with_qtwebengine}
|
||||
BuildRequires: cmake(Qt6WebEngineCore)
|
||||
BuildRequires: cmake(Qt6WebEngineWidgets)
|
||||
%endif
|
||||
BuildRequires: cmake(Qt6WebSockets)
|
||||
BuildRequires: cmake(Qt6Widgets)
|
||||
BuildRequires: cmake(Qt6Xml)
|
||||
BuildRequires: pkgconfig(cloudproviders)
|
||||
BuildRequires: pkgconfig(cmocka)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
BuildRequires: pkgconfig(libp11)
|
||||
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}
|
||||
Requires: qt6-declarative-imports
|
||||
Requires: qt6-multimedia-imports
|
||||
Requires: qt6-qt5compat-imports
|
||||
Provides: nextcloud-client = %{version}
|
||||
Obsoletes: nextcloud-client < %{version}
|
||||
Provides: nextcloud-client-lang = %{version}
|
||||
Obsoletes: nextcloud-client-lang < %{version}
|
||||
%if 0%{?is_opensuse}
|
||||
BuildRequires: doxygen
|
||||
#BuildRequires: python3-MarkupSafe
|
||||
BuildRequires: python3-Sphinx
|
||||
#BuildRequires: python3-importlib-metadata
|
||||
Suggests: %{name}-doc = %{version}
|
||||
%endif
|
||||
|
||||
%description
|
||||
The Nextcloud Desktop Client is a tool to synchronise files from
|
||||
@@ -119,21 +97,6 @@ synchronisation client does the rest.
|
||||
|
||||
%lang_package
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
%package doc
|
||||
Summary: Documentation for nextcloud-desktop
|
||||
Group: Productivity/Networking/File-Sharing
|
||||
Provides: nextcloud-client-doc = %{version}
|
||||
Obsoletes: nextcloud-client-doc < %{version}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
The Nextcloud Desktop Client is a tool to synchronise files from
|
||||
the Nextcloud Server with your computer.
|
||||
|
||||
This package contains the documentation.
|
||||
%endif
|
||||
|
||||
%package -n %{soname}%{sover}
|
||||
Summary: The Nextcloud synchronisation library
|
||||
Group: Productivity/Networking/File-Sharing
|
||||
@@ -243,18 +206,16 @@ cp %{SOURCE2} ./
|
||||
%build
|
||||
# Set SOURCE_DATE_EPOCH to set __DATE__/__TIME__ based on tarball creation date and make build reproducible
|
||||
export SOURCE_DATE_EPOCH=`date -r VERSION.cmake +"%s"`
|
||||
%cmake \
|
||||
-DCMAKE_C_COMPILER=gcc%{?gcc_ver:-%{gcc_ver}} \
|
||||
-DCMAKE_CXX_COMPILER=g++%{?gcc_ver:-%{gcc_ver}} \
|
||||
%if 0%{?is_opensuse}
|
||||
-DWITH_DOC=ON \
|
||||
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
|
||||
%cmake_qt6 \
|
||||
%if !0%{?with_qtwebengine}
|
||||
-DBUILD_WITH_WEBENGINE=FALSE
|
||||
%endif
|
||||
%{nil}
|
||||
%cmake_build
|
||||
|
||||
%qt6_build
|
||||
|
||||
%install
|
||||
%cmake_install
|
||||
%qt6_install
|
||||
|
||||
%if 0%{!?is_opensuse}
|
||||
# There's no Caja and Nemo in SLE.
|
||||
@@ -276,8 +237,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}/
|
||||
|
||||
@@ -289,6 +250,18 @@ at an early experimental stage. Enable at your own risk. \
|
||||
Please read %{_docdir}/nextcloud-desktop-vfs-plugin/README.vfs.md for steps \
|
||||
needed to enable the plugin." || true
|
||||
|
||||
%pre
|
||||
%systemd_user_pre com.nextcloud.desktopclient.nextcloud.service
|
||||
|
||||
%post
|
||||
%systemd_user_post com.nextcloud.desktopclient.nextcloud.service
|
||||
|
||||
%preun
|
||||
%systemd_user_preun com.nextcloud.desktopclient.nextcloud.service
|
||||
|
||||
%postun
|
||||
%systemd_user_postun com.nextcloud.desktopclient.nextcloud.service
|
||||
|
||||
%files
|
||||
%license COPYING*
|
||||
#%%config %%{_sysconfdir}/sysctl.d/99-%%{name}-sync-inotify.conf
|
||||
@@ -299,15 +272,11 @@ needed to enable the plugin." || true
|
||||
%dir %{_datadir}/icons/hicolor/1024x1024/apps/
|
||||
%{_datadir}/icons/hicolor/*/apps/Nextcloud*.*
|
||||
%{_datadir}/mime/packages/nextcloud.xml
|
||||
%{_userunitdir}/com.nextcloud.desktopclient.nextcloud.service
|
||||
|
||||
%files lang
|
||||
%{_datadir}/nextcloud/i18n/
|
||||
|
||||
%if 0%{?is_opensuse}
|
||||
%files doc
|
||||
%doc %{_docdir}/%{name}/
|
||||
%endif
|
||||
|
||||
%files -n %{soname}%{sover}
|
||||
%license COPYING*
|
||||
%{_libdir}/%{soname}.so.*
|
||||
@@ -352,17 +321,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 +338,6 @@ needed to enable the plugin." || true
|
||||
%license COPYING
|
||||
%doc README.vfs.md
|
||||
%{_libdir}/nextcloudsync_vfs_*.so
|
||||
%{_libqt5_plugindir}/*.so
|
||||
%{_qt6_pluginsdir}/*.so
|
||||
|
||||
%changelog
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user