external/lcms2/lcms2-2.4-windows.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 095555b493fba9766a9305f2e7da148ac7f0b6ca
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Dec 14 22:01:40 2023 +0900
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Dec 21 16:05:13 2023 +0100
external/lcms2: fix lcms2-2.4-windows.patch
fix typos and macros in code.
Change-Id: I0886f3d95d87be70be1e7e6a220617f728fe6653
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161056
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 324a12413f28ca506487f677d68b840529130aef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161091
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/external/lcms2/lcms2-2.4-windows.patch
b/external/lcms2/lcms2-2.4-windows.patch
index 0281a7769a91..1b5dfdffe8a2 100644
--- a/external/lcms2/lcms2-2.4-windows.patch
+++ b/external/lcms2/lcms2-2.4-windows.patch
@@ -1,4 +1,4 @@
-This patch is neccesary for Windows (32-bit) build.
+This patch is necessary for Windows (32-bit) build.
(In Jenkins' build message)
> icc_transform.o : error LNK2019: unresolved external symbol
> _cmsGetColorSpace referenced in function "public: static class
> std::unique_ptr<class fxcodec::IccTransform,struct std::default_delete<class
> fxcodec::IccTransform> > __cdecl
> fxcodec::IccTransform::CreateTransformSRGB(class pdfium::span<unsigned char
> const >)"
> (?CreateTransformSRGB@IccTransform@fxcodec@@SA?AV?$unique_ptr@VIccTransform@fxcodec@@U?$default_delete@VIccTransform@fxcodec@@@std@@@std@@V?$span@$$CBE@pdfium@@@Z)
@@ -21,7 +21,7 @@ This patch is neccesary for Windows (32-bit) build.
+// LibreOffice always builds this as DLL and with the stdcall calling
+// convention, so make this usable from outside without having to
+// specify CMS_DLL manually whenever the library is used.
-+#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && !defined(_WIN64)
++#if !defined(CMS_DLL_BUILD) && !defined(CMS_DLL) && defined(_MSC_VER) &&
defined(_M_IX86)
+#define CMS_DLL
+#endif
+
