commit 304a55bc835c0865c12268b81f33a28b92ae7986
Author: Jan Palus <[email protected]>
Date: Tue Aug 10 19:19:38 2021 +0200
upstream patch to fix build with icu >= 68
icu68.patch | 25 +++++++++++++++++++++++++
libe-book.spec | 2 ++
2 files changed, 27 insertions(+)
---
diff --git a/libe-book.spec b/libe-book.spec
index b242d71..aaea988 100644
--- a/libe-book.spec
+++ b/libe-book.spec
@@ -13,6 +13,7 @@ Group: Libraries
Source0:
http://downloads.sourceforge.net/libebook/%{name}-%{version}.tar.xz
# Source0-md5: 2956f1c5e7950b0018979a132165da8b
Patch0: %{name}-missing.patch
+Patch1: icu68.patch
URL: http://libebook.sourceforge.net/
BuildRequires: boost-devel
BuildRequires: cppunit-devel
@@ -129,6 +130,7 @@ obsługiwane są HTML, tekst i format surowy.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export CXXFLAGS="%{rpmcxxflags} -Wno-unused-function"
diff --git a/icu68.patch b/icu68.patch
new file mode 100644
index 0000000..3e9146d
--- /dev/null
+++ b/icu68.patch
@@ -0,0 +1,25 @@
+From edc7a50a06f56992fe21a80afb4f20fbdc5654ed Mon Sep 17 00:00:00 2001
+From: David Tardon <[email protected]>
+Date: Thu, 20 May 2021 19:24:52 +0200
+Subject: [PATCH] fix build with ICU 68
+
+---
+ src/lib/EBOOKCharsetConverter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/EBOOKCharsetConverter.cpp
b/src/lib/EBOOKCharsetConverter.cpp
+index 0d85fa3..c9f8be0 100644
+--- a/src/lib/EBOOKCharsetConverter.cpp
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *const
in, const unsigned le
+ 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)
+ {
+--
+2.32.0
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libe-book.git/commitdiff/304a55bc835c0865c12268b81f33a28b92ae7986
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
