diff options
| author | Taichi Haradaguchi <20001722@ymail.ne.jp> | 2022-11-11 00:37:22 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-12-07 14:49:45 +0000 |
| commit | 368116fb55eb83c9f8c7eb180044f848294638bb (patch) | |
| tree | 40c66dbd4b4074f3e185445870dc9ef7759baf1d /external/zxing/UnpackedTarball_zxing.mk | |
| parent | e58ad604df2022450bec0d83d496037c799ae969 (diff) | |
zxing-cpp: upgrade to release 1.4.0
== list of removed patches ==
* 0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch: fixed upstream[1].
* 0002-Update-stb_image_write-from-1.14-to-1.16.patch: fixed upstream.
* 0003-Update-stb_image-from-2.25-to-2.27.patch: fixed upstream
* 0004-Apply-stb-PR-1223-to-stb_image.patch: "stb_image.h" and "stb_image.patch" were removed upstream[1][2].
* include.patch.0: fixed upstream (added #include <cstdint>)[3].
* zxing_newline.patch: this issue has been fixed since gcc 11.2/12 or later[4].
== list of added patches ==
* android_include.patch.0: added missing #include <cmath>(for std::abs)
* assume.__cpp_lib_string_view.patch.0 (by Caolán McNamara): fixed "error: no member named 'asString' in 'ZXing::ByteArray'"
[1] https://github.com/zxing-cpp/zxing-cpp/commit/b208f4bd9052527b7a499d178d81d55b30a27c2d
[2] https://github.com/zxing-cpp/zxing-cpp/commit/d2603139c57e2bbca770656a683abb124adc1591
[3] https://github.com/zxing-cpp/zxing-cpp/commit/53da58625dcd519b7c10e2349a83c9bd10105cf7
[4] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392
Change-Id: I6266fd6609f0d4235a8d2bcb6571817ef2135101
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142553
Tested-by: Jenkins
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/zxing/UnpackedTarball_zxing.mk')
| -rw-r--r-- | external/zxing/UnpackedTarball_zxing.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/external/zxing/UnpackedTarball_zxing.mk b/external/zxing/UnpackedTarball_zxing.mk index a171c86de7db..012b5cefaf3a 100644 --- a/external/zxing/UnpackedTarball_zxing.mk +++ b/external/zxing/UnpackedTarball_zxing.mk @@ -14,12 +14,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,zxing,$(ZXING_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,zxing,1)) $(eval $(call gb_UnpackedTarball_add_patches,zxing, \ - external/zxing/zxing_newline.patch.1 \ - external/zxing/0001-Use-a-patch-file-to-document-changes-from-upstream-s.patch \ - external/zxing/0002-Update-stb_image_write-from-1.14-to-1.16.patch \ - external/zxing/0003-Update-stb_image-from-2.25-to-2.27.patch \ - external/zxing/0004-Apply-stb-PR-1223-to-stb_image.patch \ - external/zxing/include.patch.0 \ + external/zxing/assume.__cpp_lib_string_view.patch.0 \ + external/zxing/android_include.patch.0 \ )) # vim: set noet sw=4 ts=4: |