From: noarchwastaken <noarchwastaken@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] nextcloud-client: update to 3.2.1.
Date: Sun, 09 May 2021 06:13:21 +0200 [thread overview]
Message-ID: <20210509041321.d0jlc9FVNVRZ3OCwzpt-jbpKn9tSCC2c-aE8jP3Z9pU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30728@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]
There is an updated pull request by noarchwastaken against master on the void-packages repository
https://github.com/noarchwastaken/void-packages nextcloud
https://github.com/void-linux/void-packages/pull/30728
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.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30728.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud-30728.patch --]
[-- Type: text/x-diff, Size: 4602 bytes --]
From 23d5b1ea14e27065e62680fc1116f1b33900ef73 Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
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 <https://github.com/nextcloud/desktop/commit/aadee15008ca4974e542f3fb6ca1694592d9e6fe>
---
.../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 <pierre.bourgin@free.fr>
-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 <pierre.bourgin@free.fr>"
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"
next prev parent reply other threads:[~2021-05-09 4:13 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30728@inbox.vuxu.org>
2021-05-09 2:34 ` ericonr
2021-05-09 4:12 ` noarchwastaken
2021-05-09 4:13 ` noarchwastaken [this message]
2021-05-09 20:37 ` ericonr
2021-05-12 5:35 ` yopito
2021-05-12 5:37 ` [PR REVIEW] " yopito
2021-05-12 5:39 ` yopito
2021-05-12 13:21 ` noarchwastaken
2021-05-12 23:28 ` [PR PATCH] [Updated] " noarchwastaken
2021-05-12 23:29 ` noarchwastaken
2021-05-15 22:53 ` noarchwastaken
2021-05-18 9:58 ` yopito
2021-05-23 18:21 ` noarchwastaken
2021-05-27 5:57 ` [PR PATCH] [Merged]: " ericonr
2021-05-27 5:57 ` ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210509041321.d0jlc9FVNVRZ3OCwzpt-jbpKn9tSCC2c-aE8jP3Z9pU@z \
--to=noarchwastaken@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).