summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2021-03-30 17:36:05 +0200
committerDavid Tardon <dtardon@redhat.com>2021-03-30 19:46:50 +0200
commit64788738db595cb642b7efd49340cae33d92698e (patch)
treebfb602cb2d85da65c3830e88a112e984edf1f4b6 /external
parent42c09f639d68e2b25a108a451e23ac9a5e3312b6 (diff)
upload libcdr 0.1.7
Change-Id: Ie01fdee7379c398fe7df7c140e2f0059bea71abe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113380 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/libcdr/UnpackedTarball_libcdr.mk1
-rw-r--r--external/libcdr/libcdr-no-icu-boolean.patch.112
2 files changed, 0 insertions, 13 deletions
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk
index d8742f3c5f5a..f0e80f06f05f 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
external/libcdr/libcdr-visibility-win.patch \
- external/libcdr/libcdr-no-icu-boolean.patch.1 \
external/libcdr/ax_gcc_func_attribute.m4.patch \
))
diff --git a/external/libcdr/libcdr-no-icu-boolean.patch.1 b/external/libcdr/libcdr-no-icu-boolean.patch.1
deleted file mode 100644
index 65884fbbf873..000000000000
--- a/external/libcdr/libcdr-no-icu-boolean.patch.1
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur libcdr.org/src/lib/libcdr_utils.cpp libcdr/src/lib/libcdr_utils.cpp
---- libcdr.org/src/lib/libcdr_utils.cpp 2020-02-02 16:30:44.000000000 +0100
-+++ libcdr/src/lib/libcdr_utils.cpp 2020-11-16 21:08:04.092927628 +0100
-@@ -108,7 +108,7 @@
- csd = ucsdet_open(&status);
- if (U_FAILURE(status) || !csd)
- return 0;
-- ucsdet_enableInputFilter(csd, TRUE);
-+ ucsdet_enableInputFilter(csd, true);
- ucsdet_setText(csd, (const char *)buffer, bufferLength, &status);
- if (U_FAILURE(status))
- throw libcdr::EncodingException();