Mon May 28 00:02:35 UTC 2012

2 files changed, 77 insertions, 6 deletions

diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index a1376c92c..40fe354a8 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 58479 2011-11-13 13:51:40Z jelle $
+# $Id: PKGBUILD 71280 2012-05-26 07:55:10Z pschmitz $
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
 
 pkgname=pdf2djvu
-pkgver=0.7.11
-pkgrel=3
+pkgver=0.7.12
+pkgrel=1
 pkgdesc="Creates DjVu files from PDF files"
 arch=('i686' 'x86_64')
 url="http://pdf2djvu.googlecode.com"
 license=('GPL')
 depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs')
 makedepends=('pstreams')
-source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz")
-md5sums=('cdc0cbb46512aaf7109d6ebc7aef1a7a')
+source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz"
+	"poppler-0.20.patch")
+md5sums=('4fd56c0763b56b4081fc9c85be16d9d7'
+         '9f9c5b098a3a13256beac04553ee67c3')
 
 build() {
     cd ${srcdir}/${pkgname}-${pkgver}
+    patch -p1 <$srcdir/poppler-0.20.patch
     ./configure --prefix=/usr
     make
 }
@@ -25,4 +28,3 @@ package() {
     make install DESTDIR=${pkgdir}
     install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
 }
-md5sums=('37c3d5a31c155bc65a39912da4c6bce1')
diff --git a/community/pdf2djvu/poppler-0.20.patch b/community/pdf2djvu/poppler-0.20.patch
new file mode 100644
index 000000000..36d23f73a
--- /dev/null
+++ b/community/pdf2djvu/poppler-0.20.patch
@@ -0,0 +1,69 @@
+diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure
+--- pdf2djvu-0.7.12/configure	2012-01-22 03:17:01.000000000 +0400
++++ pdf2djvu-0.7.12.my/configure	2012-05-17 20:44:06.000000000 +0400
+@@ -6653,7 +6653,7 @@
+ 
+ if test "$GXX" = yes
+ then
+-  CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual"
++  CXXFLAGS="$CXXFLAGS "
+ fi
+ 
+ # Output files
+diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac
+--- pdf2djvu-0.7.12/configure.ac	2012-01-22 03:16:50.000000000 +0400
++++ pdf2djvu-0.7.12.my/configure.ac	2012-05-17 20:43:37.000000000 +0400
+@@ -225,7 +225,7 @@
+ AX_CXXFLAGS_WARN_ALL(CXXFLAGS)
+ if test "$GXX" = yes
+ then
+-  CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual"
++  CXXFLAGS="$CXXFLAGS "
+ fi
+ 
+ # Output files
+diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc
+--- pdf2djvu-0.7.12/pdf-backend.cc	2012-01-22 03:16:50.000000000 +0400
++++ pdf2djvu-0.7.12.my/pdf-backend.cc	2012-05-17 20:47:24.000000000 +0400
+@@ -32,10 +32,10 @@
+  * ======================
+  */
+ 
+-static void poppler_error_handler(int pos, char *message, va_list args)
++static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message)
+ {
+   std::string format;
+-  std::string expanded_message = string_vprintf(message, args);
++  std::string expanded_message = message;
+   const char *c_message = expanded_message.c_str();
+   if (pos >= 0)
+   {
+@@ -61,7 +61,7 @@
+   Cwd cwd(argv0_dir_name);
+ #endif
+   globalParams = new GlobalParams();
+-  setErrorFunction(poppler_error_handler);
++  setErrorCallback(poppler_error_handler, 0);
+ }
+ 
+ void pdf::Environment::set_antialias(bool value)
+diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc
+--- pdf2djvu-0.7.12/pdf2djvu.cc	2012-01-22 03:16:50.000000000 +0400
++++ pdf2djvu-0.7.12.my/pdf2djvu.cc	2012-05-17 20:55:07.000000000 +0400
+@@ -1387,13 +1387,13 @@
+         debug(0)++;
+       }
+       out1.reset(new pdf::Renderer(paper_color, config.monochrome));
+-      out1->startDoc(doc->getXRef());
++      out1->startDoc((PDFDoc*)doc->getXRef());
+       outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
+-      outm->startDoc(doc->getXRef());
++      outm->startDoc((PDFDoc*)doc->getXRef());
+       if (!config.monochrome)
+       {
+         outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files));
+-        outs->startDoc(doc->getXRef());
++        outs->startDoc((PDFDoc*)doc->getXRef());
+       }
+     }
+     assert(doc.get() != NULL);