[arch-commits] Commit in llpp/repos/community-x86_64 (6 files)

Eli Schwartz eschwartz at archlinux.org
Wed May 6 23:28:54 UTC 2020


    Date: Wednesday, May 6, 2020 @ 23:28:53
  Author: eschwartz
Revision: 625226

archrelease: copy trunk to community-x86_64

Added:
  llpp/repos/community-x86_64/GNUmakefile
    (from rev 625225, llpp/trunk/GNUmakefile)
  llpp/repos/community-x86_64/PKGBUILD
    (from rev 625225, llpp/trunk/PKGBUILD)
  llpp/repos/community-x86_64/no-quit-on-escape.patch
    (from rev 625225, llpp/trunk/no-quit-on-escape.patch)
Deleted:
  llpp/repos/community-x86_64/GNUmakefile
  llpp/repos/community-x86_64/PKGBUILD
  llpp/repos/community-x86_64/no-quit-on-escape.patch

-------------------------+
 GNUmakefile             |  190 +++++++++++++++++++++++-----------------------
 PKGBUILD                |  143 ++++++++++++++++------------------
 no-quit-on-escape.patch |   68 ++++++++--------
 3 files changed, 198 insertions(+), 203 deletions(-)

Deleted: GNUmakefile
===================================================================
--- GNUmakefile	2020-05-06 23:28:16 UTC (rev 625225)
+++ GNUmakefile	2020-05-06 23:28:53 UTC (rev 625226)
@@ -1,95 +0,0 @@
-MAKEFLAGS := -r
-
-VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
-ifeq ($(VERSION),)
-    VERSION = 31
-endif
-
-# paths
-PREFIX ?= /usr/local
-bindir ?= $(PREFIX)/bin
-datarootdir ?= $(PREFIX)/share
-mandir ?= $(datarootdir)/man
-
-# includes and libs
-PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg x11 zlib
-override CPPFLAGS += -D_GNU_SOURCE -DFFP
-override 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
-override OCAMLFLAGS += -g -w +a -safe-string
-
-# Some source files are stored in an OS-specific directory here.
-# Divert them to the main srcdir.
-ifeq ($(shell uname -s),Linux)
-    VPATH := wsi/x11
-else
-    VPATH := wsi/cocoa # Darwin
-endif
-
-# Ensure main.cmx is last in this list:
-OCAML_OBJ := utils.cmx wsi.cmx confstruct.cmx parser.cmx config.cmx ffi.cmx glutils.cmx keys.cmx utf8syms.cmx listview.cmx help.cmx main.cmx
-C_OBJ := cutils.o keysym2ucs.o link.o xlib.o version.o
-MODULES := unix.cmxa str.cmxa lablgl.cmxa
-SRCMANS = $(wildcard adoc/*.adoc)
-MANS = $(SRCMANS:.adoc=.1)
-
-OCAMLC := ocamlopt
-COMPILE.ocaml = $(OCAMLC) $(OCAMLFLAGS) -c
-LINK.ocaml = $(OCAMLC) $(OCAMLFLAGS)
-
-all: llpp $(MANS)
-
-# dependency ordering
-main.cmx: private OCAMLFLAGS += -thread -I +lablGL
-main.cmx: main.cmi utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx help.cmx
-config.cmx: wsi.cmx confstruct.cmx parser.cmx
-confstruct.cmx: wsi.cmx
-parser.cmx: utils.cmx
-wsi.cmx: keys.cmx utils.cmx
-listview.cmx: private OCAMLFLAGS += -I +lablGL
-listview.cmx: utf8syms.cmx glutils.cmx
-glutils.cmx: private OCAMLFLAGS += -I +lablGL
-glutils.cmx: ffi.cmx
-ffi.cmx: config.cmx
-help.cmx: help.cmi utils.cmx ffi.cmx config.cmx
-help.cmi: config.cmx
-
-link.o: glfont.c
-version.o: private CPPFLAGS += -DLLPP_VERSION=$(VERSION)
-
-# ordinary targets
-llpp: private OCAMLFLAGS += -I +lablGL
-llpp: $(OCAML_OBJ) $(C_OBJ)
-	$(LINK.ocaml) $(OUTPUT_OPTION) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MODULES) $(OCAML_OBJ)
-
-confstruct.ml: genconfstr.sh
-	sh $< > $@
-
-# pattern rules
-%.o: %.c
-	$(COMPILE.ocaml) $(OUTPUT_OPTION) -cc '$(CC)' -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
-
-%.cmx: %.ml
-	$(COMPILE.ocaml) $(OUTPUT_OPTION) $<
-
-%.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" $<
-
-# special targets
-clean:
-	$(RM) llpp confstruct.ml $(C_OBJ) $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
-
-install:
-	install -Dm755 llpp "$(DESTDIR)$(bindir)"/llpp
-	install -Dm644 -t "$(DESTDIR)$(mandir)"/man1 $(MANS)
-	install -Dm755 misc/llppac "$(DESTDIR)$(bindir)"/llppac
-	install -Dm755 misc/llpp.inotify "$(DESTDIR)$(bindir)"/llpp.inotify
-	install -Dm755 misc/llpphtml "$(DESTDIR)$(bindir)"/llpphtml
-	install -Dm644 misc/llpp.desktop "$(DESTDIR)$(datarootdir)"/applications/llpp.desktop
-
-.PHONY: all clean install

Copied: llpp/repos/community-x86_64/GNUmakefile (from rev 625225, llpp/trunk/GNUmakefile)
===================================================================
--- GNUmakefile	                        (rev 0)
+++ GNUmakefile	2020-05-06 23:28:53 UTC (rev 625226)
@@ -0,0 +1,95 @@
+MAKEFLAGS := -r
+
+VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
+ifeq ($(VERSION),)
+    VERSION = 31
+endif
+
+# paths
+PREFIX ?= /usr/local
+bindir ?= $(PREFIX)/bin
+datarootdir ?= $(PREFIX)/share
+mandir ?= $(datarootdir)/man
+
+# includes and libs
+PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg x11 zlib
+override CPPFLAGS += -D_GNU_SOURCE -DFFP
+override 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
+override OCAMLFLAGS += -g -w +a -safe-string
+
+# Some source files are stored in an OS-specific directory here.
+# Divert them to the main srcdir.
+ifeq ($(shell uname -s),Linux)
+    VPATH := wsi/x11
+else
+    VPATH := wsi/cocoa # Darwin
+endif
+
+# Ensure main.cmx is last in this list:
+OCAML_OBJ := utils.cmx wsi.cmx confstruct.cmx parser.cmx config.cmx ffi.cmx glutils.cmx keys.cmx utf8syms.cmx listview.cmx help.cmx main.cmx
+C_OBJ := cutils.o keysym2ucs.o link.o xlib.o version.o
+MODULES := unix.cmxa str.cmxa lablgl.cmxa
+SRCMANS = $(wildcard adoc/*.adoc)
+MANS = $(SRCMANS:.adoc=.1)
+
+OCAMLC := ocamlopt
+COMPILE.ocaml = $(OCAMLC) $(OCAMLFLAGS) -c
+LINK.ocaml = $(OCAMLC) $(OCAMLFLAGS)
+
+all: llpp $(MANS)
+
+# dependency ordering
+main.cmx: private OCAMLFLAGS += -thread -I +lablGL
+main.cmx: main.cmi utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx help.cmx
+config.cmx: wsi.cmx confstruct.cmx parser.cmx
+confstruct.cmx: wsi.cmx
+parser.cmx: utils.cmx
+wsi.cmx: keys.cmx utils.cmx
+listview.cmx: private OCAMLFLAGS += -I +lablGL
+listview.cmx: utf8syms.cmx glutils.cmx
+glutils.cmx: private OCAMLFLAGS += -I +lablGL
+glutils.cmx: ffi.cmx
+ffi.cmx: config.cmx
+help.cmx: help.cmi utils.cmx ffi.cmx config.cmx
+help.cmi: config.cmx
+
+link.o: glfont.c
+version.o: private CPPFLAGS += -DLLPP_VERSION=$(VERSION)
+
+# ordinary targets
+llpp: private OCAMLFLAGS += -I +lablGL
+llpp: $(OCAML_OBJ) $(C_OBJ)
+	$(LINK.ocaml) $(OUTPUT_OPTION) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MODULES) $(OCAML_OBJ)
+
+confstruct.ml: genconfstr.sh
+	sh $< > $@
+
+# pattern rules
+%.o: %.c
+	$(COMPILE.ocaml) $(OUTPUT_OPTION) -cc '$(CC)' -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
+
+%.cmx: %.ml
+	$(COMPILE.ocaml) $(OUTPUT_OPTION) $<
+
+%.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" $<
+
+# special targets
+clean:
+	$(RM) llpp confstruct.ml $(C_OBJ) $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
+
+install:
+	install -Dm755 llpp "$(DESTDIR)$(bindir)"/llpp
+	install -Dm644 -t "$(DESTDIR)$(mandir)"/man1 $(MANS)
+	install -Dm755 misc/llppac "$(DESTDIR)$(bindir)"/llppac
+	install -Dm755 misc/llpp.inotify "$(DESTDIR)$(bindir)"/llpp.inotify
+	install -Dm755 misc/llpphtml "$(DESTDIR)$(bindir)"/llpphtml
+	install -Dm644 misc/llpp.desktop "$(DESTDIR)$(datarootdir)"/applications/llpp.desktop
+
+.PHONY: all clean install

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-06 23:28:16 UTC (rev 625225)
+++ PKGBUILD	2020-05-06 23:28:53 UTC (rev 625226)
@@ -1,74 +0,0 @@
-# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: earnestly
-
-pkgname=llpp
-pkgver=31
-# Often breaks with mupdf, which means I'll occasionally need to pin a specific commit.
-_commit=77dd95ff11449f57f2ea002223bb282256270fa8  # tags/v31
-pkgrel=4
-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')
-
-# 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"
-        'GNUmakefile')
-sha256sums=('SKIP'
-            '5814846ad19d9ddd8e1412bf36d4c2dc1a32186261126ec63cdf19f308396458'
-            'e6fa1df1e9451d4ffecc416676ad4697da21fc8809e20c78502b97805e4f4321'
-            'b764e6cc084ee472704faad2591f086beaf79c3c04dbf6f12711e050d9167028')
-
-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
-
-    # This symlink ruins all the fun
-    rm wsi/x11/wsi.mli
-
-    ln -sf ../GNUmakefile GNUmakefile
-}
-
-build() {
-    cd "${srcdir}"/${pkgname}
-
-    make
-}
-
-package() {
-    cd "${srcdir}"/${pkgname}
-
-    make PREFIX=/usr DESTDIR="${pkgdir}" install
-}

Copied: llpp/repos/community-x86_64/PKGBUILD (from rev 625225, llpp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-06 23:28:53 UTC (rev 625226)
@@ -0,0 +1,69 @@
+# Maintainer: Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: earnestly
+
+pkgname=llpp
+pkgver=31.r41.g233b1a0
+# Often breaks with mupdf, which means I'll occasionally need to pin a specific commit.
+_commit=233b1a0ebbb57a706d13f751183f729186159d9d
+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')
+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')
+
+# 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'
+        'GNUmakefile')
+sha256sums=('SKIP'
+            '5814846ad19d9ddd8e1412bf36d4c2dc1a32186261126ec63cdf19f308396458'
+            'b764e6cc084ee472704faad2591f086beaf79c3c04dbf6f12711e050d9167028')
+
+pkgver() {
+    cd "${srcdir}"/${pkgname}
+
+    git describe --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd "${srcdir}"/${pkgname}
+
+    patch -Np1 -i "${srcdir}"/no-quit-on-escape.patch
+    # apparently the desktop file went "stale"
+    git revert --no-commit aad4b1e65e581ff7a096a3c3901b222a9c127a1c
+
+    # This symlink ruins all the fun
+    rm wsi/x11/wsi.mli
+
+    ln -sf ../GNUmakefile GNUmakefile
+}
+
+build() {
+    cd "${srcdir}"/${pkgname}
+
+    make
+}
+
+package() {
+    cd "${srcdir}"/${pkgname}
+
+    make PREFIX=/usr DESTDIR="${pkgdir}" install
+}

Deleted: no-quit-on-escape.patch
===================================================================
--- no-quit-on-escape.patch	2020-05-06 23:28:16 UTC (rev 625225)
+++ no-quit-on-escape.patch	2020-05-06 23:28:53 UTC (rev 625226)
@@ -1,34 +0,0 @@
-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)
- ;;
- 

Copied: llpp/repos/community-x86_64/no-quit-on-escape.patch (from rev 625225, llpp/trunk/no-quit-on-escape.patch)
===================================================================
--- no-quit-on-escape.patch	                        (rev 0)
+++ no-quit-on-escape.patch	2020-05-06 23:28:53 UTC (rev 625226)
@@ -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)
+ ;;
+ 


More information about the arch-commits mailing list