[packages/libe-book] - updated to 0.1.3 - removed obsolete boost-1.59,css patches
qboosh
qboosh at pld-linux.org
Sat Dec 29 21:02:56 CET 2018
commit 73643fbcc0c126c19dd5f407dc3cee161145773e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Dec 29 21:07:42 2018 +0100
- updated to 0.1.3
- removed obsolete boost-1.59,css patches
boost-1.59.patch | 10 ----------
libe-book-css.patch | 28 ----------------------------
libe-book.spec | 16 +++++++---------
3 files changed, 7 insertions(+), 47 deletions(-)
---
diff --git a/libe-book.spec b/libe-book.spec
index d6fc4e8..f395d0b 100644
--- a/libe-book.spec
+++ b/libe-book.spec
@@ -5,15 +5,13 @@
Summary: Library and tools for reading and converting various non-HTML reflowable e-book formats
Summary(pl.UTF-8): Biblioteka i narzedzia do odczytu i konwersji różnych formatów e-booków
Name: libe-book
-Version: 0.1.2
-Release: 10
+Version: 0.1.3
+Release: 1
License: LGPL v2.1+ or MPL v2.0+
Group: Libraries
Source0: http://downloads.sourceforge.net/libebook/%{name}-%{version}.tar.xz
-# Source0-md5: 19d84f4a97aab32d350d1f47ea3da0b3
+# Source0-md5: 2956f1c5e7950b0018979a132165da8b
Patch0: %{name}-missing.patch
-Patch1: boost-1.59.patch
-Patch2: %{name}-css.patch
URL: http://libebook.sourceforge.net/
BuildRequires: boost-devel
BuildRequires: cppunit-devel
@@ -22,10 +20,11 @@ BuildRequires: gperf
BuildRequires: libCSS-devel >= 0.6.0
BuildRequires: libhubbub-devel >= 0.3.0
BuildRequires: libicu-devel
+BuildRequires: liblangtag-devel
BuildRequires: libmspack-devel
BuildRequires: libparserutils-devel
BuildRequires: librevenge-devel >= 0.0
-BuildRequires: libstdc++-devel
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libwapcaplet-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: pkgconfig >= 1:0.20
@@ -74,9 +73,10 @@ Requires: %{name} = %{version}-%{release}
Requires: libCSS-devel >= 0.6.0
Requires: libhubbub-devel >= 0.3.0
Requires: libicu-devel
+Requires: liblangtag-devel
Requires: libmspack-devel
Requires: librevenge-devel >= 0.0
-Requires: libstdc++-devel
+Requires: libstdc++-devel >= 6:4.7
Requires: libxml2-devel >= 2.0
Requires: zlib-devel
@@ -129,8 +129,6 @@ obsługiwane są HTML, tekst i format surowy.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
export CXXFLAGS="%{rpmcxxflags} -Wno-unused-function"
diff --git a/boost-1.59.patch b/boost-1.59.patch
deleted file mode 100644
index 6cddf04..0000000
--- a/boost-1.59.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libe-book-0.1.2/src/lib/Makefile.am~ 2014-12-31 09:32:41.000000000 +0100
-+++ libe-book-0.1.2/src/lib/Makefile.am 2015-11-17 08:45:38.235881735 +0100
-@@ -46,6 +46,7 @@
- $(XML_LIBS) \
- $(ICU_LIBS) \
- $(ZLIB_LIBS) \
-+ -lboost_system \
- @LIBEBOOK_WIN32_RESOURCE@
-
- if ENABLE_EXPERIMENTAL
diff --git a/libe-book-css.patch b/libe-book-css.patch
deleted file mode 100644
index af6e644..0000000
--- a/libe-book-css.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- libe-book-0.1.2/src/lib/XMLTreeWalker.cpp.orig 2014-12-31 09:00:16.000000000 +0100
-+++ libe-book-0.1.2/src/lib/XMLTreeWalker.cpp 2016-05-18 16:12:03.744754212 +0200
-@@ -318,7 +318,7 @@
- lwc_string *lang, bool *match);
-
- css_error css_node_presentational_hint(void *pw, void *node,
-- uint32_t property, css_hint *hint);
-+ uint32_t *nhints, css_hint **hints);
-
- css_error css_ua_default_for_property(void *pw, uint32_t property,
- css_hint *hint);
-@@ -1055,13 +1055,13 @@
- return CSS_OK;
- }
-
-- css_error css_node_presentational_hint(void *pw, void *const node, const uint32_t property, css_hint *const hint)
-+ css_error css_node_presentational_hint(void *pw, void *const node, uint32_t *nhints, css_hint **const hints)
- {
- // TODO: implement me
- (void) pw;
- (void) node;
-- (void) property;
-- (void) hint;
-+ (void) nhints;
-+ (void) hints;
-
- return CSS_PROPERTY_NOT_SET;
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libe-book.git/commitdiff/73643fbcc0c126c19dd5f407dc3cee161145773e
More information about the pld-cvs-commit
mailing list