aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Postnikov <apostnikov@gmail.com>2021-08-14 10:43:52 +0300
committerAndy Postnikov <apostnikov@gmail.com>2021-08-14 10:55:09 +0300
commit2099c9b7766fbb7a3da58519d41fbbd5830969d9 (patch)
treeca4cd0368a5f77f1832fb4f093760a9666eaf0aa
parentd01249f5d0f5907e353c46ebdcd6d8a1a4e8c414 (diff)
downloadaports-2099c9b7766fbb7a3da58519d41fbbd5830969d9.tar.gz
aports-2099c9b7766fbb7a3da58519d41fbbd5830969d9.tar.bz2
aports-2099c9b7766fbb7a3da58519d41fbbd5830969d9.tar.xz
community/libe-book: add patch for icu-68 and improve
-rw-r--r--community/libe-book/APKBUILD16
-rw-r--r--community/libe-book/fix-icu68.patch13
2 files changed, 21 insertions, 8 deletions
diff --git a/community/libe-book/APKBUILD b/community/libe-book/APKBUILD
index 2264be374b..446c28b51a 100644
--- a/community/libe-book/APKBUILD
+++ b/community/libe-book/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=libe-book
pkgver=0.1.3
-pkgrel=10
+pkgrel=11
pkgdesc="Import filter and tools for various ebook formats"
url="https://sourceforge.net/projects/libebook/"
arch="all"
@@ -10,9 +10,9 @@ license="MPL-2.0"
depends_dev="boost-dev icu-dev librevenge-dev libxml2-dev zlib-dev liblangtag-dev"
makedepends="$depends_dev doxygen gperf"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="https://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2"
-
-builddir="$srcdir/$pkgname-$pkgver"
+source="https://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2
+ fix-icu68.patch
+ "
prepare() {
default_prepare
@@ -20,7 +20,6 @@ prepare() {
}
build() {
- cd "$builddir"
# boost-1.59
export CPPFLAGS=-DBOOST_ERROR_CODE_HEADER_ONLY
./configure \
@@ -36,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -50,4 +47,7 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
}
-sha512sums="9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21 libe-book-0.1.3.tar.bz2"
+sha512sums="
+9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21 libe-book-0.1.3.tar.bz2
+4a8d8b3a8b36b2ebf0b7f6173711fae367d122d4e08cd7004c1e65bb29d0636e3e9a3b3e6974ef73132eaad3f79ccb454572f97482e1f7162d8e0b3a01880ba2 fix-icu68.patch
+"
diff --git a/community/libe-book/fix-icu68.patch b/community/libe-book/fix-icu68.patch
new file mode 100644
index 0000000000..c6d3e2193e
--- /dev/null
+++ b/community/libe-book/fix-icu68.patch
@@ -0,0 +1,13 @@
+Subject: from https://sourceforge.net/p/libebook/code/ci/edc7a50a06f56992fe21a80afb4f20fbdc5654ed/
+
+--- a/src/lib/EBOOKCharsetConverter.cpp
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -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)
+ {