* [PR PATCH] nextcloud-client: update to 3.1.0
@ 2020-12-15 0:20 yopito
2020-12-15 12:51 ` yopito
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: yopito @ 2020-12-15 0:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
There is a new pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages nextcloud.310
https://github.com/void-linux/void-packages/pull/27168
nextcloud-client: update to 3.1.0
A patch file from https://github.com/void-linux/void-packages/pull/27168.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud.310-27168.patch --]
[-- Type: text/x-diff, Size: 4789 bytes --]
From c73e793080e6f0d42bbfe344c910522861728893 Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Mon, 14 Dec 2020 19:28:42 +0100
Subject: [PATCH] nextcloud-client: update to 3.1.0
---
.../patches/no-webengine-support.patch | 13 ++++++++-----
.../patches/testfolderman-within-chroot.patch | 2 +-
srcpkgs/nextcloud-client/template | 6 +++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
index 824c30d4c1a..0d2642870c6 100644
--- a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
+++ b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
@@ -1,6 +1,9 @@
source: https://github.com/nextcloud/desktop/pull/2204/
*partial* pick since 2nd commit 1f577e5 is broken ("Try to preserve flow2")
+src/gui/CMakeLists.txt diff modified to support nextcloud client 3.1.0
+(git commit is then partially modified)
+
From 5b6bde1c206c9b1edb0472a823776bdc91488db3 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Sun, 23 Feb 2020 23:09:29 -0600
@@ -60,7 +63,7 @@ diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 2f1e99e2b..c5be00c37 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
-@@ -111,23 +111,16 @@ set(client_SRCS
+@@ -119,23 +119,16 @@
creds/credentialsfactory.cpp
creds/httpcredentialsgui.cpp
creds/oauth.cpp
@@ -84,7 +87,7 @@ index 2f1e99e2b..c5be00c37 100644
wizard/slideshow.cpp
)
-@@ -148,6 +141,18 @@ IF(BUILD_UPDATER)
+@@ -156,6 +149,18 @@
)
endif()
@@ -103,12 +106,12 @@ index 2f1e99e2b..c5be00c37 100644
IF( APPLE )
list(APPEND client_SRCS cocoainitializer_mac.mm)
list(APPEND client_SRCS socketapisocket_mac.mm)
-@@ -314,8 +319,11 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+@@ -328,8 +333,11 @@
set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
--target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
-+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
+-target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+IF(NOT NO_WEBENGINE)
+ target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::WebEngineWidgets )
diff --git a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
index ab7feba8a3e..b049701370e 100644
--- a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
+++ b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
@@ -1,4 +1,4 @@
-is wrong if running within a chroot
+is wrong if running within a user's chroot
--- test/testfolderman.cpp.ORIG 2020-09-24 14:51:48.000000000 +0200
+++ test/testfolderman.cpp 2020-10-02 20:33:32.248359240 +0200
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index d696e58ac33..0f7419f0ef9 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.0.3
+version=3.1.0
revision=1
wrksrc="desktop-${version}"
build_style=cmake
@@ -21,7 +21,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=abd021ff06ecb267221a221dbf8b4efd3bd8e418053cc49b6b6faa290717c6d8
+checksum=11b8a03ddb4f8c60ecffcd738cdcd5d6738f92686809da1f81ebeff97a99e314
build_options="dolphin shibboleth webengine"
desc_option_dolphin="Build KDE dolphin support"
@@ -46,7 +46,7 @@ subpackages="$(vopt_if dolphin 'nextcloud-client-dolphin') nextcloud-client-deve
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DUNIT_TESTING=1"
# argp.h is used only by testing and is not a requirement.
- # since usable (linking fails), let's disable it instead
+ # since unsable (linking fails), let's disable it instead
case "$XBPS_TARGET_MACHINE" in
#*-musl) export LDFLAGS=-largp;;
*-musl) configure_args+=" -DHAVE_ARGP_H=0";;
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
@ 2020-12-15 12:51 ` yopito
2020-12-15 12:51 ` [PR PATCH] [Updated] " yopito
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-12-15 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/27168#issuecomment-745267843
Comment:
test #32 fails with GH actions, can't reproduce locally, since all tests are OK.
I will push force to trigger another build
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
2020-12-15 12:51 ` yopito
@ 2020-12-15 12:51 ` yopito
2020-12-15 12:52 ` yopito
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-12-15 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is an updated pull request by yopito against master on the void-packages repository
https://github.com/yopito/void-packages nextcloud.310
https://github.com/void-linux/void-packages/pull/27168
nextcloud-client: update to 3.1.0
A patch file from https://github.com/void-linux/void-packages/pull/27168.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud.310-27168.patch --]
[-- Type: text/x-diff, Size: 4789 bytes --]
From 1406e29a44b71aa7fe6e90723e3f9eb8a7a85aac Mon Sep 17 00:00:00 2001
From: yopito <pierre.bourgin@free.fr>
Date: Tue, 15 Dec 2020 13:51:21 +0100
Subject: [PATCH] nextcloud-client: update to 3.1.0
---
.../patches/no-webengine-support.patch | 13 ++++++++-----
.../patches/testfolderman-within-chroot.patch | 2 +-
srcpkgs/nextcloud-client/template | 6 +++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
index 824c30d4c1a..0d2642870c6 100644
--- a/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
+++ b/srcpkgs/nextcloud-client/patches/no-webengine-support.patch
@@ -1,6 +1,9 @@
source: https://github.com/nextcloud/desktop/pull/2204/
*partial* pick since 2nd commit 1f577e5 is broken ("Try to preserve flow2")
+src/gui/CMakeLists.txt diff modified to support nextcloud client 3.1.0
+(git commit is then partially modified)
+
From 5b6bde1c206c9b1edb0472a823776bdc91488db3 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Sun, 23 Feb 2020 23:09:29 -0600
@@ -60,7 +63,7 @@ diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 2f1e99e2b..c5be00c37 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
-@@ -111,23 +111,16 @@ set(client_SRCS
+@@ -119,23 +119,16 @@
creds/credentialsfactory.cpp
creds/httpcredentialsgui.cpp
creds/oauth.cpp
@@ -84,7 +87,7 @@ index 2f1e99e2b..c5be00c37 100644
wizard/slideshow.cpp
)
-@@ -148,6 +141,18 @@ IF(BUILD_UPDATER)
+@@ -156,6 +149,18 @@
)
endif()
@@ -103,12 +106,12 @@ index 2f1e99e2b..c5be00c37 100644
IF( APPLE )
list(APPEND client_SRCS cocoainitializer_mac.mm)
list(APPEND client_SRCS socketapisocket_mac.mm)
-@@ -314,8 +319,11 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+@@ -328,8 +333,11 @@
set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
--target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
-+target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
+-target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
++target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2)
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
+IF(NOT NO_WEBENGINE)
+ target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::WebEngineWidgets )
diff --git a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
index ab7feba8a3e..b049701370e 100644
--- a/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
+++ b/srcpkgs/nextcloud-client/patches/testfolderman-within-chroot.patch
@@ -1,4 +1,4 @@
-is wrong if running within a chroot
+is wrong if running within a user's chroot
--- test/testfolderman.cpp.ORIG 2020-09-24 14:51:48.000000000 +0200
+++ test/testfolderman.cpp 2020-10-02 20:33:32.248359240 +0200
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index d696e58ac33..0f7419f0ef9 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.0.3
+version=3.1.0
revision=1
wrksrc="desktop-${version}"
build_style=cmake
@@ -21,7 +21,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=abd021ff06ecb267221a221dbf8b4efd3bd8e418053cc49b6b6faa290717c6d8
+checksum=11b8a03ddb4f8c60ecffcd738cdcd5d6738f92686809da1f81ebeff97a99e314
build_options="dolphin shibboleth webengine"
desc_option_dolphin="Build KDE dolphin support"
@@ -46,7 +46,7 @@ subpackages="$(vopt_if dolphin 'nextcloud-client-dolphin') nextcloud-client-deve
if [ "$XBPS_CHECK_PKGS" ]; then
configure_args+=" -DUNIT_TESTING=1"
# argp.h is used only by testing and is not a requirement.
- # since usable (linking fails), let's disable it instead
+ # since unsable (linking fails), let's disable it instead
case "$XBPS_TARGET_MACHINE" in
#*-musl) export LDFLAGS=-largp;;
*-musl) configure_args+=" -DHAVE_ARGP_H=0";;
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
2020-12-15 12:51 ` yopito
2020-12-15 12:51 ` [PR PATCH] [Updated] " yopito
@ 2020-12-15 12:52 ` yopito
2020-12-15 13:27 ` yopito
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-12-15 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 284 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/27168#issuecomment-745267843
Comment:
test 32 fails with GH actions, can't reproduce locally, since all tests are OK.
I will push force to trigger another build
Edit: formating
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
` (2 preceding siblings ...)
2020-12-15 12:52 ` yopito
@ 2020-12-15 13:27 ` yopito
2020-12-15 13:33 ` ericonr
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-12-15 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 930 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/27168#issuecomment-745286184
Comment:
fail again. code of test 32:
```
113 static void check_csync_vio_opendir_perm(void **state)
114 {
115 auto *csync = (CSYNC*)*state;
116 csync_vio_handle_t *dh = nullptr;
117 int rc = 0;
118 mbchar_t *dir = c_utf8_path_to_locale(CSYNC_TEST_DIR);
119
120 assert_non_null(dir);
121
122 rc = _tmkdir(dir, (S_IWUSR|S_IXUSR)); /* macro: => mkdir(dir, (S_IWUSR|S_IXUSR)) */
123 assert_int_equal(rc, 0);
124
125 dh = csync_vio_opendir(csync, CSYNC_TEST_DIR);
126 assert_null(dh);
127 assert_int_equal(errno, EACCES);
128
129 _tchmod(dir, MKDIR_MASK);
130 c_free_locale_string(dir);
131 }
```
The default umask is probably kind of special in GH actions's container, that would explain this (unrelevant) error ?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
` (3 preceding siblings ...)
2020-12-15 13:27 ` yopito
@ 2020-12-15 13:33 ` ericonr
2020-12-17 18:20 ` [PR PATCH] [Closed]: " ericonr
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-12-15 13:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27168#issuecomment-745289488
Comment:
If you feel like trying it, you could use `umask` from inside the shell to see if it works? Or just disable/patch the test to do that.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Closed]: nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
` (4 preceding siblings ...)
2020-12-15 13:33 ` ericonr
@ 2020-12-17 18:20 ` ericonr
2020-12-17 18:21 ` ericonr
2020-12-17 20:52 ` yopito
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-12-17 18:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
There's a closed pull request on the void-packages repository
nextcloud-client: update to 3.1.0
https://github.com/void-linux/void-packages/pull/27168
Description:
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
` (5 preceding siblings ...)
2020-12-17 18:20 ` [PR PATCH] [Closed]: " ericonr
@ 2020-12-17 18:21 ` ericonr
2020-12-17 20:52 ` yopito
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2020-12-17 18:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27168#issuecomment-747613587
Comment:
Don't think we should hold the update on this test. Maybe for next release :)
Also corrected a tiny typo.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: nextcloud-client: update to 3.1.0
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
` (6 preceding siblings ...)
2020-12-17 18:21 ` ericonr
@ 2020-12-17 20:52 ` yopito
7 siblings, 0 replies; 9+ messages in thread
From: yopito @ 2020-12-17 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by yopito on void-packages repository
https://github.com/void-linux/void-packages/pull/27168#issuecomment-747695254
Comment:
@ericonr : thanks for the typo fix and the merge.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-12-17 20:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-15 0:20 [PR PATCH] nextcloud-client: update to 3.1.0 yopito
2020-12-15 12:51 ` yopito
2020-12-15 12:51 ` [PR PATCH] [Updated] " yopito
2020-12-15 12:52 ` yopito
2020-12-15 13:27 ` yopito
2020-12-15 13:33 ` ericonr
2020-12-17 18:20 ` [PR PATCH] [Closed]: " ericonr
2020-12-17 18:21 ` ericonr
2020-12-17 20:52 ` yopito
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).