[arch-commits] Commit in apvlv/repos (6 files)

Balló György bgyorgy at archlinux.org
Thu Feb 9 19:07:56 UTC 2017


    Date: Thursday, February 9, 2017 @ 19:07:55
  Author: bgyorgy
Revision: 211582

archrelease: copy trunk to community-i686, community-x86_64

Added:
  apvlv/repos/community-i686/PKGBUILD
    (from rev 211581, apvlv/trunk/PKGBUILD)
  apvlv/repos/community-i686/gcc6.patch
    (from rev 211581, apvlv/trunk/gcc6.patch)
  apvlv/repos/community-x86_64/PKGBUILD
    (from rev 211581, apvlv/trunk/PKGBUILD)
  apvlv/repos/community-x86_64/gcc6.patch
    (from rev 211581, apvlv/trunk/gcc6.patch)
Deleted:
  apvlv/repos/community-i686/PKGBUILD
  apvlv/repos/community-x86_64/PKGBUILD

-----------------------------+
 /PKGBUILD                   |   94 ++++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD     |   38 ----------------
 community-i686/gcc6.patch   |   12 +++++
 community-x86_64/PKGBUILD   |   38 ----------------
 community-x86_64/gcc6.patch |   12 +++++
 5 files changed, 118 insertions(+), 76 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-02-09 19:07:49 UTC (rev 211581)
+++ community-i686/PKGBUILD	2017-02-09 19:07:55 UTC (rev 211582)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: tocer.deng <tocer.deng at gmail.com>
-
-pkgname=apvlv
-pkgver=0.1.5
-pkgrel=3
-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)
-backup=('etc/apvlvrc')
-md5sums=('e200e1f8ad7e765399d08845d6de2c9b')
-
-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  ..
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver/build
-
-  make DESTDIR="$pkgdir" install
-}

Copied: apvlv/repos/community-i686/PKGBUILD (from rev 211581, apvlv/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-02-09 19:07:55 UTC (rev 211582)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: tocer.deng <tocer.deng at gmail.com>
+
+pkgname=apvlv
+pkgver=0.1.5
+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')
+makedepends=('cmake')
+source=($pkgname-$pkgver.tar.gz::https://github.com/naihe2010/apvlv/archive/v$pkgver.tar.gz
+        gcc6.patch)
+backup=('etc/apvlvrc')
+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  ..
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver/build
+
+  make DESTDIR="$pkgdir" install
+}

Copied: apvlv/repos/community-i686/gcc6.patch (from rev 211581, apvlv/trunk/gcc6.patch)
===================================================================
--- community-i686/gcc6.patch	                        (rev 0)
+++ community-i686/gcc6.patch	2017-02-09 19:07:55 UTC (rev 211582)
@@ -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);

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-02-09 19:07:49 UTC (rev 211581)
+++ community-x86_64/PKGBUILD	2017-02-09 19:07:55 UTC (rev 211582)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: tocer.deng <tocer.deng at gmail.com>
-
-pkgname=apvlv
-pkgver=0.1.5
-pkgrel=3
-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)
-backup=('etc/apvlvrc')
-md5sums=('e200e1f8ad7e765399d08845d6de2c9b')
-
-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  ..
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver/build
-
-  make DESTDIR="$pkgdir" install
-}

Copied: apvlv/repos/community-x86_64/PKGBUILD (from rev 211581, apvlv/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-02-09 19:07:55 UTC (rev 211582)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: tocer.deng <tocer.deng at gmail.com>
+
+pkgname=apvlv
+pkgver=0.1.5
+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')
+makedepends=('cmake')
+source=($pkgname-$pkgver.tar.gz::https://github.com/naihe2010/apvlv/archive/v$pkgver.tar.gz
+        gcc6.patch)
+backup=('etc/apvlvrc')
+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  ..
+
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver/build
+
+  make DESTDIR="$pkgdir" install
+}

Copied: apvlv/repos/community-x86_64/gcc6.patch (from rev 211581, apvlv/trunk/gcc6.patch)
===================================================================
--- community-x86_64/gcc6.patch	                        (rev 0)
+++ community-x86_64/gcc6.patch	2017-02-09 19:07:55 UTC (rev 211582)
@@ -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);



More information about the arch-commits mailing list