PR#5: Update nextcloud-client to 3.0.1 - rpms/nextcloud-client

rpms / nextcloud-client

#5 Update nextcloud-client to 3.0.1

Merged 3 years ago by nonamedotc. Opened 3 years ago by nonamedotc.

rpms/ nonamedotc/nextcloud-client master into master

Mukundan Ragavan • 3 years ago

fdeec25

.gitignore

file modified

		`@@ -20,3 +20,4 @@`
		`/desktop-2.6.3.tar.gz`
		`/desktop-2.6.4.tar.gz`
		`/desktop-2.6.5.tar.gz`
		`+ /desktop-3.0.1.tar.gz`

0001-CloudProvider-Use-absolute-path-in-dbus-file.patch

file removed

-22

		`@@ -1,22 +0,0 @@`
		`- From 102b5c61091921b9554d43cc23b41dd29e8b129f Mon Sep 17 00:00:00 2001`
		`- From: Tim Klocke <taaem@mailbox.org>`
		`- Date: Fri, 10 Apr 2020 12:47:30 +0200`
		`- Subject: [PATCH] CloudProvider: Use absolute path in dbus file`
		`-`
		`- ---`
		`- .../libcloudproviders/org.freedesktop.CloudProviders.service.in \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in b/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in`
		`- index bd9f91d46..6585d5401 100644`
		`- --- a/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in`
		`- +++ b/shell_integration/libcloudproviders/org.freedesktop.CloudProviders.service.in`
		`- @@ -1,4 +1,4 @@`
		`- [D-BUS Service]`
		`- Name=@LIBCLOUDPROVIDERS_DBUS_BUS_NAME@`
		`- -Exec=@APPLICATION_EXECUTABLE@ --background`
		`- +Exec=@CMAKE_INSTALL_PREFIX@/bin/@APPLICATION_EXECUTABLE@ --background`
		`-`
		`- --`
		`- 2.26.0`
		`-`

0001-CloudProviders-Don-t-clear-the-_recentMenu-pointer.patch

file removed

-35

		`@@ -1,35 +0,0 @@`
		`- From 18615d02971d6555d3720214fb6875f5bf582730 Mon Sep 17 00:00:00 2001`
		`- From: Tim Klocke <taaem@mailbox.org>`
		`- Date: Fri, 10 Apr 2020 19:03:15 +0200`
		`- Subject: [PATCH] CloudProviders: Don't clear the _recentMenu pointer`
		`-`
		`- The _recentMenu pointer ref should not be freed, when building the`
		`- menu.`
		`- This fixes #1920 and #1818`
		`- ---`
		`- src/gui/cloudproviders/cloudproviderwrapper.cpp \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/src/gui/cloudproviders/cloudproviderwrapper.cpp b/src/gui/cloudproviders/cloudproviderwrapper.cpp`
		`- index f4e2a7606..421ae625a 100644`
		`- --- a/src/gui/cloudproviders/cloudproviderwrapper.cpp`
		`- +++ b/src/gui/cloudproviders/cloudproviderwrapper.cpp`
		`- @@ -69,6 +69,7 @@ CloudProviderWrapper::~CloudProviderWrapper()`
		`- g_object_unref(_cloudProviderAccount);`
		`- g_object_unref(_mainMenu);`
		`- g_object_unref(actionGroup);`
		`- + g_object_unref(_recentMenu);`
		`- }`
		`-`
		`- CloudProvidersAccountExporter* CloudProviderWrapper::accountExporter()`
		`- @@ -258,7 +259,6 @@ GMenuModel* CloudProviderWrapper::getMenuModel() {`
		`- g_menu_append_section(_mainMenu, nullptr, G_MENU_MODEL(section));`
		`- g_clear_object (&section);`
		`-`
		`- - g_clear_object (&_recentMenu);`
		`- return G_MENU_MODEL(_mainMenu);`
		`- }`
		`-`
		`- --`
		`- 2.26.0`
		`-`

nextcloud-client.spec

file modified

+9 -7

		`@@ -3,8 +3,8 @@`
		`%global _hardened_build 1`

		`Name: nextcloud-client`
		`- Version: 2.6.5`
		`- Release: 9%{?dist}`
		`+ Version: 3.0.1`
		`+ Release: 1%{?dist}`
		`Summary: The Nextcloud Client`

		`# -libs are LGPLv2+, rest GPLv2`
		`@@ -20,8 +20,6 @@`
		`# These fix are needed because the system wide QtSingleApplication is slightly`
		`# different from the bundled one.`
		`#Patch0: %%{name}-%%{version}-syslibs.patch`
		`- Patch0: 0001-CloudProviders-Don-t-clear-the-_recentMenu-pointer.patch`
		`- Patch1: 0001-CloudProvider-Use-absolute-path-in-dbus-file.patch`

		`BuildRequires: check`
		`BuildRequires: chrpath`
		`@@ -43,7 +41,9 @@`
		`BuildRequires: qt5-qtbase-gui`
		`BuildRequires: qt5-qtwebkit-devel`
		`BuildRequires: qt5-qtxmlpatterns-devel`
		`- BuildRequires: qt5-qttools qt5-qttools-devel`
		`+ BuildRequires: qt5-qttools`
		`+ BuildRequires: qt5-qttools-devel`
		`+ BuildRequires: qt5-qtquickcontrols2-devel`
		`BuildRequires: qt5-qtwebengine-devel`
		`BuildRequires: qt5-qtsvg-devel`
		`BuildRequires: extra-cmake-modules`
		`@@ -145,8 +145,6 @@`
		`%prep`
		`%setup -q -n desktop-%{version}`
		`#rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication`
		`- %patch0 -p1`
		`- %patch1 -p1`


		`%build`
		`@@ -232,6 +230,10 @@`
		`%endif`

		`%changelog`
		`+ * Sat Sep 05 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 3.0.1-1`
		`+ - Update to 3.0.1`
		`+ - Drop upstreamed patches`
		`+`
		`* Mon Aug 31 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2.6.5-9`
		`- Only require libgnome-keyring on Fedora (not EPEL). EPEL8 is getting qtkeychain 0.10.0`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (desktop-2.6.5.tar.gz) = fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462`
		`+ SHA512 (desktop-3.0.1.tar.gz) = 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5`

nonamedotc commented 3 years ago

I do not recommend pushing this to the stable branches at the moment. There are several bugs open upstream at this time and this version introduces massive user interface changes.

We should push this to rawhide and F33.

nonamedotc commented 3 years ago

Germano, please take a look. If you do not see anything problematic, I will merge this, build and submit an update.