ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

upgrade to libe-book-0.1.4.tar.xz

Browse Source 
Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Change-Id: I3d79eae84d6ba44e4378a511b8c0cc28ff0ae116
Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/7295
Tested-by: Jenkins CPCI <releng@collaboraoffice.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit dcdfbf4dbca7a5bc99bb665c5fe0dd50fda3e24e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208286
Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
Caolán McNamara
2026-07-22 13:46:01 +02:00
committed by Xisco Fauli
parent b4912a455c
commit 6aeaee0253
6 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+2 -2
View File
@@ -85,8 +85,8 @@ CURL_TARBALL := curl-8.21.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
EBOOK_SHA256SUM := 7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
EBOOK_TARBALL := libe-book-0.1.3.tar.xz
EBOOK_SHA256SUM := 104b7e791b6632745898e9b6a0037b7540235771a4d8c3bde2c764466ad912f1
EBOOK_TARBALL := libe-book-0.1.4.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
external/libebook/ExternalProject_libebook.mk
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ $(eval $(call gb_ExternalProject_use_externals,libebook,\
$(call gb_ExternalProject_get_state_target,libebook,build) :
$(call gb_Trace_StartRange,libebook,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export PKG_CONFIG="" \
export PKG_CONFIG=true \
&& unset MSYS_NO_PATHCONV && MAKE=$(MAKE) $(gb_RUN_CONFIGURE) ./configure \
--with-pic \
--enable-static \
external/libebook/UnpackedTarball_libebook.mk
Vendored
-6
View File
@@ -15,10 +15,4 @@ $(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 \
external/libebook/enumarith.patch \
))
# vim: set noet sw=4 ts=4:
external/libebook/enumarith.patch
Vendored
-17
View File
@@ -1,17 +0,0 @@
--- src/lib/EBOOKDocument.cpp
+++ src/lib/EBOOKDocument.cpp
@@ -147,11 +147,11 @@
{
const char *const name = char_cast(xmlTextReaderConstLocalName(reader.get()));
const char *const uri = char_cast(xmlTextReaderConstNamespaceUri(reader.get()));
- if ((EBOOKHTMLToken::html | EBOOKHTMLToken::NS_html) == getHTMLTokenId(name, uri))
+ if ((+EBOOKHTMLToken::html | EBOOKHTMLToken::NS_html) == getHTMLTokenId(name, uri))
type = EBOOKDocument::TYPE_XHTML;
- else if ((EPubToken::container | EPubToken::NS_container) == getEPubTokenId(name, uri))
+ else if ((+EPubToken::container | EPubToken::NS_container) == getEPubTokenId(name, uri))
type = EBOOKDocument::TYPE_EPUB;
- else if ((EBOOKOPFToken::package | EBOOKOPFToken::NS_opf) == getOPFTokenId(name, uri))
+ else if ((+EBOOKOPFToken::package | EBOOKOPFToken::NS_opf) == getOPFTokenId(name, uri))
type = EBOOKDocument::TYPE_EPUB;
else if (EBOOKOPFToken::package == getOPFTokenId(name, uri))
type = EBOOKDocument::TYPE_OPENEBOOK;
external/libebook/include.patch
Vendored
-10
View File
@@ -1,10 +0,0 @@
--- 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>
external/libebook/libebook-no-icu-boolean.patch.1
Vendored
-12
View File
@@ -1,12 +0,0 @@
diff -ur libebook.org/src/lib/EBOOKCharsetConverter.cpp libebook/src/lib/EBOOKCharsetConverter.cpp
--- libebook.org/src/lib/EBOOKCharsetConverter.cpp 2018-01-01 12:16:28.000000000 +0100
+++ libebook/src/lib/EBOOKCharsetConverter.cpp 2020-11-16 21:19:46.699315299 +0100
@@ -124,7 +124,7 @@
m_converterToUTF8.get(), m_converterToUnicode.get(),
&outText, outText + out.size(), &inText, inText + length,
nullptr, nullptr, nullptr, nullptr,
- TRUE, TRUE, &status)
+ true, true, &status)
;
if (status==U_BUFFER_OVERFLOW_ERROR)
{