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

2017-10-04 Thread Evangelos Foutras 
Date: Thursday, October 5, 2017 @ 03:19:59
  Author: foutrelis
Revision: 261608

poppler 0.60.0 rebuild

Modified:
  apvlv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-05 03:17:49 UTC (rev 261607)
+++ PKGBUILD2017-10-05 03:19:59 UTC (rev 261608)
@@ -7,7 +7,7 @@
 
 pkgname=apvlv
 pkgver=0.1.5
-pkgrel=4
+pkgrel=5
 pkgdesc='PDF/DJVU/TXT viewer which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/";

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

2017-10-04 Thread Evangelos Foutras 
Date: Wednesday, October 4, 2017 @ 23:18:53
  Author: foutrelis
Revision: 261596

Fix build with GCC 7

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

+
 PKGBUILD   |7 +--
 gcc7.patch |   47 +++
 2 files changed, 52 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-10-04 23:14:58 UTC (rev 261595)
+++ PKGBUILD2017-10-04 23:18:53 UTC (rev 261596)
@@ -15,10 +15,12 @@
 depends=('gtk3' 'poppler-glib' 'djvulibre')
 makedepends=('cmake')
 
source=($pkgname-$pkgver.tar.gz::https://github.com/naihe2010/apvlv/archive/v$pkgver.tar.gz
-gcc6.patch)
+gcc6.patch
+gcc7.patch)
 backup=('etc/apvlvrc')
 md5sums=('e200e1f8ad7e765399d08845d6de2c9b'
- 'a0cb038ddb3c3e0c8a0e991f1deb2ad3')
+ 'a0cb038ddb3c3e0c8a0e991f1deb2ad3'
+ 'dd9713d10716c43dab7722d8b6107ea8')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -25,6 +27,7 @@
 
   # Fix build
   patch -Np1 -i ../gcc6.patch
+  patch -Np1 -i ../gcc7.patch
 }
 
 build() {

Added: gcc7.patch
===
--- gcc7.patch  (rev 0)
+++ gcc7.patch  2017-10-04 23:18:53 UTC (rev 261596)
@@ -0,0 +1,47 @@
+From 9da539016cb6c317388020f4ebce1793077aa126 Mon Sep 17 00:00:00 2001
+From: Ryan Reno 
+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;

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

2017-02-09 Thread 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
===
--- PKGBUILD2017-02-09 19:03:59 UTC (rev 211580)
+++ PKGBUILD2017-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.cc2015-01-10 15:04:24.0 
+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);

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

2016-04-27 Thread Jonathan Steel 
Date: Wednesday, April 27, 2016 @ 17:46:45
  Author: jsteel
Revision: 172066

upgpkg: apvlv 0.1.5-3

Hooks (part 1)

Modified:
  apvlv/trunk/PKGBUILD
Deleted:
  apvlv/trunk/apvlv.install

---+
 PKGBUILD  |3 +--
 apvlv.install |7 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 15:43:36 UTC (rev 172065)
+++ PKGBUILD2016-04-27 15:46:45 UTC (rev 172066)
@@ -7,7 +7,7 @@
 
 pkgname=apvlv
 pkgver=0.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc='PDF/DJVU/TXT viewer which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/";
@@ -14,7 +14,6 @@
 license=('GPL2')
 depends=('gtk3' 'poppler-glib' 'djvulibre' 'desktop-file-utils')
 makedepends=('cmake' 'webkitgtk2')
-install=$pkgname.install
 
source=($pkgname-$pkgver.tar.gz::https://github.com/naihe2010/apvlv/archive/v$pkgver.tar.gz)
 backup=('etc/apvlvrc')
 md5sums=('e200e1f8ad7e765399d08845d6de2c9b')

Deleted: apvlv.install
===
--- apvlv.install   2016-04-27 15:43:36 UTC (rev 172065)
+++ apvlv.install   2016-04-27 15:46:45 UTC (rev 172066)
@@ -1,7 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  post_install
-}

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

2015-12-06 Thread Bartłomiej Piotrowski 
Date: Monday, December 7, 2015 @ 06:14:00
  Author: bpiotrowski
Revision: 149568

C++11 ABI rebuild

Modified:
  apvlv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-07 05:13:10 UTC (rev 149567)
+++ PKGBUILD2015-12-07 05:14:00 UTC (rev 149568)
@@ -7,7 +7,7 @@
 
 pkgname=apvlv
 pkgver=0.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc='PDF/DJVU/TXT viewer which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/";

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

2015-03-06 Thread Jonathan Steel 
Date: Friday, March 6, 2015 @ 19:49:16
  Author: jsteel
Revision: 128830

upgpkg: apvlv 0.1.5-1

Modified:
  apvlv/trunk/PKGBUILD
Deleted:
  apvlv/trunk/apvlv.desktop

---+
 PKGBUILD  |   25 ++---
 apvlv.desktop |   17 -
 2 files changed, 10 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-06 18:08:22 UTC (rev 128829)
+++ PKGBUILD2015-03-06 18:49:16 UTC (rev 128830)
@@ -1,5 +1,5 @@
 # $Id$
-# Maintainer:  Jonathan Steel 
+# Maintainer:  Jonathan Steel 
 # Contributor: Bartłomiej Piotrowski 
 # Contributor: Brad Fanella 
 # Contributor: Stefan Husmann 
@@ -6,23 +6,21 @@
 # Contributor: tocer.deng 
 
 pkgname=apvlv
-pkgver=0.1.4.20121023
-pkgrel=4
+pkgver=0.1.5
+pkgrel=1
 pkgdesc='PDF/DJVU/TXT viewer which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/";
-license=('GPL')
-depends=('gtk2' 'poppler-glib' 'djvulibre' 'desktop-file-utils')
+license=('GPL2')
+depends=('gtk3' 'poppler-glib' 'djvulibre' 'desktop-file-utils')
 makedepends=('cmake' 'webkitgtk2')
 install=$pkgname.install
-source=(https://sources.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
-$pkgname.desktop)
+source=($pkgname-$pkgver.tar.gz::https://github.com/naihe2010/apvlv/archive/v$pkgver.tar.gz)
 backup=('etc/apvlvrc')
-md5sums=('f222fc4b09b15358eb4e7f996ba810d6'
- '54478fecb54f36d1c44d8fdc233ddbac')
+md5sums=('e200e1f8ad7e765399d08845d6de2c9b')
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   mkdir -p build
   cd build
@@ -35,10 +33,7 @@
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver/build
+  cd $pkgname-$pkgver/build
 
-  make DESTDIR="$pkgdir"/ install
-
-  install -Dm644 "$srcdir"/$pkgname.desktop \
-"$pkgdir"/usr/share/applications/$pkgname.desktop
+  make DESTDIR="$pkgdir" install
 }

Deleted: apvlv.desktop
===
--- apvlv.desktop   2015-03-06 18:08:22 UTC (rev 128829)
+++ apvlv.desktop   2015-03-06 18:49:16 UTC (rev 128830)
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=apvlv
-Comment=A minimalistic document viewer
-Comment[de]=Ein minimalistischer Dokumenten-Betrachter
-Comment[fr]=Un visionneur de document minimaliste
-Comment[ru]=Минималистичный просмотрщик документов
-Comment[tr]=Minimalist bir belge görüntüleyicisi
-Comment[es_CL]=Un visor de documentos minimalista
-Comment[uk_UA]=Легкий переглядач документів
-Comment[it]=Un visualizzatore di documenti minimalista
-Comment[pl]=Minimalistyczna przeglądarka dokumentów
-Exec=apvlv %f
-Terminal=false
-Categories=Office;Viewer;
-MimeType=application/pdf;application/postscript;application/eps;application/x-eps;image/eps;image/x-eps;image/vnd.djvu;

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

2013-04-22 Thread Jonathan Steel 
Date: Monday, April 22, 2013 @ 21:31:34
  Author: jsteel
Revision: 88807

added backup variable

Modified:
  apvlv/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-22 19:13:17 UTC (rev 88806)
+++ PKGBUILD2013-04-22 19:31:34 UTC (rev 88807)
@@ -7,7 +7,7 @@
 
 pkgname=apvlv
 pkgver=0.1.4.20121023
-pkgrel=2
+pkgrel=3
 pkgdesc='A PDF Viewer, which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/";
@@ -17,6 +17,7 @@
 install=$pkgname.install
 
source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
 $pkgname.desktop)
+backup=(etc/apvlvrc)
 md5sums=('f222fc4b09b15358eb4e7f996ba810d6'
  '54478fecb54f36d1c44d8fdc233ddbac')

[arch-commits] Commit in apvlv/trunk (PKGBUILD apvlv.desktop apvlv.install)

2013-04-22 Thread Jonathan Steel 
Date: Monday, April 22, 2013 @ 21:12:47
  Author: jsteel
Revision: 88805

desktop and install file

Added:
  apvlv/trunk/apvlv.desktop
  apvlv/trunk/apvlv.install
Modified:
  apvlv/trunk/PKGBUILD

---+
 PKGBUILD  |   26 +-
 apvlv.desktop |   17 +
 apvlv.install |7 +++
 3 files changed, 41 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-22 18:07:32 UTC (rev 88804)
+++ PKGBUILD2013-04-22 19:12:47 UTC (rev 88805)
@@ -1,23 +1,27 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski 
+# Maintainer:  Jonathan Steel 
+# Contributor: Bartłomiej Piotrowski 
 # Contributor: Brad Fanella 
 # Contributor: Stefan Husmann 
 # Contributor: tocer.deng 
 
 pkgname=apvlv
 pkgver=0.1.4.20121023
-pkgrel=1
-pkgdesc='A PDF Viewer which behaves like Vim'
+pkgrel=2
+pkgdesc='A PDF Viewer, which behaves like Vim'
 arch=('i686' 'x86_64')
 url="http://naihe2010.github.com/apvlv/";
 license=('GPL')
-depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre')
+depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre' 'desktop-file-utils')
 makedepends=('cmake' 'libwebkit')
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('f222fc4b09b15358eb4e7f996ba810d6')
+install=$pkgname.install
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
+$pkgname.desktop)
+md5sums=('f222fc4b09b15358eb4e7f996ba810d6'
+ '54478fecb54f36d1c44d8fdc233ddbac')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir"/$pkgname-$pkgver
 
   mkdir -p build
   cd build
@@ -25,11 +29,15 @@
   cmake -DCMAKE_BUILD_TYPE=Release \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DAPVLV_WITH_UMD=no  ..
+
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/build
+  cd "$srcdir"/$pkgname-$pkgver/build
 
-  make DESTDIR=$pkgdir/ install
+  make DESTDIR="$pkgdir"/ install
+
+  install -Dm644 "$srcdir"/$pkgname.desktop \
+"$pkgdir"/usr/share/applications/$pkgname.desktop
 }

Added: apvlv.desktop
===
--- apvlv.desktop   (rev 0)
+++ apvlv.desktop   2013-04-22 19:12:47 UTC (rev 88805)
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=apvlv
+Comment=A minimalistic document viewer
+Comment[de]=Ein minimalistischer Dokumenten-Betrachter
+Comment[fr]=Un visionneur de document minimaliste
+Comment[ru]=Минималистичный просмотрщик документов
+Comment[tr]=Minimalist bir belge görüntüleyicisi
+Comment[es_CL]=Un visor de documentos minimalista
+Comment[uk_UA]=Легкий переглядач документів
+Comment[it]=Un visualizzatore di documenti minimalista
+Comment[pl]=Minimalistyczna przeglądarka dokumentów
+Exec=apvlv %f
+Terminal=false
+Categories=Office;Viewer;
+MimeType=application/pdf;application/postscript;application/eps;application/x-eps;image/eps;image/x-eps;image/vnd.djvu;

Added: apvlv.install
===
--- apvlv.install   (rev 0)
+++ apvlv.install   2013-04-22 19:12:47 UTC (rev 88805)
@@ -0,0 +1,7 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  post_install
+}