From 23d5b1ea14e27065e62680fc1116f1b33900ef73 Mon Sep 17 00:00:00 2001 From: noarchwastaken Date: Fri, 7 May 2021 14:27:37 -0400 Subject: [PATCH] nextcloud-client: update to 3.2.1. Also added a patch to close #30713. The patch `fallback-primary-screen.patch` comes from upstream master, and should be removed in the next update. upstream commit --- .../patches/fallback-primary-screen.patch | 15 ++++++++ ...ariadic-macro-warning-only-for-clang.patch | 36 ------------------- srcpkgs/nextcloud-client/template | 4 +-- 3 files changed, 17 insertions(+), 38 deletions(-) create mode 100644 srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch delete mode 100644 srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch diff --git a/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch b/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch new file mode 100644 index 000000000000..bd64de20e41a --- /dev/null +++ b/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch @@ -0,0 +1,15 @@ +index 4a8e38662..0127b2f16 100644 +--- src/gui/wizard/owncloudwizard.cpp ++++ src/gui/wizard/owncloudwizard.cpp +@@ -116,7 +116,10 @@ OwncloudWizard::OwncloudWizard(QWidget *parent) + void OwncloudWizard::centerWindow() + { + const auto wizardWindow = window(); +- const auto screenGeometry = QGuiApplication::screenAt(wizardWindow->pos())->geometry(); ++ const auto screen = QGuiApplication::screenAt(wizardWindow->pos()) ++ ? QGuiApplication::screenAt(wizardWindow->pos()) ++ : QGuiApplication::primaryScreen(); ++ const auto screenGeometry = screen->geometry(); + const auto windowGeometry = wizardWindow->geometry(); + const auto newWindowPosition = screenGeometry.center() - QPoint(windowGeometry.width() / 2, windowGeometry.height() / 2); + wizardWindow->move(newWindowPosition); diff --git a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch b/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch deleted file mode 100644 index 58d434318684..000000000000 --- a/srcpkgs/nextcloud-client/patches/fix-clang-variadic-macro-warning-only-for-clang.patch +++ /dev/null @@ -1,36 +0,0 @@ -source: https://github.com/nextcloud/desktop/pull/3132 - -From 52951820b2c094bcff0ec1a36c3c89d1c08c9618 Mon Sep 17 00:00:00 2001 -From: yopito -Date: Wed, 14 Apr 2021 22:07:19 +0200 -Subject: [PATCH] clang's variadic macro warnings: only for clang - -following settings of cmake/modules/Warnings.cmake ---- - src/CMakeLists.txt | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git src/CMakeLists.txt src/CMakeLists.txt -index f29349582..6f3145331 100644 ---- src/CMakeLists.txt -+++ src/CMakeLists.txt -@@ -30,10 +30,12 @@ if(NOT MSVC) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") - endif() - -- # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU -- # extension (C++11 §16.3/4 forbids them). Silence clang's warnings. -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -+ if (CMAKE_CXX_COMPILER MATCHES "Clang") -+ # Calling Qt's qCWarning(category, ...) with no params for "..." is a GNU -+ # extension (C++11 §16.3/4 forbids them). Silence clang's warnings. -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") -+ endif() - endif() - - if(WIN32) --- -2.31.1 - diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template index cd130c14be8d..ec201254d5ad 100644 --- a/srcpkgs/nextcloud-client/template +++ b/srcpkgs/nextcloud-client/template @@ -1,6 +1,6 @@ # Template file for 'nextcloud-client' pkgname=nextcloud-client -version=3.2.0 +version=3.2.1 revision=1 wrksrc="desktop-${version}" build_style=cmake @@ -19,7 +19,7 @@ maintainer="yopito " license="GPL-2.0-or-later" homepage="https://nextcloud.com/clients/" distfiles="https://github.com/nextcloud/desktop/archive/v${version}.tar.gz" -checksum=da1195b31fec0970121c1567f3cdaf3b9083d46727277116a98e5cd27f57aa60 +checksum=f2d387d35276ea6e6da3ae339ede3d89be81dd4af735739ec280709008eb6645 build_options="dolphin" desc_option_dolphin="Build KDE dolphin support"