Update to 3.1.3

f40
Mukundan Ragavan 4 years ago
parent 5bd4af93e7
commit 367cc45144

1
.gitignore vendored

@ -25,3 +25,4 @@
/desktop-3.0.3.tar.gz
/desktop-3.1.0.tar.gz
/desktop-3.1.1.tar.gz
/desktop-3.1.3.tar.gz

@ -3,8 +3,8 @@
%global _hardened_build 1
Name: nextcloud-client
Version: 3.1.1
Release: 2%{?dist}
Version: 3.1.3
Release: 1%{?dist}
Summary: The Nextcloud Client
# -libs are LGPLv2+, rest GPLv2
@ -21,6 +21,7 @@ Source1: nextcloud.appdata.xml
# different from the bundled one.
#Patch0: %%{name}-%%{version}-syslibs.patch
Patch1: nextcloud-client-picpie.patch
Patch2: nextcloud-client_extern.patch
BuildRequires: check
BuildRequires: chrpath
@ -28,6 +29,7 @@ BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: doxygen
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: inotify-tools-devel
BuildRequires: libcloudproviders-devel
BuildRequires: libappstream-glib
BuildRequires: neon-devel
@ -47,6 +49,7 @@ BuildRequires: qt5-qttools
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtquickcontrols2-devel
BuildRequires: qt5-qtwebengine-devel
BuildRequires: qt5-qtwebsockets-devel
BuildRequires: qt5-qtsvg-devel
BuildRequires: extra-cmake-modules
# Plasma 5 Dolphin integration
@ -147,12 +150,13 @@ The nextcloud desktop client dolphin extension.
%prep
%setup -q -n desktop-%{version}
%patch1 -p1
%patch2 -p1
#rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication
%build
%cmake_kf5 \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed"
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-DNO_SHIBBOLETH=1
%cmake_build
@ -233,6 +237,9 @@ test "$(chrpath --list %{buildroot}%{_bindir}/nextcloud)" = "%{buildroot}%{_bind
%endif
%changelog
* Thu Mar 11 2021 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 3.1.3-1
- Update to 3.1.3
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

@ -0,0 +1,39 @@
--- desktop-3.1.3-orig/src/gui/cloudproviders/cloudproviderwrapper.cpp 2021-02-18 17:54:25.440043135 -0500
+++ desktop-3.1.3/src/gui/cloudproviders/cloudproviderwrapper.cpp 2021-02-23 20:15:49.191543185 -0500
@@ -13,13 +13,12 @@
* for more details.
*/
-extern "C" {
- #include <glib.h>
- #include <gio.h>
- #include <cloudprovidersaccountexporter.h>
- #include <cloudprovidersproviderexporter.h>
-}
+#include <cloudprovidersaccountexporter.h>
+#include <cloudprovidersproviderexporter.h>
+
+#include <glib.h>
+#include <gio.h>
#include "cloudproviderwrapper.h"
#include <account.h>
#include <folder.h>
--- desktop-3.1.3-orig/src/gui/cloudproviders/cloudprovidermanager.cpp 2021-02-18 17:54:17.983836018 -0500
+++ desktop-3.1.3/src/gui/cloudproviders/cloudprovidermanager.cpp 2021-02-23 20:19:09.085387436 -0500
@@ -12,11 +12,10 @@
* for more details.
*/
-extern "C" {
- #include <glib.h>
- #include <gio.h>
- #include <cloudprovidersproviderexporter.h>
-}
+#include <glib.h>
+#include <gio.h>
+#include <cloudprovidersproviderexporter.h>
+
#include "cloudproviderwrapper.h"
#include "cloudprovidermanager.h"
#include "account.h"

@ -1 +1 @@
SHA512 (desktop-3.1.1.tar.gz) = 1f60266ff6d413a614261ae8b6c75ba6bc5cdb534f1906039b47cb7d593d12d72013d277dc12c0bfc5c5919322438543736a7cdff056949d80e093538fd04209
SHA512 (desktop-3.1.3.tar.gz) = ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99

Loading…
Cancel
Save