bin/oss-fuzz-setup.sh | 2 -
download.lst | 4 +-
external/lcms2/ExternalPackage_lcms2.mk | 2 -
external/lcms2/lcms2-win-arm64.patch.1 | 62 +++++++++++++++++++-------------
4 files changed, 42 insertions(+), 28 deletions(-)
New commits:
commit 9574b70e5430b89d49e01e92e8fda0d674144706
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 20 10:27:24 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 20 14:11:46 2021 +0200
upgrade lcms2 to 2.12
Change-Id: I40c3239495c6050add3ce2343453241f8c825d62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123886
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index e43aa6bad992..e7394d515061 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -22,7 +22,7 @@ curl --no-progress-meter -S \
-C - -O https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2 \
-C - -O
https://dev-www.libreoffice.org/src/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
\
-C - -O https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz \
- -C - -O https://dev-www.libreoffice.org/src/lcms2-2.11.tar.gz \
+ -C - -O https://dev-www.libreoffice.org/src/lcms2-2.12.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/cppunit-1.15.1.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/cairo-1.17.4.tar.xz \
diff --git a/download.lst b/download.lst
index 434ba4740a8a..d3c0a0368746 100644
--- a/download.lst
+++ b/download.lst
@@ -144,8 +144,8 @@ export LANGTAGREG_SHA256SUM :=
08452d3997c78e21f2d81e31409dc46557707be6dc1df3129
export LANGTAGREG_TARBALL := language-subtag-registry-2021-08-06.tar.bz2
export LANGUAGETOOL_SHA256SUM :=
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
export LANGUAGETOOL_TARBALL :=
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
-export LCMS2_SHA256SUM :=
dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e
-export LCMS2_TARBALL := lcms2-2.11.tar.gz
+export LCMS2_SHA256SUM :=
18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5
+export LCMS2_TARBALL := lcms2-2.12.tar.gz
export LIBASSUAN_SHA256SUM :=
91bcb0403866b4e7c4bc1cc52ed4c364a9b5414b3994f718c70303f7f765e702
export LIBASSUAN_TARBALL := libassuan-2.5.3.tar.bz2
export LIBATOMIC_OPS_SHA256SUM :=
1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665
diff --git a/external/lcms2/ExternalPackage_lcms2.mk
b/external/lcms2/ExternalPackage_lcms2.mk
index c0cdc098b6e2..ede9e66acfa9 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -21,7 +21,7 @@ else ifeq ($(COM),MSC)
$(eval $(call
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2.dll))
endif # $(COM)
else # $(OS) != WNT/MACOSX
-$(eval $(call
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.10))
+$(eval $(call
gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.12))
endif # $(OS)
endif # $(DISABLE_DYNLOADING)
diff --git a/external/lcms2/lcms2-win-arm64.patch.1
b/external/lcms2/lcms2-win-arm64.patch.1
index 42244b742797..fc9f0c374f7e 100644
--- a/external/lcms2/lcms2-win-arm64.patch.1
+++ b/external/lcms2/lcms2-win-arm64.patch.1
@@ -1110,18 +1110,18 @@ diff -urbaN
lcms2-2.11.orig/Projects/VC2019/tiffdiff/tiffdiff.vcxproj lcms2-2.11
<CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
-+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
-+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
-+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">C:\jpeg-8d;c:\tiff-4.0.2\libtiff;$(IncludePath)</IncludePath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
-+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">C:\jpeg-8d;C:\tiff-4.0.2\libtiff;$(LibraryPath)</LibraryPath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
++ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
++ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
++ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">C:\jpeg-8d;$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
++ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">C:\jpeg-8d;$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -1183,6 +1183,13 @@ diff -urbaN
lcms2-2.11.orig/Projects/VC2019/tiffdiff/tiffdiff.vcxproj lcms2-2.11
<ItemGroup>
<ClCompile Include="..\..\..\utils\common\vprf.c" />
<ClCompile Include="..\..\..\utils\common\xgetopt.c" />
+@@ -207,4 +290,4 @@
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
diff -urbaN lcms2-2.11.orig/Projects/VC2019/tifficc/tifficc.vcxproj
lcms2-2.11/Projects/VC2019/tifficc/tifficc.vcxproj
--- lcms2-2.11.orig/Projects/VC2019/tifficc/tifficc.vcxproj 2020-06-16
19:10:37.000000000 +0200
+++ lcms2-2.11/Projects/VC2019/tifficc/tifficc.vcxproj 2020-07-09
18:28:38.821720648 +0200
@@ -1286,18 +1293,18 @@ diff -urbaN
lcms2-2.11.orig/Projects/VC2019/tifficc/tifficc.vcxproj lcms2-2.11/P
<CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" />
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath);C:\tiff-4.0.2\libtiff</IncludePath>
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath);C:\tiff-4.0.2\libtiff</IncludePath>
-+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(IncludePath);C:\tiff-4.0.2\libtiff</IncludePath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath);C:\tiff-4.0.2\libtiff</LibraryPath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);C:\tiff-4.0.2\libtiff</LibraryPath>
-+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(LibraryPath);C:\tiff-4.0.2\libtiff</LibraryPath>
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath);C:\tiff-4.0.2\libtiff</IncludePath>
- <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath);C:\tiff-4.0.2\libtiff</IncludePath>
-+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(IncludePath);C:\tiff-4.0.2\libtiff</IncludePath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath);C:\tiff-4.0.2\libtiff</LibraryPath>
- <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath);C:\tiff-4.0.2\libtiff</LibraryPath>
-+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(LibraryPath);C:\tiff-4.0.2\libtiff</LibraryPath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
++ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
++ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
++ <IncludePath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(IncludePath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</IncludePath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
+ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
++ <LibraryPath
Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(LibraryPath);E:\liteCommons\3rdparty\tiff-4.1.0\libtiff</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -1358,6 +1365,13 @@ diff -urbaN
lcms2-2.11.orig/Projects/VC2019/tifficc/tifficc.vcxproj lcms2-2.11/P
<ItemGroup>
<ClCompile Include="..\..\..\utils\common\vprf.c" />
<ClCompile Include="..\..\..\utils\common\xgetopt.c" />
+@@ -208,4 +290,4 @@
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+-</Project>
+\ No newline at end of file
++</Project>
diff -urbaN lcms2-2.11.orig/Projects/VC2019/transicc/transicc.vcxproj
lcms2-2.11/Projects/VC2019/transicc/transicc.vcxproj
--- lcms2-2.11.orig/Projects/VC2019/transicc/transicc.vcxproj 2020-06-16
19:10:37.000000000 +0200
+++ lcms2-2.11/Projects/VC2019/transicc/transicc.vcxproj 2020-07-09
18:28:38.945719719 +0200
