From f3f40de1c1deb5356264d1f3284887423b87b572 Mon Sep 17 00:00:00 2001 From: Mukundan Ragavan Date: Sat, 28 May 2022 14:08:08 -0500 Subject: [PATCH] Update to v3.5.1; drop gcc-12 patch --- .gitignore | 1 + gcc_12_fix.patch | 83 ------------------------------ nextcloud-client.spec | 4 +- sources | 2 +- xcb_3.4.4.patch => xcb_3.5.1.patch | 0 5 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 gcc_12_fix.patch rename xcb_3.4.4.patch => xcb_3.5.1.patch (100%) diff --git a/.gitignore b/.gitignore index 5de9655..2ebeb64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /desktop-3.4.2.tar.gz /desktop-3.4.4.tar.gz +/desktop-3.5.1.tar.gz diff --git a/gcc_12_fix.patch b/gcc_12_fix.patch deleted file mode 100644 index d1f0b7b..0000000 --- a/gcc_12_fix.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- src/common/vfs.h.orig 2022-03-21 20:53:50.276310515 -0500 -+++ src/common/vfs.h 2022-03-21 21:00:33.902698088 -0500 -@@ -168,24 +168,24 @@ - * If the remote metadata changes, the local placeholder's metadata should possibly - * change as well. - */ -- virtual Q_REQUIRED_RESULT Result updateMetadata(const QString &filePath, time_t modtime, qint64 size, const QByteArray &fileId) = 0; -+ Q_REQUIRED_RESULT virtual Result updateMetadata(const QString &filePath, time_t modtime, qint64 size, const QByteArray &fileId) = 0; - - /// Create a new dehydrated placeholder. Called from PropagateDownload. -- virtual Q_REQUIRED_RESULT Result createPlaceholder(const SyncFileItem &item) = 0; -+ Q_REQUIRED_RESULT virtual Result createPlaceholder(const SyncFileItem &item) = 0; - - /** Convert a hydrated placeholder to a dehydrated one. Called from PropagateDownlaod. - * - * This is different from delete+create because preserving some file metadata - * (like pin states) may be essential for some vfs plugins. - */ -- virtual Q_REQUIRED_RESULT Result dehydratePlaceholder(const SyncFileItem &item) = 0; -+ Q_REQUIRED_RESULT virtual Result dehydratePlaceholder(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 Q_REQUIRED_RESULT bool needsMetadataUpdate(const SyncFileItem &item) = 0; -+ Q_REQUIRED_RESULT virtual bool needsMetadataUpdate(const SyncFileItem &item) = 0; - - /** Convert a new file to a hydrated placeholder. - * -@@ -200,13 +200,13 @@ - * new placeholder shall supersede, for rename-replace actions with new downloads, - * for example. - */ -- virtual Q_REQUIRED_RESULT Result convertToPlaceholder( -+ Q_REQUIRED_RESULT virtual Result convertToPlaceholder( - const QString &filename, - const SyncFileItem &item, - const QString &replacesFile = QString()) = 0; - - /// Determine whether the file at the given absolute path is a dehydrated placeholder. -- virtual Q_REQUIRED_RESULT bool isDehydratedPlaceholder(const QString &filePath) = 0; -+ Q_REQUIRED_RESULT virtual bool isDehydratedPlaceholder(const QString &filePath) = 0; - - /** Similar to isDehydratedPlaceholder() but used from sync discovery. - * -@@ -215,7 +215,7 @@ - * - * Returning true means that type was fully determined. - */ -- virtual Q_REQUIRED_RESULT bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0; -+ Q_REQUIRED_RESULT virtual bool statTypeVirtualFile(csync_file_stat_t *stat, void *stat_data) = 0; - - /** Sets the pin state for the item at a path. - * -@@ -226,7 +226,7 @@ - * - * folderPath is relative to the sync folder. Can be "" for root folder. - */ -- virtual Q_REQUIRED_RESULT bool setPinState(const QString &folderPath, PinState state) = 0; -+ Q_REQUIRED_RESULT virtual bool setPinState(const QString &folderPath, PinState state) = 0; - - /** Returns the pin state of an item at a path. - * -@@ -237,7 +237,7 @@ - * - * Returns none on retrieval error. - */ -- virtual Q_REQUIRED_RESULT Optional pinState(const QString &folderPath) = 0; -+ Q_REQUIRED_RESULT virtual Optional pinState(const QString &folderPath) = 0; - - /** Returns availability status of an item at a path. - * -@@ -246,7 +246,7 @@ - * - * folderPath is relative to the sync folder. Can be "" for root folder. - */ -- virtual Q_REQUIRED_RESULT AvailabilityResult availability(const QString &folderPath) = 0; -+ Q_REQUIRED_RESULT virtual AvailabilityResult availability(const QString &folderPath) = 0; - - public slots: - /** Update in-sync state based on SyncFileStatusTracker signal. diff --git a/nextcloud-client.spec b/nextcloud-client.spec index 8f07627..07b2dc2 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -4,7 +4,7 @@ %endif Name: nextcloud-client -Version: 3.4.4 +Version: 3.5.1 Release: %autorelease Summary: The Nextcloud Client @@ -16,7 +16,6 @@ Source1: nextcloud.appdata.xml # Patch0: fixes GNOME quirks on Wayland sessions. Read # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/ Patch0: xcb_%{version}.patch -Patch1: gcc_12_fix.patch BuildRequires: check BuildRequires: chrpath @@ -146,7 +145,6 @@ The nextcloud desktop client dolphin extension. %prep %setup -n desktop-%{version} %patch0 -p1 -%patch1 # change compiler flag diff --git a/sources b/sources index 07b819e..927d1e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-3.4.4.tar.gz) = 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4 +SHA512 (desktop-3.5.1.tar.gz) = 989cc4c99f81f7451af8b13453155f0c89448226ade565025030a8064c7e54e5668b37744564685cc700f2b5a54f899d563a4be2bfe023e43987928982a2feba diff --git a/xcb_3.4.4.patch b/xcb_3.5.1.patch similarity index 100% rename from xcb_3.4.4.patch rename to xcb_3.5.1.patch