diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-02-26 16:46:32 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-02-26 16:08:02 +0000 |
| commit | cbf7c0da0f7cd24b2f0da3261dd419be115e57b9 (patch) | |
| tree | c0761473dac1bee723d12627e446ee31659a04c1 /external | |
| parent | 323a1a5ba9eb676095d33ecae0717b325189caf4 (diff) | |
zxing: fix build after upgrade to v.2.0
Change-Id: If1b85a1f9f1b562aed8f357fd34434c8fe97e2f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147737
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/zxing/UnpackedTarball_zxing.mk | 1 | ||||
| -rw-r--r-- | external/zxing/invalid_argument.patch.1 | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/external/zxing/UnpackedTarball_zxing.mk b/external/zxing/UnpackedTarball_zxing.mk index 0a00622641ab..ac3cd988eccb 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/undeprecate-warning.patch.0 \ external/zxing/no_sanitize_ignored.patch.0 \ + external/zxing/invalid_argument.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/zxing/invalid_argument.patch.1 b/external/zxing/invalid_argument.patch.1 new file mode 100644 index 000000000000..66794583c19c --- /dev/null +++ b/external/zxing/invalid_argument.patch.1 @@ -0,0 +1,22 @@ +From 302e8210b865576b35164f48bd57e003f6674dd1 Mon Sep 17 00:00:00 2001 +From: FalsinSoft <falsinsoft@gmail.com> +Date: Wed, 11 Jan 2023 20:58:04 +0100 +Subject: [PATCH] Fixed 'invalid_argument' is not a member of 'std' error on + Visual Studio + +--- + core/src/Matrix.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/core/src/Matrix.h b/core/src/Matrix.h +index 8b04bb1af..0c7c4e88b 100644 +--- a/core/src/Matrix.h ++++ b/core/src/Matrix.h +@@ -9,6 +9,7 @@ + #include "Point.h" + #include "ZXAlgorithms.h" + ++#include <stdexcept> + #include <algorithm> + #include <cassert> + #include <vector> |