Date: Thursday, October 4, 2018 @ 22:19:26 Author: eschwartz Revision: 389685
upgpkg: llpp 30-1 upstream release Makefile changes: - use the generic .cmx rule but set the CAMLFLAGS for main.cmx - adapt to mupdf upstream changing the name of the "mupdfthird" library to "mupdf-third" Modified: llpp/trunk/Makefile llpp/trunk/PKGBUILD llpp/trunk/no-quit-on-escape.patch -------------------------+ Makefile | 6 +++--- PKGBUILD | 13 ++++--------- no-quit-on-escape.patch | 16 ++++++++-------- 3 files changed, 15 insertions(+), 20 deletions(-) Modified: Makefile =================================================================== --- Makefile 2018-10-04 22:08:26 UTC (rev 389684) +++ Makefile 2018-10-04 22:19:26 UTC (rev 389685) @@ -10,7 +10,7 @@ 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)) +LDLIBS = -lpthread -lmupdf -lmupdf-third -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS)) # ocaml CAMLOPT = ocamlopt @@ -39,6 +39,8 @@ 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 @@ -50,8 +52,6 @@ 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 $< >$@ Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-04 22:08:26 UTC (rev 389684) +++ PKGBUILD 2018-10-04 22:19:26 UTC (rev 389685) @@ -2,9 +2,9 @@ # Contributor: earnestly pkgname=llpp -pkgver=28 +pkgver=30 # Often breaks with mupdf, which means I'll occasionally need to pin a specific commit. -_commit=6face0c21f4d1ac5d7d4ffd33fefc5ce924d4fc8 +_commit=273ad1dccd857e2e664530fbb98ca93d68945867 # tags/v30 pkgrel=1 pkgdesc='opengl accelerated pdf viewer based on mupdf' arch=('x86_64') @@ -35,9 +35,9 @@ "${url}/pull/85/commits/6e40f7315cb620fef1d96bbe56cfe24dd91e182a.patch" 'Makefile') sha256sums=('SKIP' - '8bba7d57e65679c36f0dde27e38ded5e16f71d3c196d47573faa2c06533b1a73' + '5814846ad19d9ddd8e1412bf36d4c2dc1a32186261126ec63cdf19f308396458' 'e6fa1df1e9451d4ffecc416676ad4697da21fc8809e20c78502b97805e4f4321' - '722b61229adde7e68de375bb713313759be3845715ca12a8fcbe60fe0d79ac45') + '95b684261f1baf2ccce9adac7739936e238143e41bd2b291edbb3fae1b3b7d33') pkgver() { cd "${srcdir}"/${pkgname} @@ -48,11 +48,6 @@ 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 Modified: no-quit-on-escape.patch =================================================================== --- no-quit-on-escape.patch 2018-10-04 22:08:26 UTC (rev 389684) +++ no-quit-on-escape.patch 2018-10-04 22:19:26 UTC (rev 389685) @@ -1,20 +1,20 @@ diff --git a/help.ml b/help.ml -index 165d46e..b86f0a0 100644 +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 +-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 +index 0445b50..645e35f 100644 --- a/main.ml +++ b/main.ml -@@ -3365,7 +3365,7 @@ let viewkeyboard key mask = +@@ -3394,7 +3394,7 @@ let viewkeyboard key mask = ) else impmsg "keyboard link navigation does not work under rotation" @@ -23,7 +23,7 @@ begin match state.mstate with | Mzoomrect _ -> resetmstate (); -@@ -3782,7 +3782,7 @@ let viewkeyboard key mask = +@@ -3811,7 +3811,7 @@ let viewkeyboard key mask = postRedisplay "|"; state.mode <- Textentry (te, onleave);