bin/oss-fuzz-setup.sh | 4 ++--
download.lst | 8 ++++----
external/glm/c++20.patch.0 | 16 ++++++++--------
external/glm/clang-cl.patch.0 | 18 +++++++++---------
solenv/flatpak-manifest.in | 6 +++---
5 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 5d05355039ee11f4ba6429d4781d030900c3a829
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 20 12:31:47 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 20 18:24:51 2021 +0200
upgrade fontconfig to 2.13.94
Change-Id: I5914c16db85c688b38575f510a44c7ddb043d2e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123888
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 1ba6f10ab5f7..39ff8a8d8d5b 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -62,7 +62,7 @@ curl --no-progress-meter -S \
-C - -O https://dev-www.libreoffice.org/src/libxslt-1.1.34.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz \
-C - -O https://dev-www.libreoffice.org/src/freetype-2.11.0.tar.xz \
- -C - -O https://dev-www.libreoffice.org/src/fontconfig-2.13.91.tar.gz \
+ -C - -O https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libepoxy-1.5.9.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz \
-C - -O https://dev-www.libreoffice.org/src/libnumbertext-1.0.7.tar.xz \
diff --git a/download.lst b/download.lst
index 4e8951e55429..dde3c82b7cdb 100644
--- a/download.lst
+++ b/download.lst
@@ -54,8 +54,8 @@ export EXPAT_SHA256SUM :=
2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e
export EXPAT_TARBALL := expat-2.4.1.tar.bz2
export FIREBIRD_SHA256SUM :=
acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76
export FIREBIRD_TARBALL := Firebird-3.0.7.33374-0.tar.bz2
-export FONTCONFIG_SHA256SUM :=
19e5b1bc9d013a52063a44e1307629711f0bfef35b9aca16f9c793971e2eb1e5
-export FONTCONFIG_TARBALL := fontconfig-2.13.91.tar.gz
+export FONTCONFIG_SHA256SUM :=
a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c
+export FONTCONFIG_TARBALL := fontconfig-2.13.94.tar.xz
export FONT_CALADEA_SHA256SUM :=
c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
export FONT_CALADEA_TARBALL :=
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
export FONT_CARLITO_SHA256SUM :=
4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
commit 6ae257e3fc7f07daab1ad8614f934f9027b0a604
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 20 13:03:51 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 20 18:24:40 2021 +0200
upgrade glm to 0.0.9.9.8
Change-Id: I39ca17984cc03de815386343b2f4c4fffd5c861e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123891
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/bin/oss-fuzz-setup.sh b/bin/oss-fuzz-setup.sh
index 8eb1313937d4..1ba6f10ab5f7 100755
--- a/bin/oss-fuzz-setup.sh
+++ b/bin/oss-fuzz-setup.sh
@@ -55,7 +55,7 @@ curl --no-progress-meter -S \
-C - -O
https://dev-www.libreoffice.org/src/language-subtag-registry-2021-08-06.tar.bz2
\
-C - -O https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.14.tgz \
-C - -O https://dev-www.libreoffice.org/src/harfbuzz-2.8.2.tar.xz \
- -C - -O https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip \
+ -C - -O https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip \
-C - -O https://dev-www.libreoffice.org/src/icu4c-69_1-src.tgz \
-C - -O https://dev-www.libreoffice.org/src/icu4c-69_1-data.zip \
-C - -O https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz \
diff --git a/download.lst b/download.lst
index 2902003dfabf..4e8951e55429 100644
--- a/download.lst
+++ b/download.lst
@@ -98,8 +98,8 @@ export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d909
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
export FREETYPE_TARBALL := freetype-2.11.0.tar.xz
-export GLM_SHA256SUM :=
c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95
-export GLM_TARBALL := glm-0.9.9.7.zip
+export GLM_SHA256SUM :=
6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad
+export GLM_TARBALL := glm-0.9.9.8.zip
export GPGME_SHA256SUM :=
c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46
export GPGME_TARBALL := gpgme-1.13.1.tar.bz2
export GRAPHITE_SHA256SUM :=
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
diff --git a/external/glm/c++20.patch.0 b/external/glm/c++20.patch.0
index 34a40b5ef4c6..9fdd813a1e53 100644
--- a/external/glm/c++20.patch.0
+++ b/external/glm/c++20.patch.0
@@ -1,11 +1,11 @@
--- glm/detail/type_half.inl
+++ glm/detail/type_half.inl
@@ -6,7 +6,7 @@
- volatile float f = 1e10;
-
- for(int i = 0; i < 10; ++i)
-- f *= f; // this will overflow before the for loop
terminates
-+ f = f * f; // this will overflow before the for loop
terminates
- return f;
- }
-
+ volatile float f = 1e10;
+
+ for(int i = 0; i < 10; ++i)
+- f *= f; // this will overflow before the for loop
terminates
++ f = f * f; // this will overflow before the for loop
terminates
+ return f;
+ }
+
diff --git a/external/glm/clang-cl.patch.0 b/external/glm/clang-cl.patch.0
index 44713a1968c5..e5536e145094 100644
--- a/external/glm/clang-cl.patch.0
+++ b/external/glm/clang-cl.patch.0
@@ -3,12 +3,12 @@
--- glm/detail/func_integer.inl
+++ glm/detail/func_integer.inl
@@ -3,7 +3,9 @@
- #include "_vectorize.hpp"
- #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
- # include <intrin.h>
-+#if !defined __clang__^M
- # pragma intrinsic(_BitScanReverse)
-+#endif
- #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
- #include <limits>
-
+ #include "_vectorize.hpp"
+ #if(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ # include <intrin.h>
++#if !defined __clang__
+ # pragma intrinsic(_BitScanReverse)
++#endif
+ #endif//(GLM_ARCH & GLM_ARCH_X86 && GLM_COMPILER & GLM_COMPILER_VC)
+ #include <limits>
+
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index d0e93080a0cc..295b31b1d3ae 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -208,11 +208,11 @@
"dest-filename": "Firebird-3.0.7.33374-0.tar.bz2"
},
{
- "url":
"https://dev-www.libreoffice.org/src/glm-0.9.9.7.zip";,
- "sha256":
"c5e167c042afd2d7ad642ace6b643863baeb33880781983563e1ab68a30d3e95",
+ "url":
"https://dev-www.libreoffice.org/src/glm-0.9.9.8.zip";,
+ "sha256":
"6bba5f032bed47c73ad9397f2313b9acbfb56253d0d0576b5873d3dcb25e99ad",
"type": "file",
"dest": "external/tarballs",
- "dest-filename": "glm-0.9.9.7.zip"
+ "dest-filename": "glm-0.9.9.8.zip"
},
{
"url":
"https://dev-www.libreoffice.org/src/gpgme-1.13.1.tar.bz2";,
