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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Jan 7 09:06:59 UTC 2021


 external/libebook/UnpackedTarball_libebook.mk |    3 +++
 external/libebook/include.patch               |   10 ++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit a20a464bcfe6408ddd6c66ac43e9d25d3e530cd3
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jan 7 08:57:22 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jan 7 10:06:16 2021 +0100

    external/libebook: Missing include (for std::min)
    
    ...as reported now by various Windows builders after
    e0f1b5bd94550835c639efda4e4c9a801c78dbe9 "Upgrade external/boost to latest
    Boost 1.75.0"
    
    Change-Id: Ib1f4ea2ca05003b24347c7233bd06cef7d4c955f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108920
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk
index 4a85ee5093be..4a6dd2bce5ce 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,8 +13,11 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libebook))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,0))
+
 $(eval $(call gb_UnpackedTarball_add_patches,libebook, \
     external/libebook/libebook-no-icu-boolean.patch.1 \
+    external/libebook/include.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libebook/include.patch b/external/libebook/include.patch
new file mode 100644
index 000000000000..fe6d8bdbe33c
--- /dev/null
+++ b/external/libebook/include.patch
@@ -0,0 +1,10 @@
+--- src/lib/BBeBCollector.cpp
++++ src/lib/BBeBCollector.cpp
+@@ -7,6 +7,7 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
+ 
++#include <algorithm>
+ #include <unordered_map>
+ 
+ #include <librevenge/librevenge.h>


More information about the Libreoffice-commits mailing list