Update to 6572184 (thanks menta).

2 files changed, 115 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec258e2f5657..3e708dc4c308 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed May 18 07:32:48 UTC 2016
+# Thu Feb 16 04:48:31 UTC 2017
 pkgbase = llpp
-	pkgdesc = Lightweight, fast and featureful PDF viewer based on MuPDF
-	pkgver = 22
-	pkgrel = 3
+	pkgdesc = A graphical PDF viewer which aims to superficially resemble less(1).
+	pkgver = 23
+	pkgrel = 1
 	url = http://repo.or.cz/w/llpp.git
 	arch = i686
 	arch = x86_64
@@ -20,24 +20,36 @@ pkgbase = llpp
 	depends = desktop-file-utils
 	depends = mesa
 	depends = libgl
-	optdepends = xsel: Text selection
-	optdepends = file: automatic file type recognition
-	optdepends = gzip: handling of MIME types 'application/x-{gzip,compress}'
-	optdepends = xz: handling of MIME type 'application/x-xz'
-	optdepends = bzip2: handling of MIME type 'application/x-bzip2'
-	optdepends = djvulibre: djvu conversion
-	optdepends = ghostscript: ps, dvi, and djvu conversion
-	optdepends = princexml: html conversion
-	optdepends = unoconv: conversion of office documents
-	optdepends = librsvg: preferred option for svg conversion
-	optdepends = inkscape: alternative option for svg conversion
-	optdepends = imagemagick: image conversion
-	optdepends = antiword: conversion of Microsoft Word (.doc) documents (option 2)
-	optdepends = zip: png and jpeg conversion
-	optdepends = texlive-core: dvi conversion
+	optdepends = xsel: text selection
+	optdepends = xclip: text selection
+	optdepends = sdcv: dictionary lookup
+	optdepends = rofi: dictionary lookup
+	optdepends = adobe-source-code-pro-fonts: recommended font for dictionary lookup presentation (any font can be used)
+	optdepends = wget: llppac fetch remote urls (preferred)
+	optdepends = curl: llppac fetch remote urls (alternative)
+	optdepends = file: llppac automatic file type recognition
+	optdepends = xz: llppac xz archives
+	optdepends = gzip: llppac gzip archives
+	optdepends = bzip2: llppac bzip2 archives
+	optdepends = zip: llppac png and jpeg conversion
+	optdepends = djvulibre: llppac djvu conversion
+	optdepends = ghostscript: llppac postscript, dvi, and djvu conversion
+	optdepends = princexml: llppac html conversion
+	optdepends = unoconv: llppac office document conversion
+	optdepends = antiword: llppac .doc conversion (alternative)
+	optdepends = inkscape: llppac svg conversion (preferred)
+	optdepends = librsvg: llppac svg conversion (alternative)
+	optdepends = imagemagick: llppac image conversion
+	optdepends = pango: llppac font conversion
+	optdepends = pandoc: llppac text conversion
+	optdepends = texlive-core: llppac dvi conversion
+	provides = llpp
+	conflicts = llpp-git
 	options = !strip
-	source = http://repo.or.cz/llpp.git/snapshot/1beb003ca0f4ed90fda2823cb07c2eb674fc3ca4.tar.gz
-	sha256sums = 92723eabd3521cb16d60b8dd6191ec8737240f35bf1fa9a0f82f32f8fd8f32a4
+	source = http://repo.or.cz/llpp.git/snapshot/6572184.tar.gz
+	md5sums = 6b0a9b711dff41437203ed555a04c237
+	sha1sums = bf6c1d15fafdd3ac62511e128beeedd5ce8fbca0
+	sha256sums = fd5c6b7b67b6044f3a5a3d0da0987066e3b7ab01adf2c6ed74719cb7d298fea7
 
 pkgname = llpp
 
diff --git a/PKGBUILD b/PKGBUILD
index e9d911016344..c400a57a7e0f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,100 @@
-# Maintainer: Daan van Rossum <d.r.vanrossum at gmx dot de>
 # Contributor: Bartlomiej Piotrowski <nospam@bpiotrowski.pl>
-
+# Contributor: Daan van Rossum <d.r.vanrossum at gmx dot de>
+# Contributor: menta <attila dot toth at ch dot bme dot hu>
+# Maintainer: aksr <aksr at t-com dot me>
 pkgname=llpp
-pkgver=22
-_pkgname=${pkgname}-1beb003
-pkgrel=3
-pkgdesc='Lightweight, fast and featureful PDF viewer based on MuPDF'
+pkgver=23
+_pkgver=6572184
+pkgrel=1
+pkgdesc='A graphical PDF viewer which aims to superficially resemble less(1).'
 arch=('i686' 'x86_64')
 url='http://repo.or.cz/w/llpp.git'
 license=('custom')
-depends=('openjpeg2' 'jbig2dec' 'freetype2' 'harfbuzz' 'libjpeg'
-	'openssl' 'zlib' 'desktop-file-utils' 'mesa' 'libgl')
+provides=('llpp')
+conflicts=('llpp-git')
+depends=('openjpeg2' 'jbig2dec' 'freetype2' 'harfbuzz' 'libjpeg' 'openssl' 'zlib' 'desktop-file-utils' 'mesa' 'libgl')
 makedepends=('ocaml' 'libmupdf')
-source=(http://repo.or.cz/llpp.git/snapshot/1beb003ca0f4ed90fda2823cb07c2eb674fc3ca4.tar.gz)
-sha256sums=('92723eabd3521cb16d60b8dd6191ec8737240f35bf1fa9a0f82f32f8fd8f32a4')
-
 optdepends=(
-  # llpp
-  'xsel: Text selection'
-  # llppac
-  'file: automatic file type recognition'
-  "gzip: handling of MIME types 'application/x-{gzip,compress}'"
-  "xz: handling of MIME type 'application/x-xz'"
-  "bzip2: handling of MIME type 'application/x-bzip2'"
-  'djvulibre: djvu conversion'
-  'ghostscript: ps, dvi, and djvu conversion'
-  'princexml: html conversion'
-  'unoconv: conversion of office documents'
-  'librsvg: preferred option for svg conversion'
-  'inkscape: alternative option for svg conversion'
-  'imagemagick: image conversion'
-  'antiword: conversion of Microsoft Word (.doc) documents (option 2)'
-  'zip: png and jpeg conversion'
-  'texlive-core: dvi conversion'
+  'xsel: text selection'
+  'xclip: text selection'
+  'sdcv: dictionary lookup'
+  'rofi: dictionary lookup'
+  'adobe-source-code-pro-fonts: recommended font for dictionary lookup presentation (any font can be used)'
+  'wget: llppac fetch remote urls (preferred)'
+  'curl: llppac fetch remote urls (alternative)'
+  'file: llppac automatic file type recognition'
+  'xz: llppac xz archives'
+  'gzip: llppac gzip archives'
+  'bzip2: llppac bzip2 archives'
+  'zip: llppac png and jpeg conversion'
+  'djvulibre: llppac djvu conversion'
+  'ghostscript: llppac postscript, dvi, and djvu conversion'
+  'princexml: llppac html conversion'
+  'unoconv: llppac office document conversion'
+  'antiword: llppac .doc conversion (alternative)'
+  'inkscape: llppac svg conversion (preferred)'
+  'librsvg: llppac svg conversion (alternative)'
+  'imagemagick: llppac image conversion'
+  'pango: llppac font conversion'
+  'pandoc: llppac text conversion'
+  'texlive-core: llppac dvi conversion'
 )
+source=("http://repo.or.cz/llpp.git/snapshot/${_pkgver}.tar.gz")
+md5sums=('6b0a9b711dff41437203ed555a04c237')
+sha1sums=('bf6c1d15fafdd3ac62511e128beeedd5ce8fbca0')
+sha256sums=('fd5c6b7b67b6044f3a5a3d0da0987066e3b7ab01adf2c6ed74719cb7d298fea7')
 options=('!strip')
 
-build() {
-  cd $_pkgname
+prepare() {
+  cd $srcdir/${pkgname}-${_pkgver}
   sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I /usr/include/freetype2+' build.sh
-  sed -i -e 's+-lmupdf +-lfreetype -lz -lharfbuzz -ljbig2dec -lopenjp2 -ljpeg -lmupdf +' build.sh
+  sed -i -e 's+-lmupdfthird+-lmupdfthird -lz -lfreetype -ljpeg -ljbig2dec -lopenjp2+' build.sh
   sed -i -e 's+-L\$srcdir/mupdf/build/native ++' build.sh
+
+  # Eliminate build errors
+  # ./link.c:1669:13: error: implicit declaration of function ‘fz_set_use_document_css’ [-Wimplicit-function-declaration]
+  sed -i -e 's+fz_set_use_document_css (state.ctx, usedoccss);+/* fz_set_use_document_css (state.ctx, usedoccss); */+' link.c
+
+  # /usr/lib/libharfbuzz.so.0: error adding symbols: DSO missing from command line
+  sed -i -e 's+-lcrypto+-lcrypto -lharfbuzz+' build.sh
+}
+
+build() {
+  cd $srcdir/${pkgname}-${_pkgver}
   sh build.sh build/
+  cd misc/completions/
+  make
 }
 
 package() {
-  cd $_pkgname
-  install -Dm755 build/llpp "$pkgdir"/usr/bin/llpp
-  install -Dm755 misc/llppac "$pkgdir"/usr/bin/llppac
+  cd $srcdir/${pkgname}-${_pkgver}
+  install -Dm755 build/llpp $pkgdir/usr/bin/llpp
+  install -Dm644 misc/llpp.desktop $pkgdir/usr/share/applications/llpp.desktop
+  install -Dm644 README $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+  # helper scripts
+  cd misc/
+  for i in dicx dllpp llppac gc.awk; do
+    install -Dm755 $i $pkgdir/usr/bin/$i
+  done
+
+  # custom key bindings: https://wiki.archlinux.org/index.php/Llpp#Custom_key_bindings
+  install -Dm644 keys.txt "$pkgdir/usr/share/$pkgname/keys.txt"
 
-  install -Dm0644 misc/llpp.desktop "$pkgdir"/usr/share/applications/llpp.desktop
-  install -Dm0644 README "$pkgdir"/usr/share/licenses/llpp/README
+  # CSS styles
+  for i in epub.css prince.css; do
+    install -Dm644 $i "$pkgdir/usr/share/$pkgname/$i"
+  done
+
+  # Wikipedia
+  install -Dm644 wikipedia/wiki2.css "$pkgdir/usr/share/$pkgname/wiki2.css"
+  install -Dm755 wikipedia/wpget "$pkgdir/usr/share/$pkgname/wpget"
+
+  # shell completion
+  cd completions/
+  install -Dm644 bash/llpp "$pkgdir/usr/share/bash-completion/completions/llpp"
+  install -Dm644 bash/llppac "$pkgdir/usr/share/bash-completion/completions/llppac"
+  install -Dm644 zsh/llpp "$pkgdir/usr/share/zsh/site-functions/_llpp"
+  install -Dm644 zsh/llppac "$pkgdir/usr/share/zsh/site-functions/_llppac"
 }
+