external/zxing/UnpackedTarball_zxing.mk | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 6543eb9a5cda3cbd2cd46f35c7f0bc940cd69a45
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jan 15 12:57:42 2023 +0900
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Jan 23 13:33:25 2023 +0000
Mark external/zxing/missing-include.patch.0 as upstreamed
Change-Id: Ia4c251c952889b4ae174b172839a946302d41c48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145524
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 7eacf905688d..b21909fc4fde 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1))
# * external/zxing/android_include.patch.0 was upstreamed at
# <https://github.com/zxing-cpp/zxing-cpp/pull/458> "add missing #include
<cmath> for std::abs"
+# external/zxing/missing-include.patch.0 was upstreamed on
+# <https://github.com/zxing-cpp/zxing-cpp/pull/463> "c++20: add missing
include"
+# and
<https://github.com/zxing-cpp/zxing-cpp/commit/dd19683d866f3510ae57a077e7651eba031f2f15>
+# "c++20: add missing include"
$(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/assume.__cpp_lib_string_view.patch.0 \
external/zxing/android_include.patch.0 \
commit 3f7b67a2aedf9af22dd5d7f3a706427ff910f2dd
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jan 15 12:55:23 2023 +0900
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Jan 23 13:33:14 2023 +0000
Mark external/zxing/android_include.patch.0 as upstreamed
Change-Id: I05f51e0ee83f43614dc85e0b1ca5854f8aed21a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145523
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 9e877201a9e2..7eacf905688d 100644
--- a/external/zxing/UnpackedTarball_zxing.mk
+++ b/external/zxing/UnpackedTarball_zxing.mk
@@ -13,6 +13,8 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,zxing,$(ZXING_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1))
+# * external/zxing/android_include.patch.0 was upstreamed at
+# <https://github.com/zxing-cpp/zxing-cpp/pull/458> "add missing #include
<cmath> for std::abs"
$(eval $(call gb_UnpackedTarball_add_patches,zxing, \
external/zxing/assume.__cpp_lib_string_view.patch.0 \
external/zxing/android_include.patch.0 \
