[arch-commits] Commit in pdf2djvu/trunk (PKGBUILD pdf2djvu-poppler-0.71.patch)

[Evangelos Foutras]

    Date: Thursday, December 13, 2018 @ 17:01:45
  Author: foutrelis
Revision: 416041

Bump to 0.9.11; prepare for poppler 0.72.0 rebuild

Modified:
  pdf2djvu/trunk/PKGBUILD
Deleted:
  pdf2djvu/trunk/pdf2djvu-poppler-0.71.patch

-----------------------------+
 PKGBUILD                    |   18 +++++++-----------
 pdf2djvu-poppler-0.71.patch |   11 -----------
 2 files changed, 7 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-13 16:31:41 UTC (rev 416040)
+++ PKGBUILD	2018-12-13 17:01:45 UTC (rev 416041)
@@ -2,8 +2,8 @@
 # Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
 
 pkgname=pdf2djvu
-pkgver=0.9.10
-pkgrel=3
+pkgver=0.9.11
+pkgrel=0
 pkgdesc="Creates DjVu files from PDF files"
 arch=('x86_64')
 url="http://jwilk.net/software/pdf2djvu"
@@ -11,18 +11,15 @@
 depends=('poppler' 'djvulibre' 'gcc-libs' 'graphicsmagick' 'exiv2')
 makedepends=('python2-nose' 'ttf-liberation')
 source=(https://github.com/jwilk/pdf2djvu/releases/download/$pkgver/pdf2djvu-$pkgver.tar.xz{,.asc}
-        pdf2djvu-poppler-0.69.0.patch::https://github.com/jwilk/pdf2djvu/commit/2a82de9b1d.patch
-        pdf2djvu-poppler-0.71.patch)
-sha256sums=('76479a86fdb6457ffc415e79561e9ea3a4027f1faffb9080445873b3c97bdb08'
+        pdf2djvu-poppler-0.72.0.patch::https://github.com/jwilk/pdf2djvu/commit/82699eee6b.patch)
+sha256sums=('6deb3d0f109875a5621b8d232e15e5496e56794a095b1e6dd8b1624d4bbd4cc3'
             'SKIP'
-            'f5a7c87cd38403f88655476d5c325e6b527b85e6fafce393ad6e9a6534803d8f'
-            'e6096b771fd8dc4d15603417a6593f60976d077e65f44f17781543dc3104cf70')
+            'cc5ef76568fdd201586fa6e0b8e8e386628972ad75a597ea0790bb97718eef87')
 validpgpkeys=('CDB5A1243ACDB63009AD07212D4EB3A6015475F5')
 
 prepare() {
         cd ${pkgname}-${pkgver}
-        patch -Np1 -i ../pdf2djvu-poppler-0.69.0.patch
-        patch -p1 -i ../pdf2djvu-poppler-0.71.patch # fix build with poppler 0.71
+        patch -Np1 -i ../pdf2djvu-poppler-0.72.0.patch
 }
 
 build() {
@@ -35,8 +32,7 @@
 check() {
     cd ${pkgname}-${pkgver}
 
-    sed -i 's/nosetests/nosetests2/' tests/Makefile
-    make test
+    make PYTHON=python2 test
 }
 
 package() {

Deleted: pdf2djvu-poppler-0.71.patch
===================================================================
--- pdf2djvu-poppler-0.71.patch	2018-12-13 16:31:41 UTC (rev 416040)
+++ pdf2djvu-poppler-0.71.patch	2018-12-13 17:01:45 UTC (rev 416041)
@@ -1,11 +0,0 @@
---- pdf2djvu-0.9.9/pdf-backend.hh.orig	2018-11-01 21:56:45.163962119 +0000
-+++ pdf2djvu-0.9.9/pdf-backend.hh	2018-11-01 21:57:04.084011561 +0000
-@@ -81,7 +81,7 @@
-   typedef ::Dict Dict;
-   typedef ::Catalog Catalog;
-   typedef ::GooString String;
--  typedef ::GBool Bool;
-+  typedef bool Bool;
-   typedef ::Goffset Offset;
- 
- /* type definitions — annotations