[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/libebook solenv/flatpak-manifest.in writerperfect/Library_wpftwriter.mk
David Tardon
dtardon at redhat.com
Sun Jan 7 14:15:42 UTC 2018
download.lst | 4
external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 | 25 -----
external/libebook/ExternalProject_libebook.mk | 8 -
external/libebook/UnpackedTarball_libebook.mk | 3
external/libebook/libebook-msvc.patch.1 | 46 ++++++++++
external/libebook/ubsan.patch | 11 --
solenv/flatpak-manifest.in | 6 -
writerperfect/Library_wpftwriter.mk | 1
8 files changed, 57 insertions(+), 47 deletions(-)
New commits:
commit db8062401624efdf5c8de6940fd210f3254a2214
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 2 13:56:54 2018 +0100
upload libe-book 0.1.3
Change-Id: I8862e7f4d2dcb007295028b9ec7be04e58ebafd3
Reviewed-on: https://gerrit.libreoffice.org/47264
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 86994e1c25bb5a2d0f97d17328457fa6dfd2f288)
Reviewed-on: https://gerrit.libreoffice.org/47483
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
diff --git a/download.lst b/download.lst
index 945fa24b65a8..8dade701d629 100644
--- a/download.lst
+++ b/download.lst
@@ -31,8 +31,8 @@ export CT2N_SHA256SUM := 71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e645
export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
export CURL_SHA256SUM := 7ce35f207562674e71dbada6891b37e3f043c1e7a82915cb9c2a17ad3a9d659b
export CURL_TARBALL := curl-7.57.0.tar.gz
-export EBOOK_SHA256SUM := b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850
-export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
+export EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
+export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
export EPOXY_SHA256SUM := 1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64
export EPOXY_TARBALL := libepoxy-1.3.1.tar.bz2
export EPM_SHA256SUM := b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
diff --git a/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 b/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1
deleted file mode 100644
index dba57ac64a67..000000000000
--- a/external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1
+++ /dev/null
@@ -1,25 +0,0 @@
-From 584c9bcfed7295e5e0a9d5caafb32a5020b74300 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Mon, 12 Jan 2015 17:10:07 +0100
-Subject: [PATCH] lrf: compute color interpolation coeff. correctly
-
----
- src/lib/LRFCollector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/LRFCollector.cpp b/src/lib/LRFCollector.cpp
-index 1c02593..3fbee2e 100644
---- a/src/lib/LRFCollector.cpp
-+++ b/src/lib/LRFCollector.cpp
-@@ -50,7 +50,7 @@ const LRFColor combine(const LRFColor &fg, const LRFColor &bg)
- {
- assert(0 == bg.a);
-
-- const double a = fg.a / 255.0;
-+ const double a = 1 - fg.a / 255.0;
-
- const double r = (1 - a) * bg.r + a * fg.r;
- const double g = (1 - a) * bg.g + a * fg.g;
---
-2.1.0
-
diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk
index 476aac285b3a..bac09b699b12 100644
--- a/external/libebook/ExternalProject_libebook.mk
+++ b/external/libebook/ExternalProject_libebook.mk
@@ -18,12 +18,12 @@ $(eval $(call gb_ExternalProject_register_targets,libebook,\
$(eval $(call gb_ExternalProject_use_externals,libebook,\
boost_headers \
icu \
+ liblangtag \
libxml2 \
revenge \
zlib \
))
-# TODO: remove the generators/stream empty vars on libe-book update
$(call gb_ExternalProject_get_state_target,libebook,build) :
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
@@ -39,11 +39,11 @@ $(call gb_ExternalProject_get_state_target,libebook,build) :
--disable-werror \
--disable-weffc \
CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \
- CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) \
- -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
+ CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \
+ LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \
+ LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \
XML_CFLAGS="$(LIBXML_CFLAGS)" \
XML_LIBS="$(LIBXML_LIBS)" \
- REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
&& $(MAKE) \
)
diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 353a79f761ac..7b6977fe76ab 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -16,8 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libebook))
$(eval $(call gb_UnpackedTarball_add_patches,libebook, \
- external/libebook/ubsan.patch \
- external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 \
+ external/libebook/libebook-msvc.patch.1 \
))
ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/external/libebook/libebook-msvc.patch.1 b/external/libebook/libebook-msvc.patch.1
new file mode 100644
index 000000000000..d14b122f9575
--- /dev/null
+++ b/external/libebook/libebook-msvc.patch.1
@@ -0,0 +1,46 @@
+From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
+From: Miklos Vajna <vmiklos at collabora.co.uk>
+Date: Wed, 2 Aug 2017 14:53:36 +0200
+Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
+
+See e.g.
+<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>,
+on MSVC we can't depend on the value of __cplusplus, since that one is a
+too low value, even if everything else works fine.
+---
+ m4/ax_cxx_compile_stdcxx.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff -Naur a/configure b/configure
+--- a/configure 2017-08-02 14:50:09.000000000 +0200
++++ b/configure 2017-08-02 14:50:57.000000000 +0200
+@@ -16001,7 +16001,7 @@
+
+ #error "This is not a C++ compiler"
+
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+
+ #error "This is not a C++11 compiler"
+
+@@ -16314,7 +16314,7 @@
+
+ #error "This is not a C++ compiler"
+
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+
+ #error "This is not a C++11 compiler"
+
+@@ -16636,7 +16636,7 @@
+
+ #error "This is not a C++ compiler"
+
+-#elif __cplusplus < 201103L
++#elif __cplusplus < 201103L && !(defined _MSC_VER)
+
+ #error "This is not a C++11 compiler"
+
+--
+2.12.3
+
diff --git a/external/libebook/ubsan.patch b/external/libebook/ubsan.patch
deleted file mode 100644
index 0a3ead259ea7..000000000000
--- a/external/libebook/ubsan.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/LRFCollector.cpp
-+++ src/lib/LRFCollector.cpp
-@@ -50,7 +50,7 @@
- {
- assert(0 == bg.a);
-
-- const double a = fg.a;
-+ const double a = fg.a / 255.0;
-
- const double r = (1 - a) * bg.r + a * fg.r;
- const double g = (1 - a) * bg.g + a * fg.g;
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7f1367041b56..ad1b7cd06efe 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -200,10 +200,10 @@
"dest-filename": "external/tarballs/libcmis-0.5.1.tar.gz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2",
- "sha256": "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850",
+ "url": "https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz",
+ "sha256": "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9",
"type": "file",
- "dest-filename": "external/tarballs/libe-book-0.1.2.tar.bz2"
+ "dest-filename": "external/tarballs/libe-book-0.1.3.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz",
diff --git a/writerperfect/Library_wpftwriter.mk b/writerperfect/Library_wpftwriter.mk
index bf605e718dc1..c3ee3df7f87b 100644
--- a/writerperfect/Library_wpftwriter.mk
+++ b/writerperfect/Library_wpftwriter.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Library_use_externals,wpftwriter,\
icu_headers \
icui18n \
icuuc \
+ liblangtag \
libxml2 \
mwaw \
odfgen \
More information about the Libreoffice-commits
mailing list