For the moment keep it to 6572184. (thanks menta)

2 files changed, 92 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8987ccfa383f..88fa3d6043b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jan 11 17:23:40 UTC 2016
+# Thu Feb 16 04:59:01 UTC 2017
 pkgbase = llpp-git
-	pkgdesc = Fast, featureful PDF viewer based on MuPDF.
-	pkgver = 22.r71.g2bf99be
+	pkgdesc = A graphical PDF viewer which aims to superficially resemble less(1).
+	pkgver = 25.r72.g6572184
 	pkgrel = 1
 	url = http://repo.or.cz/w/llpp.git
 	install = llpp.install
@@ -10,8 +10,9 @@ pkgbase = llpp-git
 	arch = x86_64
 	license = custom
 	makedepends = git
+	makedepends = libmupdf
 	makedepends = mupdf>=1.7
-	makedepends = ocaml>=4.02
+	makedepends = ocaml>=4.04
 	depends = mupdf
 	depends = freetype2
 	depends = jbig2dec
@@ -20,22 +21,33 @@ pkgbase = llpp-git
 	depends = libjpeg-turbo
 	depends = glu
 	depends = desktop-file-utils
-	optdepends = xsel: Text selection
-	optdepends = file: llppac file type recognition
-	optdepends = gzip: llppac gzip archives
+	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 = bzip2: llpac bzip2 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 = librsvg: llppac svg conversion (preferred)
-	optdepends = inkscape: llppac svg conversion (alternative)
+	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
 	options = !strip
-	source = git://repo.or.cz/llpp.git
+	source = llpp-git::git+git://repo.or.cz/llpp.git#commit=6572184
 	sha256sums = SKIP
 
 pkgname = llpp-git
diff --git a/PKGBUILD b/PKGBUILD
index 008e89ee23f9..3b7cf17ca081 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,12 @@
 # Contributor: Earnest
 # Contributor: Attila Toth <menta>
 # Contributor: Flu
-
+# Contributor: menta <attila dot toth at ch dot bme dot hu>
+# Maintainer: aksr <aksr at t-com dot me>
 pkgname=llpp-git
-pkgver=22.r71.g2bf99be
+pkgver=25.r72.g6572184
 pkgrel=1
-pkgdesc='Fast, featureful PDF viewer based on MuPDF.'
+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')
@@ -16,44 +17,93 @@ provides=('llpp')
 conflicts=('llpp')
 depends=('mupdf' 'freetype2' 'jbig2dec' 'openjpeg2'
          'libgl' 'libjpeg-turbo' 'glu' 'desktop-file-utils')
-makedepends=('git' 'mupdf>=1.7' 'ocaml>=4.02')
-source=('git://repo.or.cz/llpp.git')
+makedepends=('git' 'libmupdf' 'mupdf>=1.7' 'ocaml>=4.04')
+source=("$pkgname::git+git://repo.or.cz/llpp.git#commit=6572184")
 sha256sums=('SKIP')
 install=llpp.install
+# Dictionary lookup: http://repo.or.cz/llpp.git/commit/29916e0cadcdf0ee3136fc3b4655b3c8b0d01a7b
 optdepends=(
-  'xsel: Text selection'
-  'file: llppac file type recognition'
-  'gzip: llppac gzip archives'
+  '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'
-  'bzip2: llpac bzip2 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'
-  'librsvg: llppac svg conversion (preferred)'
-  'inkscape: llppac svg conversion (alternative)'
+  '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'
 )
 options=('!strip')
 
 pkgver() {
-  cd llpp
+  cd "$srcdir/$pkgname"
   git describe --tags | sed 's/^v//;s/-/.r/;s/-/./'
 }
 
-build() {
-  cd llpp
+prepare() {
+  cd "$srcdir/$pkgname"
   sed -i -e 's+-I \$srcdir/mupdf/include -I \$srcdir/mupdf/thirdparty/freetype/include+-I /usr/include/freetype2+' 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"
   sh build.sh build/
+  cd misc/completions/
+  make
 }
 
 package() {
-  cd llpp
-  install -Dm755 build/llpp "$pkgdir"/usr/bin/llpp
+  cd "$srcdir/$pkgname"
+  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 -Dm644 misc/llpp.desktop "$pkgdir"/usr/share/applications/llpp.desktop
-  install -Dm644 README "$pkgdir"/usr/share/licenses/llpp-git/README
-  #make -C misc/completions DESTDIR="$pkgdir" PREFIX=/usr install
+  # CSS styles
+  for i in epub.css prince.css; do
+    install -Dm644 $i "$pkgdir/usr/share/${pkgname%-*}/$i"
+  done
+
+  # Wikipedia
+  install -Dm755 wikipedia/wpget "$pkgdir/usr/share/${pkgname%-*}/wpget"
+  install -Dm644 wikipedia/wiki2.css "$pkgdir/usr/share/${pkgname%-*}/wiki2.css"
+
+  # 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"
 }
+