diff --git a/.gitignore b/.gitignore index d407766..c264f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1 @@ -/owncloudclient-2.1.0.tar.xz -/client-2.1.1.tar.gz -/owncloudclient-2.1.1.tar.xz -/owncloudclient-2.2.0.tar.xz -/owncloudclient-2.2.2.tar.xz -/client-2.2.4.tar.gz -/owncloudclient-2.2.4.tar.xz -/owncloudclient-2.3.0.tar.xz -/owncloudclient-2.3.2.tar.xz -/owncloudclient-2.3.3.tar.xz -/owncloudclient-2.4.0.tar.xz -/owncloudclient-2.5.4.11654.tar.xz -/owncloudclient-2.6.0.13018.tar.xz -/owncloudclient-2.6.3.14058.tar.xz -/ownCloud-2.7.4.2934.tar.xz -/ownCloud-2.9.0.5150.tar.xz +/ownCloud-*.tar.xz diff --git a/69-sync-inotify.conf b/69-sync-inotify.conf new file mode 100644 index 0000000..63dc5fe --- /dev/null +++ b/69-sync-inotify.conf @@ -0,0 +1 @@ +fs.inotify.max_user_watches=524288 diff --git a/ownCloud.conf b/ownCloud.conf new file mode 100644 index 0000000..5e9d707 --- /dev/null +++ b/ownCloud.conf @@ -0,0 +1 @@ +skipUpdateCheck=true diff --git a/owncloud-client-2.10.1.7389-gcc12.patch b/owncloud-client-2.10.1.7389-gcc12.patch new file mode 100644 index 0000000..3198141 --- /dev/null +++ b/owncloud-client-2.10.1.7389-gcc12.patch @@ -0,0 +1,93 @@ +From c1e3bb8457d77619a1c31217716789e76fd06500 Mon Sep 17 00:00:00 2001 +From: Hannah von Reth +Date: Fri, 20 May 2022 11:19:59 +0200 +Subject: [PATCH] Fix build with gcc12 + +--- + src/common/asserts.h | 2 +- + src/common/vfs.h | 16 ++++++++-------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/src/common/asserts.h b/src/common/asserts.h +index 9f43c532a6d..5fa4b4da3e5 100644 +--- a/src/common/asserts.h ++++ b/src/common/asserts.h +@@ -44,7 +44,7 @@ + } else { \ + } + +-inline OC_REQUIRED_RESULT bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info) ++OC_REQUIRED_RESULT inline bool __OC_ENSURE(bool condition, const char *cond, const char *file, int line, const char *info) + { + if (Q_UNLIKELY(!condition)) { + OC_ASSERT_MSG("ENSURE: \"%s\" in file %s, line %d %s", cond, file, line, info); +diff --git a/src/common/vfs.h b/src/common/vfs.h +index 983c999106c..da04d7ed97d 100644 +--- a/src/common/vfs.h ++++ b/src/common/vfs.h +@@ -162,17 +162,17 @@ class OCSYNC_EXPORT Vfs : public QObject + virtual bool isHydrating() const = 0; + + /// Create a new dehydrated placeholder. Called from PropagateDownload. +- virtual OC_REQUIRED_RESULT Result createPlaceholder(const SyncFileItem &item) = 0; ++ OC_REQUIRED_RESULT virtual Result createPlaceholder(const SyncFileItem &item) = 0; + + /** Discovery hook: even unchanged files may need UPDATE_METADATA. + * + * For instance cfapi vfs wants local hydrated non-placeholder files to + * become hydrated placeholder files. + */ +- virtual OC_REQUIRED_RESULT bool needsMetadataUpdate(const SyncFileItem &item) = 0; ++ OC_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem &item) = 0; + + /// Determine whether the file at the given absolute path is a dehydrated placeholder. +- virtual OC_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString &filePath) = 0; ++ OC_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString &filePath) = 0; + + /** Similar to isDehydratedPlaceholder() but used from sync discovery. + * +@@ -181,7 +181,7 @@ class OCSYNC_EXPORT Vfs : public QObject + * + * Returning true means that type was fully determined. + */ +- virtual OC_REQUIRED_RESULT bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0; ++ OC_REQUIRED_RESULT virtual bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0; + + /** Sets the pin state for the item at a path. + * +@@ -192,7 +192,7 @@ class OCSYNC_EXPORT Vfs : public QObject + * + * relFilePath is relative to the sync folder. Can be "" for root folder. + */ +- virtual OC_REQUIRED_RESULT bool setPinState(const QString &relFilePath, PinState state) = 0; ++ OC_REQUIRED_RESULT virtual bool setPinState(const QString &relFilePath, PinState state) = 0; + + /** Returns the pin state of an item at a path. + * +@@ -203,7 +203,7 @@ class OCSYNC_EXPORT Vfs : public QObject + * + * Returns none on retrieval error. + */ +- virtual OC_REQUIRED_RESULT Optional pinState(const QString &relFilePath) = 0; ++ OC_REQUIRED_RESULT virtual Optional pinState(const QString &relFilePath) = 0; + + /** Returns availability status of an item at a path. + * +@@ -212,7 +212,7 @@ class OCSYNC_EXPORT Vfs : public QObject + * + * folderPath is relative to the sync folder. Can be "" for root folder. + */ +- virtual OC_REQUIRED_RESULT AvailabilityResult availability(const QString &folderPath) = 0; ++ OC_REQUIRED_RESULT virtual AvailabilityResult availability(const QString &folderPath) = 0; + + public slots: + /** Update in-sync state based on SyncFileStatusTracker signal. +@@ -240,7 +240,7 @@ public slots: + * If the remote metadata changes, the local placeholder's metadata should possibly + * change as well. + */ +- virtual OC_REQUIRED_RESULT Result updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0; ++ OC_REQUIRED_RESULT virtual Result updateMetadata(const SyncFileItem &item, const QString &filePath, const QString &replacesFile) = 0; + + /** Setup the plugin for the folder. + * diff --git a/owncloud-client.spec b/owncloud-client.spec index 7c826a8..e6e2575 100644 --- a/owncloud-client.spec +++ b/owncloud-client.spec @@ -1,7 +1,7 @@ Name: owncloud-client -Version: 2.9.0 -%global vertag 5150 -Release: 3%{?dist} +Version: 2.10.1 +%global vertag 7389 +Release: 1%{?dist} Summary: The ownCloud Client # -libs are LGPLv2+, rest GPLv2 @@ -9,6 +9,9 @@ License: LGPLv2+ and GPLv2 Url: http://owncloud.org/sync-clients/ Source0: https://download.owncloud.com/desktop/ownCloud/stable/%{version}.%{vertag}/source/ownCloud-%{version}.%{vertag}.tar.xz Source1: owncloud.appdata.xml +# https://github.com/owncloud/client/issues/410 +Source2: 69-sync-inotify.conf +Source3: ownCloud.conf # The patch does 3 things: # - Depends on system lib for QtSingleApplication and QtLockedFile @@ -18,6 +21,8 @@ Source1: owncloud.appdata.xml # These fix are needed because the system wide QtSingleApplication is slightly # different from the bundled one. Patch0: owncloud-client-2.9.0-syslibs.patch +# https://github.com/owncloud/client/commit/c1e3bb8457d77619a1c31217716789e76fd06500 +Patch1: owncloud-client-2.10.1.7389-gcc12.patch BuildRequires: check BuildRequires: cmake @@ -55,7 +60,6 @@ With it you can create folders in your home directory, and keep the contents of those folders synced with your ownCloud server. Simply copy a file into the directory and the ownCloud Client does the rest. - %package libs Summary: Common files for owncloud-client and owncloud-client License: LGPLv2+ @@ -66,7 +70,6 @@ Obsoletes: mirall-common < 1.8.0 Provides common files for owncloud-client and owncloud-client such as the configuration file that determines the excluded files in a sync. - %package devel Summary: Development files for owncloud-client License: LGPLv2+ @@ -85,7 +88,6 @@ Requires: python3-nautilus Provides: mirall-nautilus = %{version}-%{release} Obsoletes: mirall-nautilus < 1.8.0 - %description nautilus The owncloud desktop client nautilus extension. @@ -130,6 +132,8 @@ rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication %cmake_install mkdir -p %{buildroot}%{_datadir}/appdata/ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/owncloud.appdata.xml +install -m 644 -D %{SOURCE2} %{buildroot}/etc/sysctl.d/69-sync-inotify.conf +install -m 644 -D %{SOURCE3} %{buildroot}/etc/ownCloud/ # for distros that do not have KDE Plasma 5 rm -f %{buildroot}%{_libdir}/libnextclouddolphinpluginhelper.so @@ -143,6 +147,11 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/owncloud.a %files +%license COPYING +%doc README.md +%dir %{_sysconfdir}/ownCloud +%config(noreplace) %{_sysconfdir}/ownCloud/ownCloud.conf +%config(noreplace) %{_sysconfdir}/sysctl.d/69-sync-inotify.conf %{_bindir}/owncloud %{_bindir}/owncloudcmd %{_datadir}/applications/owncloud.desktop @@ -151,18 +160,16 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/owncloud.a %{_datadir}/mime/packages/owncloud.xml %files libs +%license COPYING %{_libdir}/libowncloudsync.so.0 %{_libdir}/libowncloudsync.so.%{version} %{_libdir}/libowncloud_csync.so.* -%doc README.md -%license COPYING %config(noreplace) %{_sysconfdir}/ownCloud/sync-exclude.lst -%dir %{_sysconfdir}/ownCloud %{_libdir}/qt5/plugins/owncloudsync_vfs_suffix.so %files devel -%{_libdir}/libowncloudsync.so %{_includedir}/owncloudsync/ +%{_libdir}/libowncloudsync.so %{_libdir}/libowncloud_csync.so %files nautilus @@ -177,11 +184,14 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/owncloud.a %files dolphin %{_libdir}/libownclouddolphinpluginhelper.so %{_kf5_plugindir}/overlayicon/ownclouddolphinoverlayplugin.so -%{_qt5_plugindir}/ownclouddolphinactionplugin.so %{_kf5_datadir}/kservices5/ownclouddolphinactionplugin.desktop +%{_qt5_plugindir}/ownclouddolphinactionplugin.so %changelog +* Thu Aug 04 2022 Ali Erdinc Koroglu - 2.10.1-1 +- Update to 2.10.1 (RHBZ #2106447) + * Fri Jul 22 2022 Fedora Release Engineering - 2.9.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0d3fd3f..f32512e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ownCloud-2.7.4.2934.tar.xz) = 7e04d987751d0b8e29fbe8ba8ae58f38fabd7f5007f7508d001532e595b00f58cce487b1d180928154286ffd6b01db1e6ca0407f7d675e8b101ec4ae8414f2a6 -SHA512 (ownCloud-2.9.0.5150.tar.xz) = c183b2d4340dc8880d2bf31aedaffb96da518fdb60f1e8c857ee2f8d02c36cb69552475fdbf536f7ecebd9af2a7732f52a9e02f20450452c78d346910be3cf57 +SHA512 (ownCloud-2.10.1.7389.tar.xz) = 2a0893d48786b88f8210966a2b6b48f5bdada82818d4115e68ecc6c0c926ba62bc74df03c4ab35eb271aef2f3a43b36b1a6a115585efe3739fd4a6164f9c45a1