download.lst | 4 ++--
external/libffi/ExternalPackage_libffi.mk | 2 +-
external/python3/UnpackedTarball_python3.mk | 2 ++
external/python3/python-3.8-msvc-libffi.patch.1 | 16 ++++++++++++++++
4 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit f298e4b24660e34e651a9b0ec349b542b661efa6
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Oct 14 11:30:48 2023 +0900
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Oct 18 10:55:27 2023 +0200
Upgrade libffi to 3.4.4
Change-Id: I417abc5d76db235c23195abff22d3d27f9c0fa77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157972
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 7359700d5dc847accd360e70f7dcc45d119577be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158030
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/download.lst b/download.lst
index 09c449b11a92..6c0684d07362 100644
--- a/download.lst
+++ b/download.lst
@@ -309,8 +309,8 @@ LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.6.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBFFI_SHA256SUM :=
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
-LIBFFI_TARBALL := libffi-3.3.tar.gz
+LIBFFI_SHA256SUM :=
d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676
+LIBFFI_TARBALL := libffi-3.4.4.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/libffi/ExternalPackage_libffi.mk
b/external/libffi/ExternalPackage_libffi.mk
index 61b0a1ca460c..c524ef90289f 100644
--- a/external/libffi/ExternalPackage_libffi.mk
+++ b/external/libffi/ExternalPackage_libffi.mk
@@ -13,7 +13,7 @@ $(eval $(call
gb_ExternalPackage_use_external_project,libffi,libffi))
ifeq ($(COM),MSC)
$(eval $(call
gb_ExternalPackage_add_files,libffi,$(LIBO_LIB_FOLDER)/python-core-$(PYTHON_VERSION)/lib,
\
- $(HOST_PLATFORM)/.libs/libffi-7.dll \
+ $(HOST_PLATFORM)/.libs/libffi-8.dll \
))
endif
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index 127dea4a8ee4..93cb9015c9a6 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,python3))
$(eval $(call
gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3))
$(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
+ PCbuild/libffi.props \
PCbuild/pcbuild.sln \
))
@@ -19,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.8-msvc-sdk.patch.1 \
+ external/python3/python-3.8-msvc-libffi.patch.1 \
external/python3/python-3.7.6-msvc-ssl.patch.1 \
external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/ubsan.patch.0 \
diff --git a/external/python3/python-3.8-msvc-libffi.patch.1
b/external/python3/python-3.8-msvc-libffi.patch.1
new file mode 100644
index 000000000000..674043a7dca6
--- /dev/null
+++ b/external/python3/python-3.8-msvc-libffi.patch.1
@@ -0,0 +1,16 @@
+--- python3/PCbuild/libffi.props.orig 2023-08-25 04:36:32.000000000 +0900
++++ python3/PCbuild/libffi.props 2023-10-14 15:13:24.850511531 +0900
+@@ -6,11 +6,11 @@
+ </ClCompile>
+ <Link>
+
<AdditionalLibraryDirectories>$(libffiOutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+-
<AdditionalDependencies>libffi-7.lib;%(AdditionalDependencies)</AdditionalDependencies>
++
<AdditionalDependencies>libffi-8.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+- <_LIBFFIDLL Include="$(libffiOutDir)\libffi-7.dll" />
++ <_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" />
+ </ItemGroup>
+ <Target Name="_CopyLIBFFIDLL" Inputs="@(_LIBFFIDLL)"
Outputs="@(_LIBFFIDLL->'$(OutDir)%(Filename)%(Extension)')"
AfterTargets="Build">
+ <Copy SourceFiles="@(_LIBFFIDLL)" DestinationFolder="$(OutDir)" />
