[Libreoffice-commits] core.git: download.lst external/libebook solenv/flatpak-manifest.in writerperfect/Library_wpftwriter.mk

2018-01-05 Thread David Tardon 
 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 86994e1c25bb5a2d0f97d17328457fa6dfd2f288
Author: David Tardon 
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 
Reviewed-by: David Tardon 

diff --git a/download.lst b/download.lst
index b98f31a8521b..6e2be6621236 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..
--- 
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 
-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 , const LRFColor 
)
- {
-   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)

[Libreoffice-commits] core.git: download.lst external/libebook

2014-02-10 Thread David Tardon 
 download.lst|4 -
 external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch |   30 
--
 external/libebook/UnpackedTarball_libebook.mk   |4 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 95c54daf9cc3054de1bdc52dd327908716fc4a8c
Author: David Tardon dtar...@redhat.com
Date:   Mon Feb 10 14:13:00 2014 +0100

upload new libe-book

Change-Id: I69e87ad57513c7349aa0abf38b6054583d367963

diff --git a/download.lst b/download.lst
index 60e01fc..19615f6 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
 export ABW_TARBALL := libabw-0.0.1.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
-EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
-export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
+EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
+export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
 ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
 export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
diff --git a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch 
b/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
deleted file mode 100644
index 21ab72b..000
--- a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 30021c75542a008ccf8814fa70d519f00bc69776 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
-Date: Thu, 28 Nov 2013 09:50:00 +
-Subject: [PATCH] Fix crash on abi2010-1.doc example
-

- src/lib/FB2Parser.cpp | 7 +--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
-index d258c09..3cd3e3c 100644
 a/src/lib/FB2Parser.cpp
-+++ b/src/lib/FB2Parser.cpp
-@@ -357,8 +357,11 @@ FB2XMLParserContext *processNode(FB2XMLParserContext 
*const context, const xmlTe
-   {
-   case XML_READER_TYPE_ELEMENT :
-   {
--const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
--const EBOOKToken *ns = 
getFB2Token(xmlTextReaderConstNamespaceUri(reader));
-+const xmlChar *name_str = xmlTextReaderConstLocalName(reader);
-+const xmlChar *ns_str = xmlTextReaderConstNamespaceUri(reader);
-+
-+const EBOOKToken *name = name_str ? getFB2Token(name_str) : 0;
-+const EBOOKToken *ns = ns_str ? getFB2Token(ns_str) : 0;
- 
- if (!name || !ns)
-   // TODO: unknown elements should not be skipped entirely, but
--- 
-1.8.3.1
-
diff --git a/external/libebook/UnpackedTarball_libebook.mk 
b/external/libebook/UnpackedTarball_libebook.mk
index 3cf21e6..7dfee2c 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,8 +13,4 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libebook,\
-external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch \
-))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits