download.lst | 4 ++--
external/libcdr/UnpackedTarball_libcdr.mk | 1 -
external/libcdr/libcdr-no-icu-boolean.patch.1 | 12 ------------
solenv/flatpak-manifest.in | 6 +++---
4 files changed, 5 insertions(+), 18 deletions(-)
New commits:
commit 64788738db595cb642b7efd49340cae33d92698e
Author: David Tardon <dtar...@redhat.com>
AuthorDate: Tue Mar 30 17:36:05 2021 +0200
Commit: David Tardon <dtar...@redhat.com>
CommitDate: Tue Mar 30 19:46:50 2021 +0200
upload libcdr 0.1.7
Change-Id: Ie01fdee7379c398fe7df7c140e2f0059bea71abe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113380
Tested-by: Jenkins
Reviewed-by: David Tardon <dtar...@redhat.com>
diff --git a/download.lst b/download.lst
index fcb5e165473c..adf73ca23d30 100644
--- a/download.lst
+++ b/download.lst
@@ -25,8 +25,8 @@ export BZIP2_TARBALL :=
00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
export CAIRO_SHA256SUM :=
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
export CAIRO_VERSION_MICRO := 0
export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
-export CDR_SHA256SUM :=
01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861
-export CDR_TARBALL := libcdr-0.1.6.tar.xz
+export CDR_SHA256SUM :=
5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4
+export CDR_TARBALL := libcdr-0.1.7.tar.xz
export CLUCENE_SHA256SUM :=
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
export CLUCENE_TARBALL :=
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
export DTOA_SHA256SUM :=
0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4
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();
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 369184ce7f0a..c86fc663388f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -219,10 +219,10 @@
"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
},
{
- "url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz";,
- "sha256":
"01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861",
+ "url":
"https://dev-www.libreoffice.org/src/libcdr-0.1.7.tar.xz";,
+ "sha256":
"5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4",
"type": "file",
- "dest-filename": "external/tarballs/libcdr-0.1.6.tar.xz"
+ "dest-filename": "external/tarballs/libcdr-0.1.7.tar.xz"
},
{
"url":
"https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz";,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
