summaryrefslogtreecommitdiff
path: root/external/libexttextcat
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-09-20 12:28:21 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-09-20 17:16:18 +0200
commit6c4e37c8263442356587cb7cd75039d73792d346 (patch)
tree087e9a6dc7fd9d32acbfd9d9ac1816b23131fbbc /external/libexttextcat
parenteef3b0182af2f6196eb4c2a402d72eeaed069083 (diff)
bump libexttextcat to 3.4.5
Change-Id: Id561d4acb9347768d74233dea3e7b06ff7374477 Reviewed-on: https://gerrit.libreoffice.org/42546 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/libexttextcat')
-rw-r--r--external/libexttextcat/UnpackedTarball_libexttextcat.mk4
-rw-r--r--external/libexttextcat/exttextcat-iOS.patch.18
-rw-r--r--external/libexttextcat/ubsan.patch40
3 files changed, 4 insertions, 48 deletions
diff --git a/external/libexttextcat/UnpackedTarball_libexttextcat.mk b/external/libexttextcat/UnpackedTarball_libexttextcat.mk
index cda8a982146d..0e1373453bfc 100644
--- a/external/libexttextcat/UnpackedTarball_libexttextcat.mk
+++ b/external/libexttextcat/UnpackedTarball_libexttextcat.mk
@@ -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)))
diff --git a/external/libexttextcat/exttextcat-iOS.patch.1 b/external/libexttextcat/exttextcat-iOS.patch.1
index 39e31e21c68b..c7d02c2426d5 100644
--- a/external/libexttextcat/exttextcat-iOS.patch.1
+++ b/external/libexttextcat/exttextcat-iOS.patch.1
@@ -1,18 +1,18 @@
--- 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-* \
diff --git a/external/libexttextcat/ubsan.patch b/external/libexttextcat/ubsan.patch
deleted file mode 100644
index 767a9a003619..000000000000
--- a/external/libexttextcat/ubsan.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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])
- {