Re: nextcloud-client: update to 3.2.1.

Re: nextcloud-client: update to 3.2.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-835639207

Comment:
Can you please also include a link to the commit itself? Helps in tracking down things.

Re: nextcloud-client: update to 3.2.1.

[noarchwastaken]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-835668266

Comment:
> Can you please also include a link to the commit itself? Helps in tracking down things.

ah, I included it in the issues, but not the commit message. Will do.

Re: [PR PATCH] [Updated] nextcloud-client: update to 3.2.1.

[noarchwastaken]

[-- 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"

Re: nextcloud-client: update to 3.2.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-835883069

Comment:
@yopito ok to go?

Re: nextcloud-client: update to 3.2.1.

[yopito]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-839459200

Comment:
noGO: patch fix-clang-variadic-macro-warning-only-for-clang.patch  is still needed, why has been removed ?

Re: [PR REVIEW] nextcloud-client: update to 3.2.1.

[yopito]

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

New review comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#discussion_r630737700

Comment:
```suggestion
upstream: https://github.com/nextcloud/desktop/commit/aadee15008ca4974e542f3fb6ca1694592d9e6fe

index 4a8e38662..0127b2f16 100644
```

Re: nextcloud-client: update to 3.2.1.

[yopito]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-839459200

Comment:
noGO: patch fix-clang-variadic-macro-warning-only-for-clang.patch  is still ~~needed~~ relevant, why has been removed ?

Re: nextcloud-client: update to 3.2.1.

[noarchwastaken]

[-- Attachment #1: Type: text/plain, Size: 406 bytes --]

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-839767873

Comment:
> noGO: patch fix-clang-variadic-macro-warning-only-for-clang.patch is still ~needed~ relevant, why has been removed ?

That was my mistake :thinking:

I was building master to see if this bug still exists, and forgot to add it back to the release build.

Re: [PR PATCH] [Updated] nextcloud-client: update to 3.2.1.

[noarchwastaken]

[-- 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: 2682 bytes --]

From c5fcfd24d97b5b52c0445d4ede959da71163c9ba Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Wed, 12 May 2021 19:26:19 -0400
Subject: [PATCH] Also added a patch to close #30713.

The patch `fallback-primary-screen.patch` comes from upstream master,
and should be removed in the next release.

upstream commit https://github.com/nextcloud/desktop/commit/aadee15008ca4974e542f3fb6ca1694592d9e6fe
---
 .../patches/fallback-primary-screen.patch         | 15 +++++++++++++++
 srcpkgs/nextcloud-client/template                 |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nextcloud-client/patches/fallback-primary-screen.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..303f0a1ac726
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch
@@ -0,0 +1,15 @@
+upstream: https://github.com/nextcloud/desktop/commit/aadee15008ca4974e542f3fb6ca1694592d9e6fe
+--- 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/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"

Re: [PR PATCH] [Updated] nextcloud-client: update to 3.2.1.

[noarchwastaken]

[-- 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: 2718 bytes --]

From 5298e965bc784a4985d7fc7502d65682784ee035 Mon Sep 17 00:00:00 2001
From: noarchwastaken <noarch@n0ar.ch>
Date: Wed, 12 May 2021 19:26:19 -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 release.

upstream commit https://github.com/nextcloud/desktop/commit/aadee15008ca4974e542f3fb6ca1694592d9e6fe
---
 .../patches/fallback-primary-screen.patch         | 15 +++++++++++++++
 srcpkgs/nextcloud-client/template                 |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nextcloud-client/patches/fallback-primary-screen.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..303f0a1ac726
--- /dev/null
+++ b/srcpkgs/nextcloud-client/patches/fallback-primary-screen.patch
@@ -0,0 +1,15 @@
+upstream: https://github.com/nextcloud/desktop/commit/aadee15008ca4974e542f3fb6ca1694592d9e6fe
+--- 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/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"

Re: nextcloud-client: update to 3.2.1.

[noarchwastaken]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-841736206

Comment:
@yopito is it good to go now?

Re: nextcloud-client: update to 3.2.1.

[yopito]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-843032189

Comment:
Fine for me . sorry for late reply.

Re: nextcloud-client: update to 3.2.1.

[noarchwastaken]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New comment by noarchwastaken on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-846604321

Comment:
@ericonr I think this is good to go. Would you please check it out?

Re: [PR PATCH] [Merged]: nextcloud-client: update to 3.2.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]

There's a merged pull request on the void-packages repository

nextcloud-client: update to 3.2.1.
https://github.com/void-linux/void-packages/pull/30728

Description:
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
-->

Re: nextcloud-client: update to 3.2.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30728#issuecomment-849346583

Comment:
Thanks!