external/zxing/UnpackedTarball_zxing.mk | 1 +
external/zxing/missing-include.patch.0 | 12 ++++++++++++
2 files changed, 13 insertions(+)
New commits:
commit 3e1c606185dc8480a8e9a43e23a6596551570510
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Dec 8 11:34:17 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Dec 8 12:29:22 2022 +0000
external/zxing: Missing includes
...at least when building with --with-latest-c++ against recent LLVM 16
trunk
Clang and libc++,
> In file included from
workdir/UnpackedTarball/zxing/core/src/datamatrix/DMDetector.cpp:8:
> In file included from
workdir/UnpackedTarball/zxing/core/src/datamatrix/DMDetector.h:10:
> workdir/UnpackedTarball/zxing/core/src/Generator.h:15:16: error: no type
named 'movable' in namespace 'std'
> template <std::movable T>
> ~~~~~^
> workdir/UnpackedTarball/zxing/core/src/Generator.h:70:24: error: no type
named 'default_sentinel_t' in namespace 'std'
> bool operator==(std::default_sentinel_t) const { return
!_coroutine || _coroutine.done(); }
> ~~~~~^
Change-Id: I26720e4d07498b277ec879129634064f1d45362a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143809
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/zxing/UnpackedTarball_zxing.mk
b/external/zxing/UnpackedTarball_zxing.mk
index 012b5cefaf3a..0d81d13f6411 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1))
$(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/assume.__cpp_lib_string_view.patch.0 \
external/zxing/android_include.patch.0 \
+ external/zxing/missing-include.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/zxing/missing-include.patch.0
b/external/zxing/missing-include.patch.0
new file mode 100644
index 000000000000..73bca6bdcaa1
--- /dev/null
+++ b/external/zxing/missing-include.patch.0
@@ -0,0 +1,12 @@
+--- core/src/Generator.h
++++ core/src/Generator.h
+@@ -6,7 +6,9 @@
+ #pragma once
+
+ #ifdef __cpp_impl_coroutine
++#include <concepts>
+ #include <coroutine>
++#include <iterator>
+ #include <optional>
+
+ // this code is based on
https://en.cppreference.com/w/cpp/coroutine/coroutine_handle#Example
