Date: Thursday, May 3, 2018 @ 21:35:35
Author: eschwartz
Revision: 318897
archrelease: copy trunk to community-x86_64
Added:
llpp/repos/community-x86_64/
llpp/repos/community-x86_64/Makefile
(from rev 318896, llpp/trunk/Makefile)
llpp/repos/community-x86_64/PKGBUILD
(from rev 318896, llpp/trunk/PKGBUILD)
llpp/repos/community-x86_64/no-quit-on-escape.patch
(from rev 318896, llpp/trunk/no-quit-on-escape.patch)
-------------------------+
Makefile | 86 ++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 68 ++++++++++++++++++++++++++++++++++++
no-quit-on-escape.patch | 33 +++++++++++++++++
3 files changed, 187 insertions(+)
Copied: llpp/repos/community-x86_64/Makefile (from rev 318896,
llpp/trunk/Makefile)
===================================================================
--- community-x86_64/Makefile (rev 0)
+++ community-x86_64/Makefile 2018-05-03 21:35:35 UTC (rev 318897)
@@ -0,0 +1,86 @@
+VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
+ifeq "${VERSION}" ""
+VERSION = 26b
+endif
+
+# paths
+PREFIX ?= /usr/local
+
+# includes and libs
+INCS = -I/usr/include -I/usr/include/freetype2 -include ft2build.h
+LIBS = -L/usr/lib -lX11 -lpthread -lmupdf -lmupdfthird -ljbig2dec -lcrypto \
+ -lz -lopenjp2 -ljpeg -lfreetype -lharfbuzz
+
+CPPFLAGS += -D_GNU_SOURCE -DFFP
+CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow ${INCS} ${CPPFLAGS}
+LDFLAGS += -g ${LIBS}
+
+# ocaml
+CAMLOPT = ocamlopt
+CAMLFLAGS = -g -w +a -safe-string -I +lablGL
+
+VPATH = wsi/x11
+
+SRC = utils.ml keys.ml wsi.ml parser.ml config.ml main.ml
+OBJ = help.cmx ${SRC:.ml=.cmx}
+MOD = unix.cmxa str.cmxa lablgl.cmxa
+SRCMANS = $(wildcard man/*.man)
+MANS = ${SRCMANS:.man=.1}
+
+DISTFILES := Makefile ${SRC} link.c glfont.c keysym2ucs.c wsi.mli
+DISTFILES += mkhelp.sh KEYS README BUILDING
+DISTFILES += misc/ man/
+
+all: llpp ${MANS}
+
+llpp: ${OBJ} link.o
+ ${CAMLOPT} -o $@ ${CAMLFLAGS} link.o -cclib '${LDFLAGS}' ${MOD} ${OBJ}
+
+main.cmx: main.ml utils.cmx config.cmx
+ ${CAMLOPT} -c -o $@ ${CAMLFLAGS} -thread $^
+
+wsi.cmx: wsi.cmi utils.cmx keys.cmx
+
+wsi.cmi: utils.cmx
+
+help.ml: mkhelp.sh KEYS
+ sh mkhelp.sh KEYS ${VERSION} > $@
+
+config.cmx: wsi.cmi parser.cmx utils.cmx help.cmx
+
+parser.cmx: utils.cmx
+
+link.o: glfont.c keysym2ucs.c
+
+.SUFFIXES: .ml .mli .cmo .cmi .cmx .mll .mly
+
+.c.o:
+ ${CAMLOPT} -c -o $@ ${CAMLFLAGS} -cc ${CC} -ccopt '${CFLAGS}' $<
+
+.ml.cmx:
+ ${CAMLOPT} -c -o $@ ${CAMLFLAGS} $<
+
+.mli.cmi:
+ ${CAMLOPT} -c -o $@ ${CAMLFLAGS} $<
+
+%.1: %.man man/asciidoc.conf
+ a2x -d manpage -f manpage --asciidoc-opts="-f man/asciidoc.conf
--out-file=$@.xml" $<
+
+.PHONY: all clean dist install
+
+clean:
+ ${RM} llpp link.o help.ml ${OBJ} ${OBJ:.cmx=.cmi} ${OBJ:.cmx=.o}
${MANS} ${MANS:.1=.xml}
+
+dist: clean
+ mkdir llpp-${VERSION}
+ cp -r ${DISTFILES} llpp-${VERSION}
+ tar czf llpp-${VERSION}.tar.gz llpp-${VERSION}
+ rm -rf llpp-${VERSION}
+
+install:
+ install -Dm755 llpp ${DESTDIR}${PREFIX}/bin/llpp
+ install -Dm644 -t ${DESTDIR}${PREFIX}/share/man/man1 man/*.1
+ install -Dm755 misc/llppac ${DESTDIR}${PREFIX}/bin/llppac
+ install -Dm755 misc/llpphtml ${DESTDIR}${PREFIX}/bin/llpphtml
+ install -Dm644 misc/llpp.desktop
${DESTDIR}${PREFIX}/share/applications/llpp.desktop
+ install -Dm644 README ${DESTDIR}${PREFIX}/share/licenses/llpp/README
Copied: llpp/repos/community-x86_64/PKGBUILD (from rev 318896,
llpp/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2018-05-03 21:35:35 UTC (rev 318897)
@@ -0,0 +1,68 @@
+# $Id$
+# Maintainer: Eli Schwartz <eschwa...@archlinux.org>
+# Contributor: earnestly
+
+pkgname=llpp
+pkgver=27
+_commit=87faa123127cc0746c28531874af7aaef1feb574
+pkgrel=1
+pkgdesc='opengl accelerated pdf viewer based on mupdf'
+arch=('x86_64')
+url="https://github.com/moosotc/${pkgname}";
+license=('GPL')
+depends=('glu' 'openjpeg2' 'jbig2dec' 'libjpeg-turbo' 'freetype2'
'desktop-file-utils')
+optdepends=('djvulibre: llppac djvu conversion'
+ 'ghostscript: llppac ps, dvi, and djvu conversion'
+ 'princexml: llppac html conversion'
+ 'unoconv: llppac office conversion'
+ 'librsvg: llppac svg conversion'
+ 'imagemagick: llppac image conversion'
+ 'llpp-gc: clean nonextant history items')
+makedepends=('git' 'asciidoc' 'ocaml' 'ocaml-lablgl' 'libmupdf' 'camlp4')
+
+# 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
+# months. It was contributed, or offered, to the author malc, but he concluded
+# that make was bad and needed constant effort to prevent "bitrot" as
+# justification for using a terrible shell script that downloaded arbitrary
+# commits of bundled libraries. Now he's on to shake, a haskell NIH
+# implementation of make requiring that you now also have ghc and the shake
+# library to build this software. Before this he used ninja.
+
+# For obvious reasons I'm sticking with the custom makefile which greatly
+# reduces maintainence burden and unecessary dependency bloat.
+source=("git+${url}#commit=${_commit}"
+ 'no-quit-on-escape.patch'
+ 'Makefile')
+sha256sums=('SKIP'
+ '29a9550c6502c9de7db14f2f61edc6b77c7ebee9f1de8b865d4e1b219b9ae377'
+ '5cc71dfe8fb7f5d79c445f3c65ae92b48ff2d22e4bdb48408504a13b1ebd09b2')
+
+pkgver() {
+ cd "${srcdir}"/${pkgname}
+
+ git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+ cd "${srcdir}"/${pkgname}
+
+ git revert --no-commit d4e7393edc61e94fe3e7a1482601da1f86b3f959
+
+ patch -Np1 -i "${srcdir}"/no-quit-on-escape.patch
+}
+
+build() {
+ cd "${srcdir}"/${pkgname}
+
+ make -f "${srcdir}"/Makefile
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}
+
+ make -f "${srcdir}"/Makefile PREFIX=/usr DESTDIR="${pkgdir}" install
+
+ cd misc/completions
+ make SHELL=/bin/bash PREFIX=/usr DESTDIR="${pkgdir}" install
+}
Copied: llpp/repos/community-x86_64/no-quit-on-escape.patch (from rev 318896,
llpp/trunk/no-quit-on-escape.patch)
===================================================================
--- community-x86_64/no-quit-on-escape.patch (rev 0)
+++ community-x86_64/no-quit-on-escape.patch 2018-05-03 21:35:35 UTC (rev
318897)
@@ -0,0 +1,33 @@
+diff --git a/KEYS b/KEYS
+index fa14c61..34f08bd 100644
+--- a/KEYS
++++ b/KEYS
+@@ -1,5 +1,5 @@
+ -----Quitting-----
+-escape/q - quit
++q - quit
+ Q - quit without saving the configuration or changes
+ W - save changes
+
+diff --git a/main.ml b/main.ml
+index 7ef80b5..5f0c3b3 100644
+--- a/main.ml
++++ b/main.ml
+@@ -4676,7 +4677,7 @@ let viewkeyboard key mask =
+ )
+ else impmsg '!' "Keyboard link navigation does not work under rotation"
+
+- | Escape | Ascii 'q' ->
++ | Ascii 'q' ->
+ begin match state.mstate with
+ | Mzoomrect _ ->
+ resetmstate ();
+@@ -5150,7 +5150,7 @@ let viewkeyboard key mask =
+ G.postRedisplay "|";
+ state.mode <- Textentry (te, onleave);
+
+- | (Ascii _|Fn _|Enter|Left|Right|Code _|Ctrl _) ->
++ | (Escape|Ascii _|Fn _|Enter|Left|Right|Code _|Ctrl _) ->
+ vlog "huh? %s" (Wsi.keyname key)
+ ;;
+
