diff --git a/.gitignore b/.gitignore index a340472..d59d686 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/0001-CloudProvider-Use-absolute-path-in-dbus-file.patch b/0001-CloudProvider-Use-absolute-path-in-dbus-file.patch deleted file mode 100644 index bd999b2..0000000 --- a/0001-CloudProvider-Use-absolute-path-in-dbus-file.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 102b5c61091921b9554d43cc23b41dd29e8b129f Mon Sep 17 00:00:00 2001 -From: Tim Klocke -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 - diff --git a/0001-CloudProviders-Don-t-clear-the-_recentMenu-pointer.patch b/0001-CloudProviders-Don-t-clear-the-_recentMenu-pointer.patch deleted file mode 100644 index 1f6edc6..0000000 --- a/0001-CloudProviders-Don-t-clear-the-_recentMenu-pointer.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 18615d02971d6555d3720214fb6875f5bf582730 Mon Sep 17 00:00:00 2001 -From: Tim Klocke -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 (§ion); - -- g_clear_object (&_recentMenu); - return G_MENU_MODEL(_mainMenu); - } - --- -2.26.0 - diff --git a/nextcloud-client.spec b/nextcloud-client.spec index 0b6f80e..6393b82 100644 --- a/nextcloud-client.spec +++ b/nextcloud-client.spec @@ -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 @@ Source1: nextcloud.appdata.xml # 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-devel 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 @@ The nextcloud desktop client dolphin extension. %prep %setup -q -n desktop-%{version} #rm -rf src/3rdparty/qtlockedfile src/3rdparty/qtsingleapplication -%patch0 -p1 -%patch1 -p1 %build @@ -232,6 +230,10 @@ test "$(chrpath --list %{buildroot}%{_bindir}/nextcloud)" = "%{buildroot}%{_bind %endif %changelog +* Sat Sep 05 2020 Mukundan Ragavan - 3.0.1-1 +- Update to 3.0.1 +- Drop upstreamed patches + * Mon Aug 31 2020 Michel Alexandre Salim - 2.6.5-9 - Only require libgnome-keyring on Fedora (not EPEL). EPEL8 is getting qtkeychain 0.10.0 diff --git a/sources b/sources index b8722b5..d92443b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (desktop-2.6.5.tar.gz) = fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462 +SHA512 (desktop-3.0.1.tar.gz) = 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5