strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upgrade glm to 0.0.9.9.8

Browse source 
Change-Id: I39ca17984cc03de815386343b2f4c4fffd5c861e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123891
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara 2021-10-20 13:03:51 +01:00
parent f138cc8fff
commit 6ae257e3fc
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/oss-fuzz-setup.sh
View file

@ -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 \

4
download.lst
View file

@ -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

16
external/glm/c++20.patch.0 vendored
View file

@ -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;
}

18
external/glm/clang-cl.patch.0 vendored
View file

@ -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>

6
solenv/flatpak-manifest.in
View file

@ -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",