Kaydet (Commit) 6c4e37c8 authored tarafından Caolán McNamara's avatar Caolán McNamara

bump libexttextcat to 3.4.5

Change-Id: Id561d4acb9347768d74233dea3e7b06ff7374477
Reviewed-on: https://gerrit.libreoffice.org/42546Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst eef3b018
......@@ -131,8 +131,8 @@ export LIBATOMIC_OPS_SHA256SUM := cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0b
export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
export LIBEOT_SHA256SUM := cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a
export LIBEOT_TARBALL := libeot-0.01.tar.bz2
export LIBEXTTEXTCAT_SHA256SUM := 9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163
export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2
export LIBEXTTEXTCAT_SHA256SUM := 13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8
export LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.5.tar.xz
export LIBGLTF_SHA256SUM := 119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da
export LIBGLTF_TARBALL := libgltf-0.1.0.tar.gz
export LIBGPGERROR_SHA256SUM := 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
......
......@@ -11,12 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libexttextcat))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libexttextcat,0))
# ubsan.patch upstreamed as
# <https://github.com/LibreOffice/libexttextcat/pull/1> "Silence various
# -fsanitize=shift-base":
$(eval $(call gb_UnpackedTarball_add_patches,libexttextcat,\
external/libexttextcat/exttextcat-iOS.patch.1 \
external/libexttextcat/ubsan.patch \
))
$(eval $(call gb_UnpackedTarball_set_tarball,libexttextcat,$(LIBEXTTEXTCAT_TARBALL)))
......
--- libexttextcat.org/config.sub 2014-06-27 12:16:52.000000000 +0200
+++ libexttextcat/config.sub 2017-06-11 11:39:17.000000000 +0200
@@ -257,7 +257,7 @@
@@ -253,7 +253,7 @@
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc \
| arc | arceb \
- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
| avr | avr32 \
| be32 | be64 \
| bfin \
@@ -370,7 +370,7 @@
@@ -374,7 +374,7 @@
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
| avr-* | avr32-* \
......
--- src/fingerprint.c
+++ src/fingerprint.c
@@ -128,7 +128,7 @@
*/
static uint4 simplehash(const char *p, int len)
{
- sint4 h = len * 13;
+ uint4 h = len * 13;
while (*p)
{
h = (h << 5) - h + *p++;
--- src/utf8misc.c
+++ src/utf8misc.c
@@ -61,7 +61,7 @@
* if the first bit of the current char is 1 then *str is an escape
* character
*/
- char escape_char = ((*str & WEIGHT_MASK) << 1);
+ unsigned char escape_char = ((*str & WEIGHT_MASK) << 1);
/*
* and we use it to count (by bit translation) following characters
@@ -99,7 +99,7 @@
* then str[pointer] is an escape character and we use it to count
* following characters (only the weightest part)
*/
- char escape_char = ((str[pointer] & WEIGHT_MASK) << 1);
+ unsigned char escape_char = ((str[pointer] & WEIGHT_MASK) << 1);
/*
* every step, we move the byte of 1 bit left, when first bit is 0,
@@ -138,7 +138,7 @@
* (only the weightest part)
*/
- char escape_char = ((key[pointer] & WEIGHT_MASK) << 1);
+ unsigned char escape_char = ((key[pointer] & WEIGHT_MASK) << 1);
while (escape_char & ESCAPE_MASK && key[pointer] == lex[pointer])
{
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment