[arch-commits] Commit in apvlv/repos (8 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Oct 5 03:20:18 UTC 2017
Date: Thursday, October 5, 2017 @ 03:20:16
Author: foutrelis
Revision: 261609
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
apvlv/repos/community-staging-i686/
apvlv/repos/community-staging-i686/PKGBUILD
(from rev 261608, apvlv/trunk/PKGBUILD)
apvlv/repos/community-staging-i686/gcc6.patch
(from rev 261608, apvlv/trunk/gcc6.patch)
apvlv/repos/community-staging-i686/gcc7.patch
(from rev 261608, apvlv/trunk/gcc7.patch)
apvlv/repos/community-staging-x86_64/
apvlv/repos/community-staging-x86_64/PKGBUILD
(from rev 261608, apvlv/trunk/PKGBUILD)
apvlv/repos/community-staging-x86_64/gcc6.patch
(from rev 261608, apvlv/trunk/gcc6.patch)
apvlv/repos/community-staging-x86_64/gcc7.patch
(from rev 261608, apvlv/trunk/gcc7.patch)
-------------------------------------+
community-staging-i686/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++
community-staging-i686/gcc6.patch | 12 ++++++++
community-staging-i686/gcc7.patch | 47 +++++++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++
community-staging-x86_64/gcc6.patch | 12 ++++++++
community-staging-x86_64/gcc7.patch | 47 +++++++++++++++++++++++++++++++
6 files changed, 218 insertions(+)
Copied: apvlv/repos/community-staging-i686/PKGBUILD (from rev 261608, apvlv/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-10-05 03:20:16 UTC (rev 261609)
@@ -0,0 +1,50 @@
+# $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=5
+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
+ gcc7.patch)
+backup=('etc/apvlvrc')
+md5sums=('e200e1f8ad7e765399d08845d6de2c9b'
+ 'a0cb038ddb3c3e0c8a0e991f1deb2ad3'
+ 'dd9713d10716c43dab7722d8b6107ea8')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix build
+ patch -Np1 -i ../gcc6.patch
+ patch -Np1 -i ../gcc7.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-staging-i686/gcc6.patch (from rev 261608, apvlv/trunk/gcc6.patch)
===================================================================
--- community-staging-i686/gcc6.patch (rev 0)
+++ community-staging-i686/gcc6.patch 2017-10-05 03:20:16 UTC (rev 261609)
@@ -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);
Copied: apvlv/repos/community-staging-i686/gcc7.patch (from rev 261608, apvlv/trunk/gcc7.patch)
===================================================================
--- community-staging-i686/gcc7.patch (rev 0)
+++ community-staging-i686/gcc7.patch 2017-10-05 03:20:16 UTC (rev 261609)
@@ -0,0 +1,47 @@
+From 9da539016cb6c317388020f4ebce1793077aa126 Mon Sep 17 00:00:00 2001
+From: Ryan Reno <ryan.reno at outlook.com>
+Date: Fri, 23 Jun 2017 21:56:22 -0700
+Subject: [PATCH] Changed comparions to remove compiler errors. In one case
+ changed to compare against a NULL pointer and another, the pointer was
+ dereferenced to compare against a char
+
+---
+ src/ApvlvCmds.cc | 4 ++--
+ src/ApvlvCore.cc | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ApvlvCmds.cc b/src/ApvlvCmds.cc
+index c7422f7..d4c40dd 100644
+--- a/src/ApvlvCmds.cc
++++ b/src/ApvlvCmds.cc
+@@ -192,7 +192,7 @@ namespace apvlv
+ const char *ApvlvCmd::append (const char *s)
+ {
+ size_t len;
+- char *e;
++ char *e = strchr((char *)s, '>');
+
+ len = strlen (s);
+
+@@ -200,7 +200,7 @@ namespace apvlv
+
+ if (len >= 4
+ && *s == '<'
+- && (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
++ && (*e != '\0' && *(s + 2) != '-'))
+ {
+ e++;
+ StringKeyMap::iterator it;
+diff --git a/src/ApvlvCore.cc b/src/ApvlvCore.cc
+index 672e5ef..e6e34f7 100644
+--- a/src/ApvlvCore.cc
++++ b/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 ()) == NULL)
+ {
+ debug ("core :%p is not needed, delete it\n", this);
+ delete this;
Copied: apvlv/repos/community-staging-x86_64/PKGBUILD (from rev 261608, apvlv/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-10-05 03:20:16 UTC (rev 261609)
@@ -0,0 +1,50 @@
+# $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=5
+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
+ gcc7.patch)
+backup=('etc/apvlvrc')
+md5sums=('e200e1f8ad7e765399d08845d6de2c9b'
+ 'a0cb038ddb3c3e0c8a0e991f1deb2ad3'
+ 'dd9713d10716c43dab7722d8b6107ea8')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Fix build
+ patch -Np1 -i ../gcc6.patch
+ patch -Np1 -i ../gcc7.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-staging-x86_64/gcc6.patch (from rev 261608, apvlv/trunk/gcc6.patch)
===================================================================
--- community-staging-x86_64/gcc6.patch (rev 0)
+++ community-staging-x86_64/gcc6.patch 2017-10-05 03:20:16 UTC (rev 261609)
@@ -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);
Copied: apvlv/repos/community-staging-x86_64/gcc7.patch (from rev 261608, apvlv/trunk/gcc7.patch)
===================================================================
--- community-staging-x86_64/gcc7.patch (rev 0)
+++ community-staging-x86_64/gcc7.patch 2017-10-05 03:20:16 UTC (rev 261609)
@@ -0,0 +1,47 @@
+From 9da539016cb6c317388020f4ebce1793077aa126 Mon Sep 17 00:00:00 2001
+From: Ryan Reno <ryan.reno at outlook.com>
+Date: Fri, 23 Jun 2017 21:56:22 -0700
+Subject: [PATCH] Changed comparions to remove compiler errors. In one case
+ changed to compare against a NULL pointer and another, the pointer was
+ dereferenced to compare against a char
+
+---
+ src/ApvlvCmds.cc | 4 ++--
+ src/ApvlvCore.cc | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ApvlvCmds.cc b/src/ApvlvCmds.cc
+index c7422f7..d4c40dd 100644
+--- a/src/ApvlvCmds.cc
++++ b/src/ApvlvCmds.cc
+@@ -192,7 +192,7 @@ namespace apvlv
+ const char *ApvlvCmd::append (const char *s)
+ {
+ size_t len;
+- char *e;
++ char *e = strchr((char *)s, '>');
+
+ len = strlen (s);
+
+@@ -200,7 +200,7 @@ namespace apvlv
+
+ if (len >= 4
+ && *s == '<'
+- && (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
++ && (*e != '\0' && *(s + 2) != '-'))
+ {
+ e++;
+ StringKeyMap::iterator it;
+diff --git a/src/ApvlvCore.cc b/src/ApvlvCore.cc
+index 672e5ef..e6e34f7 100644
+--- a/src/ApvlvCore.cc
++++ b/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 ()) == NULL)
+ {
+ debug ("core :%p is not needed, delete it\n", this);
+ delete this;
More information about the arch-commits
mailing list