[arch-commits] Commit in bookworm/trunk (PKGBUILD html2text.patch)

[Anatol Pomozov]

    Date: Friday, August 30, 2019 @ 15:36:08
  Author: anatolik
Revision: 505283

upgpkg: bookworm 1.1.2-1

FS#62670 remove html2text invalid parameter

Added:
  bookworm/trunk/html2text.patch
Modified:
  bookworm/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   25 +++++++++++++++++--------
 html2text.patch |   10 ++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-30 15:29:25 UTC (rev 505282)
+++ PKGBUILD	2019-08-30 15:36:08 UTC (rev 505283)
@@ -1,26 +1,35 @@
 # Contributor: ValHue <vhuelamo at gmail dot com>
 
 pkgname=bookworm
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 pkgdesc='A simple user centric eBook reader which displays multiple eBooks formats uniformly'
 url='https://babluboy.github.io/bookworm'
 arch=(x86_64)
 license=(GPL3)
-depends=(granite poppler-glib python unarchiver unzip webkit2gtk)
-makedepends=(cmake vala ninja)
-source=(bookworm-$pkgver.tar.gz::https://github.com/babluboy/bookworm/archive/$pkgver.tar.gz)
-sha256sums=('121030d3e315279e50bd18c08fee0c9ecfb2ccd284bcb9e35b048e61741fe857')
+depends=(granite poppler-glib python unarchiver unzip webkit2gtk python-html2text)
+makedepends=(meson vala ninja)
+source=(bookworm-$pkgver.tar.gz::https://github.com/babluboy/bookworm/archive/$pkgver.tar.gz
+	    html2text.patch)
+sha256sums=('6d27e55697debfa08f7cc15805413b74c94c55111cdf2d333b306228eccad824'
+            'a90f0753d54aa8f3b72816494928f8e9b72bf26fccd477adfa495e9e2c93dc42')
 
+prepare() {
+  cd bookworm-$pkgver
+  patch -p1 < ../html2text.patch
+  mkdir build
+}
+
 build() {
   cd bookworm-$pkgver
-  cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -G Ninja
+  meson build --prefix=/usr
+  cd build
   ninja
 }
 
 package() {
-  cd bookworm-$pkgver
+  cd bookworm-$pkgver/build
  
   DESTDIR="$pkgdir" ninja install
-  install -m644 -D LICENSE "$pkgdir"/usr/share/licenses/bookworm/LICENSE
+  install -m644 -D ../COPYING "$pkgdir"/usr/share/licenses/bookworm/COPYING
 }

Added: html2text.patch
===================================================================
--- html2text.patch	                        (rev 0)
+++ html2text.patch	2019-08-30 15:36:08 UTC (rev 505283)
@@ -0,0 +1,10 @@
+diff --git a/data/scripts/com.github.babluboy.bookworm.search.sh b/data/scripts/com.github.babluboy.bookworm.search.sh
+index 058f561..8dbd7ff 100644
+--- a/data/scripts/com.github.babluboy.bookworm.search.sh
++++ b/data/scripts/com.github.babluboy.bookworm.search.sh
+@@ -5,4 +5,4 @@
+ 
+ HTML_CONTENT_TO_BE_SEARCHED=$1
+ USER_SEARCH_TEXT=$2
+-html2text -utf8 "$HTML_CONTENT_TO_BE_SEARCHED"  | tr '\n' ' ' | grep -E -o -i  ".{0,50}$USER_SEARCH_TEXT.{0,50}"
++html2text "$HTML_CONTENT_TO_BE_SEARCHED"  | tr '\n' ' ' | grep -E -o -i  ".{0,50}$USER_SEARCH_TEXT.{0,50}"