download.lst | 4 ++--
external/libtommath/README | 2 +-
external/libtommath/UnpackedTarball_libtommath.mk | 2 --
external/libtommath/clang-cl.patch | 16 ----------------
external/libtommath/libtommath-msvc.patch | 12 ------------
5 files changed, 3 insertions(+), 33 deletions(-)
New commits:
commit 89da375303b085e0ebb2604e1c51cc90b1099ab9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:27:57 2023 +0900
Commit: خالد حسني <kha...@libreoffice.org>
CommitDate: Tue Jul 25 10:57:58 2023 +0200
LibTomMath: upgrade to release 1.2.0
* external/libtommath/clang-cl.patch: removed "typedef unsigned __int128
mp_word" from tommmath.h
* external/libtommath/libtommath-msvc.patch: fixed upstream
Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154315
Reviewed-by: خالد حسني <kha...@libreoffice.org>
diff --git a/download.lst b/download.lst
index a218a4c388e8..cd4f75c9d2e4 100644
--- a/download.lst
+++ b/download.lst
@@ -329,8 +329,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
-LIBTOMMATH_TARBALL := ltm-1.0.zip
+LIBTOMMATH_SHA256SUM :=
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
+LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/libtommath/README b/external/libtommath/README
index a028ff733161..41f91970a71b 100644
--- a/external/libtommath/README
+++ b/external/libtommath/README
@@ -3,4 +3,4 @@ integer library written entirely in C.
Used by embedded firebird (external/firebird).
-https://www.libtom.net/LibTomMath/
+From [https://www.libtom.net/LibTomMath/].
diff --git a/external/libtommath/UnpackedTarball_libtommath.mk
b/external/libtommath/UnpackedTarball_libtommath.mk
index bb0b9e352930..8961a46162c5 100644
--- a/external/libtommath/UnpackedTarball_libtommath.mk
+++ b/external/libtommath/UnpackedTarball_libtommath.mk
@@ -14,8 +14,6 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
$(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
- external/libtommath/libtommath-msvc.patch \
- external/libtommath/clang-cl.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libtommath/clang-cl.patch
b/external/libtommath/clang-cl.patch
deleted file mode 100644
index 1cc92d380c62..000000000000
--- a/external/libtommath/clang-cl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- tommath.h
-+++ tommath.h
-@@ -15,6 +15,13 @@
- #ifndef BN_H_
- #define BN_H_
-
-+// Work around clang-cl issue when mp_word is a typedef for unsigned
__int128, see
-+// <https://bugs.llvm.org/show_bug.cgi?id=25305> "Clang-cl generates a call
to an undefined symbol
-+// _udivti3":
-+#if defined _WIN32 && defined __clang__
-+#define MP_8BIT
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdint.h>
diff --git a/external/libtommath/libtommath-msvc.patch
b/external/libtommath/libtommath-msvc.patch
deleted file mode 100644
index 07884871aac9..000000000000
--- a/external/libtommath/libtommath-msvc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- makefile.msvc 2016-02-05 23:25:32.000000000 +0100
-+++ makefile.msvc 2016-07-21 11:34:20.618390100 +0200
-@@ -38,3 +38,9 @@
-
- library: $(OBJECTS)
- lib /out:tommath.lib $(OBJECTS)
-+
-+.cc.obj:
-+ $(CC) /nologo $(CFLAGS) /c $<
-+
-+.c.obj:
-+ $(CC) /nologo $(CFLAGS) /c $<
