nextcloud-client: update to 3.2.0
This commit is contained in:
parent
63f49c193b
commit
3c9cffe17d
3 changed files with 40 additions and 20 deletions
|
@ -0,0 +1,36 @@
|
|||
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
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
fails if runned from within a github actions, so disable it.
|
||||
NB: works fine on regular personnal xbps-src usage.
|
||||
|
||||
--- test/csync/vio_tests/check_vio.cpp.ORIG 2020-12-22 10:54:32.000000000 +0100
|
||||
+++ test/csync/vio_tests/check_vio.cpp 2020-12-26 15:16:07.118993372 +0100
|
||||
@@ -122,9 +122,6 @@
|
||||
rc = _tmkdir(dir, (S_IWUSR|S_IXUSR));
|
||||
assert_int_equal(rc, 0);
|
||||
|
||||
- dh = csync_vio_opendir(csync, CSYNC_TEST_DIR);
|
||||
- assert_null(dh);
|
||||
- assert_int_equal(errno, EACCES);
|
||||
|
||||
_tchmod(dir, MKDIR_MASK);
|
||||
c_free_locale_string(dir);
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'nextcloud-client'
|
||||
pkgname=nextcloud-client
|
||||
version=3.1.2
|
||||
revision=2
|
||||
version=3.2.0
|
||||
revision=1
|
||||
wrksrc="desktop-${version}"
|
||||
build_style=cmake
|
||||
configure_args="-Wno-dev -DNO_SHIBBOLETH=True"
|
||||
configure_args="-Wno-dev"
|
||||
hostmakedepends="pkg-config"
|
||||
makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
|
||||
qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
|
||||
|
@ -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=2fb2c18f479be2a04cf999f037def705c4be0087816af727038f0c71cb2c6189
|
||||
checksum=da1195b31fec0970121c1567f3cdaf3b9083d46727277116a98e5cd27f57aa60
|
||||
|
||||
build_options="dolphin"
|
||||
desc_option_dolphin="Build KDE dolphin support"
|
||||
|
@ -77,6 +77,5 @@ nextcloud-client-devel_package() {
|
|||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/libnextcloudsync.so
|
||||
vmove "usr/lib/nextcloud/*.so"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue