# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # This file is part of the LibreOffice project. # # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # $(eval $(call gb_Extension_Extension,test-passive,desktop/test/deployment/passive,nodeliver)) $(eval $(call gb_Extension_add_file,test-passive,generic.components,$(call gb_Rdb_get_target,passive_generic))) $(eval $(call gb_Extension_add_file,test-passive,platform.components,$(call gb_Rdb_get_target,passive_platform))) $(eval $(call gb_Extension_add_files,test-passive,, \ $(SRCDIR)/desktop/test/deployment/passive/Addons.xcu \ $(SRCDIR)/desktop/test/deployment/passive/ProtocolHandler.xcu \ $(SRCDIR)/desktop/test/deployment/passive/passive_python.py \ $(call gb_Jar_get_target,passive_java) \ )) $(eval $(call gb_Extension_add_libraries,test-passive, \ passive_native \ )) # vim: set noet sw=4 ts=4: o/allotropia/zeta-7-4'>distro/allotropia/zeta-7-4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/external/zxing/UnpackedTarball_zxing.mk
AgeCommit message (Collapse)Author
2025-01-10wsl-as-helper: fix extracting zxing tarball (dangling symlinks)Christian Lohmaier
git-bash/msys tar fails when trying to extract the zxing tarball because it contains dangling symlinks and MSYS doesn't create symlinks by default. Change-Id: I51f3bb9e2a8cf5395b3fa314f3ac1d10b8873da7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179948 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2025-01-02zxing-cpp: Upgrade to 2.3.0Xisco Fauli
Downloaded from https://github.com/zxing-cpp/zxing-cpp/archive/refs/tags/v2.3.0.tar.gz Change-Id: I79a9d63cfafb44d733231b78bc19a45b43baa6b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179604 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins
2024-11-06Record external/zxing patch as sent upstreamStephan Bergmann
Change-Id: Ia84be07223cf8c7427aa899baf97b63ed8fc8794 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176144 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2024-11-06external/zxing: Missing include (for std::nullptr_t)Stephan Bergmann
Change-Id: I731eb3039f9f43ac05d3b60d5387ff44c5986a71 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176049 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
2023-12-23zxing-cpp: upgrade to release 2.2.1Taichi Haradaguchi
* remove 0001-android-Fix-build-with-NDK-26.patch, which was merged upstream. * remove DecodeHints from static lib, which according to upstream is not needed: https://github.com/zxing-cpp/zxing-cpp/issues/685#issuecomment-1853375179 * add a version header for client code generate/update via: * mkdir build && cd build && cmake .. * mv core/ZXVersion.h ../core/src/ Release Notes: https://github.com/zxing-cpp/zxing-cpp/releases/tag/v2.2.1 Change-Id: Ic4811d4724970c984dd9ed3d59b5204c18aafc6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160528 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-11-28external/zxing: Backport my upstream fix for android build w/ NDK 26Michael Weghorn
Upstream issue/PR/commit: https://github.com/zxing-cpp/zxing-cpp/issues/673 https://github.com/zxing-cpp/zxing-cpp/pull/674 https://github.com/zxing-cpp/zxing-cpp/commit/295b193b0105e68bb24747aefbff2653df892b4c Change-Id: I47586e0e54b3661e4ca1b5c071f6595fd000cc70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159999 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2023-07-11zxing-cpp: upgrade to release 2.1.0Taichi Haradaguchi
- remove external/zxing/invalid_argument.patch.1 and external/zxing/no_sanitize_ignored.patch.0, no longer needed in 2.1.0. - If "Utf.h" can be included, use ZXing::FromUtf8() instaed of ZXing::TextUtfEncoding::FromUtf8(). This makes external/zxing/undeprecate-warning.patch.0 unnecessary. Change-Id: I06acebb623aa8b60c5d2e5f7f265998571d75a89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154221 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp>
2023-02-26zxing: fix build after upgrade to v.2.0Mike Kaganski
Change-Id: If1b85a1f9f1b562aed8f357fd34434c8fe97e2f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147737 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-02-24upgrade zxing-cpp to 2.0.0Caolán McNamara
Change-Id: I3dc00f34359ec56a22cf7d8ba8e565ccb755c755 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147619 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-23Mark external/zxing/missing-include.patch.0 as upstreamedTaichi Haradaguchi
Change-Id: Ia4c251c952889b4ae174b172839a946302d41c48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145524 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-23Mark external/zxing/android_include.patch.0 as upstreamedTaichi Haradaguchi
Change-Id: I05f51e0ee83f43614dc85e0b1ca5854f8aed21a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145523 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-12-09external/zxing: Silence MSVC 2022 error C3781Stephan Bergmann
> workdir\UnpackedTarball\zxing\core\src\Generator.h(20): error C3781: Generator<ZXing::DetectorResult>::promise_type: a coroutine's promise must declare either 'return_value' or 'return_void' seen at least when building with --with-latest-c++ against VS 2022 17.5.0 Preview 1.0 Change-Id: Ie69100d87e6cb85526d772e8f0f5d11e1f9d6704 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143853 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-12-08external/zxing: Avoid MSVC 2022 error C2326Stephan Bergmann
> workdir/UnpackedTarball/zxing/core/src/qrcode/QRDetector.cpp(431): error C2326: 'auto ZXing::QRCode::SampleMQR::<lambda_1>::operator ()(int,bool) const': function cannot access 'FORMAT_INFO_COORDS' seen at least with VS 2022 17.4.2 and VS 2022 17.5.0 Preview 1.0, but not with VS 2019 16.11.21. It looks to me like a bug in MSVC, but then again it doesn't hurt to make that variable static, anyway. Change-Id: I48fa22f9495791e60953f9f717ffc8333314de1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143826 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-12-08external/zxing: Missing includesStephan Bergmann
...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 <sbergman@redhat.com>
2022-12-07zxing-cpp: upgrade to release 1.4.0Taichi Haradaguchi
== 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>
2022-05-23Missing #include <stdint.h> in various external codeStephan Bergmann
...which is a problem presumably since GCC 13 trunk <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1> "libstdc++: Avoid including <cstdint> for std::char_traits". (All the broken C++ code used unqualified uintptr_t etc. rather than std::uintptr_t etc., so I deemed it more appropriate to include <stdint.h> rather than <cstdint>.) Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-12-10merge fixes to zxing's copy of stb_imageCaolán McNamara
see: https://github.com/nu-book/zxing-cpp/pull/269 CVE-2021-28021 CVE-2021-42715 CVE-2021-42716 though it's unclear if there is any relevence to our usage of zxing-cpp Change-Id: I30fa7682af56c432b651d8c0385f1b85c3582101 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126647 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-01zxing: newline problem with GCC 11 -E -fdirectives-onlyMichael Stahl
KRHangulMapping.h:38:55: error: stray '#' in program Change-Id: I81e15f524c68da6bd5271a89035857f5e3c2ebc3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114974 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-03-20tdf#139778 bundle external:zxing libhomeboy445
Change-Id: I0023f6ce8315427b1a3deaf755e78ae06475b08c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112053 Reviewed-by: René Engelhard <rene@debian.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: René Engelhard <rene@debian.org> Tested-by: Jenkins