[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - external/libetonyek
Mike Kaganski (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 19 22:43:11 UTC 2021
external/libetonyek/0001-add-missing-include-for-std-for_each.patch | 33 ++++++++++
external/libetonyek/UnpackedTarball_libetonyek.mk | 1
2 files changed, 34 insertions(+)
New commits:
commit a8c7e7a967d9d2e11abee53cfc0a307695d04451
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jan 7 14:15:47 2021 +0300
Commit: Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Aug 20 00:42:35 2021 +0200
Add missing include for std::for_each
It is reported now by Windows build after
e0f1b5bd94550835c639efda4e4c9a801c78dbe9 "Upgrade external/boost to
latest Boost 1.75.0".
Change-Id: Ia69c74cd72c7e8ce56c56ffbfb1c1e467ce2bdc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108932
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
(cherry picked from commit aa1ce583f0ad64b4ea5096c3ce9c6bd0a84794fe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120733
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Aron Budea <aron.budea at collabora.com>
diff --git a/external/libetonyek/0001-add-missing-include-for-std-for_each.patch b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
new file mode 100644
index 000000000000..09aaba58b7e3
--- /dev/null
+++ b/external/libetonyek/0001-add-missing-include-for-std-for_each.patch
@@ -0,0 +1,33 @@
+From 4b4d879a6db69ea05b89fdf99df8cb5d902d16b6 Mon Sep 17 00:00:00 2001
+From: Roland Illig <roland.illig at gmx.de>
+Date: Tue, 19 May 2020 08:43:39 +0200
+Subject: [PATCH] add missing include for std::for_each
+
+On NetBSD 8.0 x86_64, gcc complains:
+ NUM3Parser.cpp: In member function 'virtual bool libetonyek::NUM3Parser::parseDocument()':
+ NUM3Parser.cpp:46:3: error: 'for_each' is not a member of 'std'
+ std::for_each(sheetListRefs.begin(), sheetListRefs.end(), std::bind(&NUM3Parser::parseSheet, this, std::placeholders::_1));
+
+Change-Id: I723ba1bcbd10ed9215ceea8c5b224fdc5242be65
+Reviewed-on: https://gerrit.libreoffice.org/c/libetonyek/+/94450
+Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
+Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
+---
+ src/lib/NUM3Parser.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git src/lib/NUM3Parser.cpp src/lib/NUM3Parser.cpp
+index 66fb195..c19b611 100644
+--- src/lib/NUM3Parser.cpp
++++ src/lib/NUM3Parser.cpp
+@@ -7,6 +7,7 @@
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
++#include <algorithm>
+ #include <functional>
+
+ #include "NUM3Parser.h"
+--
+2.28.0
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 5e7780deb7ea..d1550f47e02a 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/ubsan.patch \
external/libetonyek/rpath.patch \
external/libetonyek/warnings.patch \
+ external/libetonyek/0001-add-missing-include-for-std-for_each.patch \
))
ifneq ($(OS),MACOSX)
More information about the Libreoffice-commits
mailing list