Merge branch 'master' of vparabola:abslibre

1 files changed, 31 insertions, 25 deletions

diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index 626e653f2..4dbf93b6f 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -1,53 +1,59 @@
-# 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')
 makedepends=('pkgconfig')
-provides=('epdfview')
+provides=("epdfview=$pkgver")
 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
 }