[arch-commits] Commit in apvlv/trunk (PKGBUILD gcc6.patch)

[Balló György]

    Date: Thursday, February 9, 2017 @ 19:07:49
  Author: bgyorgy
Revision: 211581

upgpkg: apvlv 0.1.5-4

Fix build, remove unused webkitgtk2 makedependency

Added:
  apvlv/trunk/gcc6.patch
Modified:
  apvlv/trunk/PKGBUILD

------------+
 PKGBUILD   |   21 +++++++++++++++------
 gcc6.patch |   12 ++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-09 19:03:59 UTC (rev 211580)
+++ PKGBUILD	2017-02-09 19:07:49 UTC (rev 211581)
@@ -7,23 +7,32 @@
 
 pkgname=apvlv
 pkgver=0.1.5
-pkgrel=3
+pkgrel=4
 pkgdesc='PDF/DJVU/TXT viewer which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/"
 license=('GPL2')
-depends=('gtk3' 'poppler-glib' 'djvulibre' 'desktop-file-utils')
-makedepends=('cmake' 'webkitgtk2')
-source=($pkgname-$pkgver.tar.gz::https://github.com/naihe2010/apvlv/archive/v$pkgver.tar.gz)
+depends=('gtk3' 'poppler-glib' 'djvulibre')
+makedepends=('cmake')
+source=($pkgname-$pkgver.tar.gz::https://github.com/naihe2010/apvlv/archive/v$pkgver.tar.gz
+        gcc6.patch)
 backup=('etc/apvlvrc')
-md5sums=('e200e1f8ad7e765399d08845d6de2c9b')
+md5sums=('e200e1f8ad7e765399d08845d6de2c9b'
+         'a0cb038ddb3c3e0c8a0e991f1deb2ad3')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix build
+  patch -Np1 -i ../gcc6.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 
   mkdir -p build
   cd build
-  
+
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
         -DAPVLV_WITH_DJVU=yes -DAPVLV_WITH_TXT=yes \
         -DAPVLV_WITH_UMD=no  ..

Added: gcc6.patch
===================================================================
--- gcc6.patch	                        (rev 0)
+++ gcc6.patch	2017-02-09 19:07:49 UTC (rev 211581)
@@ -0,0 +1,12 @@
+diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc
+--- apvlv-0.1.5.orig/src/ApvlvParams.cc	2015-01-10 15:04:24.000000000 +0100
++++ apvlv-0.1.5/src/ApvlvParams.cc	2017-02-09 20:03:08.655402750 +0100
+@@ -90,7 +90,7 @@
+ 	return false;
+       }
+ 
+-    while ((getline (os, str)) != NULL)
++    while (getline (os, str))
+       {
+ 	string argu, data, crap;
+ 	stringstream is (str);