[arch-commits] Commit in llpp/trunk (GNUmakefile PKGBUILD)

[Eli Schwartz]

    Date: Monday, October 12, 2020 @ 19:42:27
  Author: eschwartz
Revision: 723719

upgpkg: llpp 33-1: upstream release

- manpages switched upstream from asciidoc to asciidoctor
- mupdf rebuild now depends on gumbo-parser, and due to the wonders of no
  pkg-config file and static libraries, we need to adapt linker flags

Modified:
  llpp/trunk/GNUmakefile
  llpp/trunk/PKGBUILD

-------------+
 GNUmakefile |    6 +++---
 PKGBUILD    |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

Modified: GNUmakefile
===================================================================
--- GNUmakefile	2020-10-12 19:13:36 UTC (rev 723718)
+++ GNUmakefile	2020-10-12 19:42:27 UTC (rev 723719)
@@ -12,7 +12,7 @@
 mandir ?= $(datarootdir)/man
 
 # includes and libs
-PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg x11 zlib
+PKGCONF_DEPS := gumbo freetype2 harfbuzz libopenjp2 libjpeg x11 zlib
 override CPPFLAGS += -D_GNU_SOURCE -DFFP
 override CFLAGS := $(CFLAGS) -g -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS))
 LDLIBS := -lpthread -lmupdf -lmupdf-third -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
@@ -77,8 +77,8 @@
 %.cmi: %.mli
 	$(COMPILE.ocaml) $(OUTPUT_OPTION) $<
 
-%.1: %.adoc adoc/asciidoc.conf
-	a2x -d manpage -f manpage --asciidoc-opts="-f adoc/asciidoc.conf --out-file=$@.xml" $<
+%.1: %.adoc
+	asciidoctor -b manpage -o $@ $<
 
 # special targets
 clean:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-10-12 19:13:36 UTC (rev 723718)
+++ PKGBUILD	2020-10-12 19:42:27 UTC (rev 723719)
@@ -2,15 +2,15 @@
 # Contributor: earnestly
 
 pkgname=llpp
-pkgver=32
+pkgver=33
 # Often breaks with mupdf, which means I'll occasionally need to pin a specific commit.
-_commit=74e6f8d66132636958f72bf1840d36de7a409ee1
-pkgrel=2
+_commit=3fb41e63167a01638c1bf808e876e2380fe7a1f6
+pkgrel=1
 pkgdesc='opengl accelerated pdf viewer based on mupdf'
 arch=('x86_64')
 url="https://github.com/moosotc/${pkgname}"
 license=('GPL3')
-depends=('libgl' 'openjpeg2' 'jbig2dec' 'libjpeg-turbo' 'freetype2')
+depends=('libgl' 'openjpeg2' 'jbig2dec' 'libjpeg-turbo' 'freetype2' 'gumbo-parser')
 optdepends=('djvulibre: llppac djvu conversion'
             'ghostscript: llppac ps, dvi, and djvu conversion'
             'unoconv: llppac office conversion'
@@ -17,7 +17,7 @@
             'librsvg: llppac svg conversion'
             'imagemagick: llppac image conversion'
             'inotify-tools: for the llpp.inotify autoreload wrapper')
-makedepends=('git' 'asciidoc' 'ocaml' 'ocaml-lablgl' 'libmupdf')
+makedepends=('git' 'asciidoctor' 'ocaml' 'ocaml-lablgl' 'libmupdf')
 
 # llpp seems to go through build systems like fasion, holomorph has provided a
 # very nice Makefile for building this software which has served well for
@@ -36,7 +36,7 @@
         'GNUmakefile')
 sha256sums=('SKIP'
             '5814846ad19d9ddd8e1412bf36d4c2dc1a32186261126ec63cdf19f308396458'
-            'b764e6cc084ee472704faad2591f086beaf79c3c04dbf6f12711e050d9167028')
+            '5771cc554407ff32ddd8c8982e8260687f31af37a4cb5e32875897ff5426a91f')
 
 pkgver() {
     cd "${srcdir}"/${pkgname}