From 87c06ec08887d3398c517d5ce54602de41b65768 Mon Sep 17 00:00:00 2001
From: logen <logen@plagsup.attlocal.net>
Date: Sun, 20 Dec 2020 15:12:49 -0500
Subject: [PATCH] apvlv: update to 0.2.0

---
 .../fix-build-with-poppler-0.73.0.patch       | 11 ---------
 srcpkgs/apvlv/patches/fix-gcc6-getline.patch  | 11 ---------
 srcpkgs/apvlv/patches/fix-gcc7-ftbfs.patch    | 23 -------------------
 srcpkgs/apvlv/template                        | 10 ++++----
 4 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 srcpkgs/apvlv/patches/fix-build-with-poppler-0.73.0.patch
 delete mode 100644 srcpkgs/apvlv/patches/fix-gcc6-getline.patch
 delete mode 100644 srcpkgs/apvlv/patches/fix-gcc7-ftbfs.patch

diff --git a/srcpkgs/apvlv/patches/fix-build-with-poppler-0.73.0.patch b/srcpkgs/apvlv/patches/fix-build-with-poppler-0.73.0.patch
deleted file mode 100644
index 773a297ceaa..00000000000
--- a/srcpkgs/apvlv/patches/fix-build-with-poppler-0.73.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ApvlvPdf.cc
-+++ src/ApvlvPdf.cc
-@@ -29,7 +29,7 @@
- #include "ApvlvPdf.h"
-
- #ifndef POPPLER_WITH_GDK
--#include <goo/gtypes.h>
-+#include <goo/gfile.h>
-
- static void
- copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
diff --git a/srcpkgs/apvlv/patches/fix-gcc6-getline.patch b/srcpkgs/apvlv/patches/fix-gcc6-getline.patch
deleted file mode 100644
index 66dae781332..00000000000
--- a/srcpkgs/apvlv/patches/fix-gcc6-getline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ApvlvParams.cc	2015-01-10 15:04:24.000000000 +0100
-+++ src/ApvlvParams.cc	2016-10-04 00:06:58.187468048 +0200
-@@ -90,7 +90,7 @@
- 	return false;
-       }
- 
--    while ((getline (os, str)) != NULL)
-+    while (getline (os, str))
-       {
- 	string argu, data, crap;
- 	stringstream is (str);
diff --git a/srcpkgs/apvlv/patches/fix-gcc7-ftbfs.patch b/srcpkgs/apvlv/patches/fix-gcc7-ftbfs.patch
deleted file mode 100644
index 464ea258368..00000000000
--- a/srcpkgs/apvlv/patches/fix-gcc7-ftbfs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/ApvlvCmds.cc
-+++ src/ApvlvCmds.cc
-@@ -200,7 +200,7 @@ namespace apvlv
- 
-     if (len >= 4
- 	&& *s == '<'
--	&& (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
-+	&& (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
-       {
- 	e++;
- 	StringKeyMap::iterator it;
---- src/ApvlvCore.cc
-+++ src/ApvlvCore.cc
-@@ -90,7 +90,7 @@ namespace apvlv
-   {
-     mInuse = use;
- 
--    if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
-+    if (mInuse == false && !gView->hasloaded (filename (), type ()))
-       {
- 	debug ("core :%p is not needed, delete it\n", this);
- 	delete this;
-
diff --git a/srcpkgs/apvlv/template b/srcpkgs/apvlv/template
index 9fd8927487c..8d343dbe335 100644
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@@ -1,16 +1,16 @@
 # Template file for 'apvlv'
 pkgname=apvlv
-version=0.1.5
-revision=8
+version=0.2.0
+revision=1
 build_style=cmake
 configure_args="-DAPVLV_WITH_UMD=no -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes"
 hostmakedepends="pkg-config"
-makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel"
+makedepends="gtk+3-devel poppler-glib-devel djvulibre-devel webkit2gtk-devel ebook-tools-devel"
 depends="desktop-file-utils"
 short_desc="Vim-like PDF/DJVU/TXT viewer"
 maintainer="Logen K <logen@sudotask.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://naihe2010.github.io/apvlv/"
 distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
-checksum=dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a
+checksum=a4a2f42a7e42715a21d2356def3ed93c180c6ae41128580addee42835e5374c2
 replaces="apvlv-git>=0"