|
 |
eac0b7 |
From ceac69bff953ebd9b54a1f3a032079523c4414d0 Mon Sep 17 00:00:00 2001
|
|
|
eac0b7 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
eac0b7 |
Date: Sun, 25 Oct 2020 20:23:39 +0000
|
|
|
eac0b7 |
Subject: [PATCH] 0.5.1 is sufficient
|
|
|
eac0b7 |
|
|
|
eac0b7 |
Change-Id: I710a83de8f261d6164eb760d3290c963a5bbe5e1
|
|
|
eac0b7 |
---
|
|
|
eac0b7 |
configure.ac | 15 +--------------
|
|
|
eac0b7 |
1 file changed, 1 insertion(+), 14 deletions(-)
|
|
|
eac0b7 |
|
|
|
eac0b7 |
diff --git a/configure.ac b/configure.ac
|
|
|
eac0b7 |
index a6696df15f06..c17fdf5b0d22 100644
|
|
|
eac0b7 |
--- a/configure.ac
|
|
|
eac0b7 |
+++ b/configure.ac
|
|
|
eac0b7 |
@@ -7050,7 +7050,7 @@ dnl Check for system libcmis
|
|
|
eac0b7 |
dnl ===================================================================
|
|
|
eac0b7 |
# libcmis requires curl and we can't build curl for iOS
|
|
|
eac0b7 |
if test $_os != iOS; then
|
|
|
eac0b7 |
- libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.2])
|
|
|
eac0b7 |
+ libo_CHECK_SYSTEM_MODULE([libcmis],[LIBCMIS],[libcmis-0.5 >= 0.5.0])
|
|
|
eac0b7 |
ENABLE_LIBCMIS=TRUE
|
|
|
eac0b7 |
else
|
|
|
eac0b7 |
ENABLE_LIBCMIS=
|
|
|
eac0b7 |
@@ -7090,19 +7090,6 @@ elif test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
|
|
eac0b7 |
#include <functional>
|
|
|
eac0b7 |
#include <vector>
|
|
|
eac0b7 |
|
|
|
eac0b7 |
- #if defined SYSTEM_LIBCMIS
|
|
|
eac0b7 |
- // See ucb/source/ucp/cmis/auth_provider.hxx:
|
|
|
eac0b7 |
- #if !defined __clang__
|
|
|
eac0b7 |
- #pragma GCC diagnostic push
|
|
|
eac0b7 |
- #pragma GCC diagnostic ignored "-Wdeprecated"
|
|
|
eac0b7 |
- #pragma GCC diagnostic ignored "-Wunused-but-set-parameter"
|
|
|
eac0b7 |
- #endif
|
|
|
eac0b7 |
- #include <libcmis/libcmis.hxx>
|
|
|
eac0b7 |
- #if !defined __clang__
|
|
|
eac0b7 |
- #pragma GCC diagnostic pop
|
|
|
eac0b7 |
- #endif
|
|
|
eac0b7 |
- #endif
|
|
|
eac0b7 |
-
|
|
|
eac0b7 |
void f(std::vector<int> & v, std::function<bool(int, int)> fn) {
|
|
|
eac0b7 |
std::sort(v.begin(), v.end(), fn);
|
|
|
eac0b7 |
}
|
|
|
eac0b7 |
--
|
|
|
eac0b7 |
2.26.2
|
|
|
eac0b7 |
|