upload libe-book 0.1.3

Change-Id: I8862e7f4d2dcb007295028b9ec7be04e58ebafd3
Reviewed-on: https://gerrit.libreoffice.org/47264
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>

5 files changed, 51 insertions, 42 deletions

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@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@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;