Update to v3.5.1; drop gcc-12 patch

f40
Mukundan Ragavan 2 years ago
parent a38e5cb077
commit f3f40de1c1

1
.gitignore vendored

@ -1,2 +1,3 @@
/desktop-3.4.2.tar.gz /desktop-3.4.2.tar.gz
/desktop-3.4.4.tar.gz /desktop-3.4.4.tar.gz
/desktop-3.5.1.tar.gz

@ -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<void, QString> updateMetadata(const QString &filePath, time_t modtime, qint64 size, const QByteArray &fileId) = 0;
+ Q_REQUIRED_RESULT virtual Result<void, QString> 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<void, QString> createPlaceholder(const SyncFileItem &item) = 0;
+ Q_REQUIRED_RESULT virtual Result<void, QString> 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<void, QString> dehydratePlaceholder(const SyncFileItem &item) = 0;
+ Q_REQUIRED_RESULT virtual Result<void, QString> 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<Vfs::ConvertToPlaceholderResult, QString> convertToPlaceholder(
+ Q_REQUIRED_RESULT virtual Result<Vfs::ConvertToPlaceholderResult, QString> 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> pinState(const QString &folderPath) = 0;
+ Q_REQUIRED_RESULT virtual Optional<PinState> 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.

@ -4,7 +4,7 @@
%endif %endif
Name: nextcloud-client Name: nextcloud-client
Version: 3.4.4 Version: 3.5.1
Release: %autorelease Release: %autorelease
Summary: The Nextcloud Client Summary: The Nextcloud Client
@ -16,7 +16,6 @@ Source1: nextcloud.appdata.xml
# Patch0: fixes GNOME quirks on Wayland sessions. Read # Patch0: fixes GNOME quirks on Wayland sessions. Read
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/ # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/3BVLBS4B3XHJEXFVGD7RK2ZMXZG6JQZT/
Patch0: xcb_%{version}.patch Patch0: xcb_%{version}.patch
Patch1: gcc_12_fix.patch
BuildRequires: check BuildRequires: check
BuildRequires: chrpath BuildRequires: chrpath
@ -146,7 +145,6 @@ The nextcloud desktop client dolphin extension.
%prep %prep
%setup -n desktop-%{version} %setup -n desktop-%{version}
%patch0 -p1 %patch0 -p1
%patch1
# change compiler flag # change compiler flag

@ -1 +1 @@
SHA512 (desktop-3.4.4.tar.gz) = 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4 SHA512 (desktop-3.5.1.tar.gz) = 989cc4c99f81f7451af8b13453155f0c89448226ade565025030a8064c7e54e5668b37744564685cc700f2b5a54f899d563a4be2bfe023e43987928982a2feba

Loading…
Cancel
Save