Date: Thursday, October 4, 2018 @ 22:20:12 Author: eschwartz Revision: 389686
archrelease: copy trunk to community-x86_64 Added: llpp/repos/community-x86_64/Makefile (from rev 389685, llpp/trunk/Makefile) llpp/repos/community-x86_64/PKGBUILD (from rev 389685, llpp/trunk/PKGBUILD) llpp/repos/community-x86_64/no-quit-on-escape.patch (from rev 389685, llpp/trunk/no-quit-on-escape.patch) Deleted: llpp/repos/community-x86_64/Makefile llpp/repos/community-x86_64/PKGBUILD llpp/repos/community-x86_64/no-quit-on-escape.patch -------------------------+ Makefile | 182 +++++++++++++++++++++++----------------------- PKGBUILD | 144 +++++++++++++++++------------------- no-quit-on-escape.patch | 68 ++++++++--------- 3 files changed, 194 insertions(+), 200 deletions(-) Deleted: Makefile =================================================================== --- Makefile 2018-10-04 22:19:26 UTC (rev 389685) +++ Makefile 2018-10-04 22:20:12 UTC (rev 389686) @@ -1,91 +0,0 @@ -VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null) -ifeq "$(VERSION)" "" -VERSION = 28 -endif - -# paths -PREFIX ?= /usr/local - -# includes and libs -PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg x11 zlib -CPPFLAGS += -D_GNU_SOURCE -DFFP -CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS)) -LDLIBS = -lpthread -lmupdf -lmupdfthird -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS)) - -# ocaml -CAMLOPT = ocamlopt -CAMLFLAGS = -g -w +a -safe-string -I +lablGL - -VPATH = wsi/x11 - -C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c -C_OBJ = $(C_SRC:.c=.o) -OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml -OCAML_OBJ = $(OCAML_SRC:.ml=.cmx) -MOD = unix.cmxa str.cmxa lablgl.cmxa -SRCMANS = $(wildcard adoc/*.adoc) -MANS = $(SRCMANS:.adoc=.1) - -DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli -DISTFILES += $(wildcard *.sh) KEYS README BUILDING -DISTFILES += misc/ adoc/ - -all: llpp $(MANS) - -# dependency ordering -config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx -confstruct.cmx: wsi.cmx utils.cmx -ffi.cmx: config.cmx -glutils.cmx: ffi.cmx -help.cmx: help.cmi config.cmx utils.cmx -listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx -parser.cmx: utils.cmx -wsi.cmi: utils.cmx keys.cmx -wsi.cmx: wsi.cmi - -link.o: glfont.c -version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION) - -# ordinary targets -llpp: $(OCAML_OBJ) $(C_OBJ) - $(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ) - -main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx - $(CAMLOPT) -c -o $@ $(CAMLFLAGS) -thread $^ - -confstruct.ml: genconfstr.sh - sh $< >$@ - -# pattern rules -%.o: %.c - $(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $< - -%.cmx: %.ml - $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $< - -%.cmi: %.mli - $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $< - -%.1: %.adoc adoc/asciidoc.conf - a2x -d manpage -f manpage --asciidoc-opts="-f adoc/asciidoc.conf --out-file=$@.xml" $< - -# special targets -clean: - $(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_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 $(MANS) - install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac - install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify - 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 - -.PHONY: all clean dist install Copied: llpp/repos/community-x86_64/Makefile (from rev 389685, llpp/trunk/Makefile) =================================================================== --- Makefile (rev 0) +++ Makefile 2018-10-04 22:20:12 UTC (rev 389686) @@ -0,0 +1,91 @@ +VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null) +ifeq "$(VERSION)" "" +VERSION = 28 +endif + +# paths +PREFIX ?= /usr/local + +# includes and libs +PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg x11 zlib +CPPFLAGS += -D_GNU_SOURCE -DFFP +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)) + +# ocaml +CAMLOPT = ocamlopt +CAMLFLAGS = -g -w +a -safe-string -I +lablGL + +VPATH = wsi/x11 + +C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c +C_OBJ = $(C_SRC:.c=.o) +OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml +OCAML_OBJ = $(OCAML_SRC:.ml=.cmx) +MOD = unix.cmxa str.cmxa lablgl.cmxa +SRCMANS = $(wildcard adoc/*.adoc) +MANS = $(SRCMANS:.adoc=.1) + +DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli +DISTFILES += $(wildcard *.sh) KEYS README BUILDING +DISTFILES += misc/ adoc/ + +all: llpp $(MANS) + +# dependency ordering +config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx +confstruct.cmx: wsi.cmx utils.cmx +ffi.cmx: config.cmx +glutils.cmx: ffi.cmx +help.cmx: help.cmi config.cmx utils.cmx +listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx +main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx +main.cmx: CAMLFLAGS += -thread +parser.cmx: utils.cmx +wsi.cmi: utils.cmx keys.cmx +wsi.cmx: wsi.cmi + +link.o: glfont.c +version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION) + +# ordinary targets +llpp: $(OCAML_OBJ) $(C_OBJ) + $(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ) + + +confstruct.ml: genconfstr.sh + sh $< >$@ + +# pattern rules +%.o: %.c + $(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $< + +%.cmx: %.ml + $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $< + +%.cmi: %.mli + $(CAMLOPT) -c -o $@ $(CAMLFLAGS) $< + +%.1: %.adoc adoc/asciidoc.conf + a2x -d manpage -f manpage --asciidoc-opts="-f adoc/asciidoc.conf --out-file=$@.xml" $< + +# special targets +clean: + $(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_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 $(MANS) + install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac + install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify + 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 + +.PHONY: all clean dist install Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-10-04 22:19:26 UTC (rev 389685) +++ PKGBUILD 2018-10-04 22:20:12 UTC (rev 389686) @@ -1,75 +0,0 @@ -# $Id$ -# Maintainer: Eli Schwartz <eschwa...@archlinux.org> -# Contributor: earnestly - -pkgname=llpp -pkgver=28 -# Often breaks with mupdf, which means I'll occasionally need to pin a specific commit. -_commit=6face0c21f4d1ac5d7d4ffd33fefc5ce924d4fc8 -pkgrel=1 -pkgdesc='opengl accelerated pdf viewer based on mupdf' -arch=('x86_64') -url="https://github.com/moosotc/${pkgname}" -license=('GPL3') -depends=('glu' 'openjpeg2' 'jbig2dec' 'libjpeg-turbo' 'freetype2' 'desktop-file-utils') -optdepends=('djvulibre: llppac djvu conversion' - 'ghostscript: llppac ps, dvi, and djvu conversion' - 'unoconv: llppac office conversion' - 'librsvg: llppac svg conversion' - 'imagemagick: llppac image conversion' - 'inotify-tools: for the llpp.inotify autoreload wrapper') -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' - "${url}/pull/85/commits/6e40f7315cb620fef1d96bbe56cfe24dd91e182a.patch" - 'Makefile') -sha256sums=('SKIP' - '8bba7d57e65679c36f0dde27e38ded5e16f71d3c196d47573faa2c06533b1a73' - 'e6fa1df1e9451d4ffecc416676ad4697da21fc8809e20c78502b97805e4f4321' - '722b61229adde7e68de375bb713313759be3845715ca12a8fcbe60fe0d79ac45') - -pkgver() { - cd "${srcdir}"/${pkgname} - - git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' -} - -prepare() { - cd "${srcdir}"/${pkgname} - - # weird tag breaks versioning logic - git tag -d llipposuction - - # mupdf too new - git show c4a533126fa20f42088e2d99f416ce3d667f2d13 -- :./link.c | git apply --reverse --index - # Don't use CPPFLAGS to insert '#include <inttypes.h>' - patch -Np1 -i "${srcdir}"/6e40f7315cb620fef1d96bbe56cfe24dd91e182a.patch - - patch -Np1 -i "${srcdir}"/no-quit-on-escape.patch - # apparently the desktop file went "stale" - git revert --no-commit aad4b1e65e581ff7a096a3c3901b222a9c127a1c -} - -build() { - cd "${srcdir}"/${pkgname} - - make -f "${srcdir}"/Makefile -} - -package() { - cd "${srcdir}"/${pkgname} - - make -f "${srcdir}"/Makefile PREFIX=/usr DESTDIR="${pkgdir}" install -} Copied: llpp/repos/community-x86_64/PKGBUILD (from rev 389685, llpp/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-10-04 22:20:12 UTC (rev 389686) @@ -0,0 +1,69 @@ +# Maintainer: Eli Schwartz <eschwa...@archlinux.org> +# Contributor: earnestly + +pkgname=llpp +pkgver=30 +# Often breaks with mupdf, which means I'll occasionally need to pin a specific commit. +_commit=273ad1dccd857e2e664530fbb98ca93d68945867 # tags/v30 +pkgrel=1 +pkgdesc='opengl accelerated pdf viewer based on mupdf' +arch=('x86_64') +url="https://github.com/moosotc/${pkgname}" +license=('GPL3') +depends=('glu' 'openjpeg2' 'jbig2dec' 'libjpeg-turbo' 'freetype2' 'desktop-file-utils') +optdepends=('djvulibre: llppac djvu conversion' + 'ghostscript: llppac ps, dvi, and djvu conversion' + 'unoconv: llppac office conversion' + 'librsvg: llppac svg conversion' + 'imagemagick: llppac image conversion' + 'inotify-tools: for the llpp.inotify autoreload wrapper') +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' + "${url}/pull/85/commits/6e40f7315cb620fef1d96bbe56cfe24dd91e182a.patch" + 'Makefile') +sha256sums=('SKIP' + '5814846ad19d9ddd8e1412bf36d4c2dc1a32186261126ec63cdf19f308396458' + 'e6fa1df1e9451d4ffecc416676ad4697da21fc8809e20c78502b97805e4f4321' + '95b684261f1baf2ccce9adac7739936e238143e41bd2b291edbb3fae1b3b7d33') + +pkgver() { + cd "${srcdir}"/${pkgname} + + git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' +} + +prepare() { + cd "${srcdir}"/${pkgname} + + # Don't use CPPFLAGS to insert '#include <inttypes.h>' + patch -Np1 -i "${srcdir}"/6e40f7315cb620fef1d96bbe56cfe24dd91e182a.patch + + patch -Np1 -i "${srcdir}"/no-quit-on-escape.patch + # apparently the desktop file went "stale" + git revert --no-commit aad4b1e65e581ff7a096a3c3901b222a9c127a1c +} + +build() { + cd "${srcdir}"/${pkgname} + + make -f "${srcdir}"/Makefile +} + +package() { + cd "${srcdir}"/${pkgname} + + make -f "${srcdir}"/Makefile PREFIX=/usr DESTDIR="${pkgdir}" install +} Deleted: no-quit-on-escape.patch =================================================================== --- no-quit-on-escape.patch 2018-10-04 22:19:26 UTC (rev 389685) +++ no-quit-on-escape.patch 2018-10-04 22:20:12 UTC (rev 389686) @@ -1,34 +0,0 @@ -diff --git a/help.ml b/help.ml -index 165d46e..b86f0a0 100644 ---- a/help.ml -+++ b/help.ml -@@ -1,6 +1,6 @@ - let keys = - {|-----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 cd45361..5d66930 100644 ---- a/main.ml -+++ b/main.ml -@@ -3365,7 +3365,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 (); -@@ -3782,7 +3782,7 @@ let viewkeyboard key mask = - 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) - ;; - Copied: llpp/repos/community-x86_64/no-quit-on-escape.patch (from rev 389685, llpp/trunk/no-quit-on-escape.patch) =================================================================== --- no-quit-on-escape.patch (rev 0) +++ no-quit-on-escape.patch 2018-10-04 22:20:12 UTC (rev 389686) @@ -0,0 +1,34 @@ +diff --git a/help.ml b/help.ml +index 772e262..42262d8 100644 +--- a/help.ml ++++ b/help.ml +@@ -1,6 +1,6 @@ + let keys = + {|-----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 0445b50..645e35f 100644 +--- a/main.ml ++++ b/main.ml +@@ -3394,7 +3394,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 (); +@@ -3811,7 +3811,7 @@ let viewkeyboard key mask = + 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) + ;; +