epdfview-libre-0.1.8-5: updating revision

* give patches more meaningful names
* split prepare() function
* update maintainer information

5 files changed, 107 insertions, 37 deletions

diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 626e653f2..5a5066950 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -1,16 +1,18 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $
-# Maintainer: schuay <jakob.gruber@gmail.com>
+# $Id: PKGBUILD 105182 2014-02-02 12:39:48Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer:  Kyle Keen <keenerd@gmail.com>
+# Contributor: schuay <jakob.gruber@gmail.com>
 # Contributor: Tom K <tomk@runbox.com>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
 
 pkgname=epdfview-libre
 _pkgname=epdfview
 pkgver=0.1.8
-pkgrel=4
-pkgdesc="A free lightweight PDF document viewer."
-url="http://www.emma-soft.com/projects/epdfview/"
+pkgrel=5
+pkgdesc='Lightweight PDF document viewer, without nonfree suggestions'
+url='http://freecode.com/projects/epdfview'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2' 'xdg-utils')
@@ -19,35 +21,39 @@ provides=('epdfview')
 conflicts=('epdfview')
 replaces=('epdfview')
 install='epdfview.install'
-source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2"
-        "${_pkgname}.desktop.patch"
-        "glib2_headers.patch"
-        "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch")
+source=(ftp://ftp.slackware.com/.1/blfs/conglomeration/epdfview/$_pkgname-$pkgver.tar.bz2
+        epdfview-0.1.8-swap-the-blue-and-red-channel.patch
+        epdfview-0.1.8-glib2-headers.patch
+        epdfview-0.1.8-modern-cups.patch)
 md5sums=('e50285b01612169b2594fea375f53ae4'
-         'fbf22bbabdbb7544db615ac5775d57e2'
-         '41b30f53f20472cbc2fcd4eae161125e'
-         '7f9ea101a41f5b4e999fd024f423d41f')
+         '7f9ea101a41f5b4e999fd024f423d41f'
+         '2fffa9c7cd4c5f0744803591c2f162a3'
+         '5c2cf5612d2a7dfe6cf005b94aeb5ada')
 
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch"
-  patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch"
-  patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116
+prepare() {
+  cd $_pkgname-$pkgver
+  sed -i 's/icon_epdfview-48/epdfview/' data/epdfview.desktop
 
   # Use xdg-open as default browser.
   sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx
 
+  patch -p1 -i ../epdfview-0.1.8-swap-the-blue-and-red-channel.patch
+  patch -p1 -i ../epdfview-0.1.8-glib2-headers.patch # FS#30116
+  patch -p1 -i ../epdfview-0.1.8-modern-cups.patch # FS#32511
+}
+
+build() {
+  cd $_pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
   for size in 24 32 48; do
-      install -Dm644 data/icon_${_pkgname}-${size}.png \
-          "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png"
+    install -Dm644 data/icon_$_pkgname-$size.png \
+      "$pkgdir"/usr/share/icons/hicolor/${size}x${size}/apps/$_pkgname.png
   done
 }
diff --git a/libre/epdfview-libre/glib2_headers.patch b/libre/epdfview-libre/epdfview-0.1.8-glib2-headers.patch
index b5bc5c211..e9f0983b5 100644
--- a/libre/epdfview-libre/glib2_headers.patch
+++ b/libre/epdfview-libre/epdfview-0.1.8-glib2-headers.patch
@@ -5,8 +5,9 @@ index c142a7a..58fcf2e 100644
 @@ -18,7 +18,7 @@
  #if !defined (__STOCK_ICONS_H__)
  #define __STOCK_ICONS_H__
-
+ 
 -#include <glib/gmacros.h>
 +#include <glib.h>
-
+ 
  G_BEGIN_DECLS
+ 
diff --git a/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch b/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch
new file mode 100644
index 000000000..64988789f
--- /dev/null
+++ b/libre/epdfview-libre/epdfview-0.1.8-modern-cups.patch
@@ -0,0 +1,74 @@
+diff -Naur epdfview-0.1.8.orig/src/PrintPter.cxx epdfview-0.1.8/src/PrintPter.cxx
+--- epdfview-0.1.8.orig/src/PrintPter.cxx	2011-05-28 11:25:01.000000000 +0100
++++ epdfview-0.1.8/src/PrintPter.cxx	2012-08-22 20:11:46.362436859 +0100
+@@ -22,6 +22,40 @@
+ #include <locale.h>
+ #include "epdfview.h"
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++inline int ippGetInteger (ipp_attribute_t *attr, int element)
++{
++    return (attr->values[element].integer);
++}
++
++inline const char * ippGetString (ipp_attribute_t *attr,
++                                  int             element,
++                                  const char      **language /*UNUSED*/)
++{
++    return (attr->values[element].string.text);
++}
++
++inline int ippSetOperation (ipp_t *ipp, ipp_op_t op)
++{
++  if (!ipp)
++    return (0);
++  ipp->request.op.operation_id = op;
++  return (1);
++}
++
++inline int ippSetRequestId (ipp_t *ipp, int request_id)
++{
++    if (!ipp)
++        return (0);
++    ipp->request.any.request_id = request_id;
++    return (1);
++}
++#endif
++
+ using namespace ePDFView;
+ 
+ // Structures
+@@ -380,8 +414,8 @@
+ 
+     ipp_t *request = ippNew ();
+ 
+-    request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+-    request->request.op.request_id = 1;
++    ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
++    ippSetRequestId(request, 1);
+ 
+     ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, "utf-8");
+@@ -403,7 +437,7 @@
+             ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO);
+         if ( NULL != state )
+         {
+-            switch (state->values[0].integer)
++            switch (ippGetInteger (state, 0))
+             {
+                 case IPP_PRINTER_IDLE:
+                     attributes->state = g_strdup (_("Idle"));
+@@ -425,7 +459,7 @@
+             ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO);
+         if ( NULL != location )
+         {
+-            attributes->location = g_strdup (location->values[0].string.text);
++            attributes->location = g_strdup (ippGetString (location, 0, NULL));
+         }
+ 
+         ippDelete (answer);
+
diff --git a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/libre/epdfview-libre/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
index e077a15cf..e077a15cf 100644
--- a/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch
+++ b/libre/epdfview-libre/epdfview-0.1.8-swap-the-blue-and-red-channel.patch
diff --git a/libre/epdfview-libre/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch
deleted file mode 100644
index d86fc3088..000000000
--- a/libre/epdfview-libre/epdfview.desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/epdfview.desktop.bak	2009-04-05 16:55:56.000000000 -0700
-+++ data/epdfview.desktop	2009-04-05 16:56:33.000000000 -0700
-@@ -7,7 +7,7 @@
- GenericName=PDF Viewer
- GenericName[ca]=Visor PDF
- GenericName[es]=Visor PDF
--Icon=icon_epdfview-48
-+Icon=epdfview
- Name=ePDFViewer
- Name[ca]=ePDFViewer
- Name[es]=ePDFViewer