[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/, app-text/llpp/files/
commit: b87d7b3eb8186790ca7a9dd537d5bc7fd2d8f820 Author: Tim Harder gentoo org> AuthorDate: Mon Oct 26 06:18:38 2020 + Commit: Tim Harder gentoo org> CommitDate: Mon Oct 26 06:19:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87d7b3e app-text/llpp: version bump to 33 Signed-off-by: Tim Harder gentoo.org> app-text/llpp/Manifest | 1 + app-text/llpp/files/llpp-33-makefile | 91 app-text/llpp/llpp-33.ebuild | 68 +++ 3 files changed, 160 insertions(+) diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest index bd31a873817..0825c3930b0 100644 --- a/app-text/llpp/Manifest +++ b/app-text/llpp/Manifest @@ -2,3 +2,4 @@ DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713 DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57 DIST llpp-31_p20191016.tar.gz 169480 BLAKE2B af8f01d156863b642ad1c062b4b1a00a744955fdc1e7446b7a5023e6d03b58af77c699140b54d337c0eeacf65fba7a06ccfd6baa6ab9e1920bd7fd0fcfa90d97 SHA512 6fdd2621aec9f026e175c52957c77293a105adc81e42dad33f24631d5d2ae6775978834e84e1cab73cc8d1246af684384f9057a0f613438a19eaf7b607f92ddf +DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8 diff --git a/app-text/llpp/files/llpp-33-makefile b/app-text/llpp/files/llpp-33-makefile new file mode 100644 index 000..3a5c3122e25 --- /dev/null +++ b/app-text/llpp/files/llpp-33-makefile @@ -0,0 +1,91 @@ +VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null) +ifeq "$(VERSION)" "" +VERSION = 33 +endif + +# paths +PREFIX ?= /usr/local +LIBDIR ?= /usr/lib + +# includes and libs +PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib +CPPFLAGS += -D_GNU_SOURCE -DFFP +CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS)) +LDLIBS = -L$(LIBDIR) -lpthread -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 + a2x -d manpage -f manpage $< + +# 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
[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/, app-text/llpp/files/
commit: eeb6c074063a27a661e8cd619516ab6a7160df3e
Author: Jouni Kosonen tukesoft com>
AuthorDate: Thu Nov 14 02:41:11 2019 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Nov 30 07:48:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb6c074
app-text/llpp: snapshot version 30=mupdf-1.15 and v31 against ocaml<4.08
Closes: https://bugs.gentoo.org/685784
Closes: https://bugs.gentoo.org/699388
Signed-off-by: Jouni Kosonen tukesoft.com>
Closes: https://github.com/gentoo/gentoo/pull/13640
Signed-off-by: Joonas Niilola gentoo.org>
app-text/llpp/Manifest | 1 +
app-text/llpp/files/llpp.desktop | 2 +-
app-text/llpp/llpp-30_p20190316.ebuild | 72 ++
3 files changed, 74 insertions(+), 1 deletion(-)
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 6dba89603d9..5a5f1b30293 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1 +1,2 @@
DIST llpp-30.tar.gz 165821 BLAKE2B
755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d
SHA512
1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
+DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B
56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d
SHA512
c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
diff --git a/app-text/llpp/files/llpp.desktop b/app-text/llpp/files/llpp.desktop
index 9d81141aede..59c5fcde4e8 100644
--- a/app-text/llpp/files/llpp.desktop
+++ b/app-text/llpp/files/llpp.desktop
@@ -5,7 +5,7 @@ Exec=llpp %f
TryExec=llpp
Terminal=false
Type=Application
-MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;image/png;
+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;
Categories=Office;Viewer;Graphics
Actions=View
Version=1.0
diff --git a/app-text/llpp/llpp-30_p20190316.ebuild
b/app-text/llpp/llpp-30_p20190316.ebuild
new file mode 100644
index 000..019afdb0c6c
--- /dev/null
+++ b/app-text/llpp/llpp-30_p20190316.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp;
+MY_COMMIT="1f3ae0843d5877a0e599d8411d433bd9b0078157"
+SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static-libs"
+
+RDEPEND=">=app-text/mupdf-1.15.0:0=[static-libs=]
+ media-libs/openjpeg:2[static-libs=]
+ media-libs/fontconfig:1.0[static-libs=]
+ media-libs/freetype:2[static-libs=]
+ media-libs/jbig2dec:=[static-libs=]
+ sys-libs/zlib[static-libs=]
+ virtual/jpeg:0[static-libs=]
+ x11-libs/libX11[static-libs=]
+ x11-misc/xsel"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ virtual/pkgconfig
+ static-libs? (
+ app-arch/bzip2[static-libs]
+ media-libs/libXcm[static-libs]
+ x11-libs/libXau[static-libs]
+ x11-libs/libXdmcp[static-libs]
+ x11-libs/libXmu[static-libs] )
+ >=dev-lang/ocaml-4.05[ocamlopt?]
+ dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
+
+S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
+
+src_prepare() {
+ default
+
+ # use custom makefile from archlinux with minor changes
+ cp "${FILESDIR}"/Makefile "${S}" || die
+
+ # re-add desktop file removed upstream
+ cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
+}
+
+src_compile() {
+ emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="/usr" install
+ dodoc README Thanks
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/, app-text/llpp/files/
commit: 130653df48b799615eddd99ad5972a368b0f03e7
Author: Tim Harder gentoo org>
AuthorDate: Sat Dec 22 07:59:13 2018 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Dec 22 08:17:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130653df
app-text/llpp: respect user compiler and add libdir setting
To avoid showing wrong arch linking warnings on multi-arch systems.
Signed-off-by: Tim Harder gentoo.org>
app-text/llpp/files/Makefile | 5 +++--
app-text/llpp/llpp-30.ebuild | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app-text/llpp/files/Makefile b/app-text/llpp/files/Makefile
index 1fb99c9a211..0bd94cab00f 100644
--- a/app-text/llpp/files/Makefile
+++ b/app-text/llpp/files/Makefile
@@ -5,12 +5,13 @@ endif
# paths
PREFIX ?= /usr/local
+LIBDIR ?= /usr/lib
# includes and libs
PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
CPPFLAGS += -D_GNU_SOURCE -DFFP
-CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config
--cflags $(PKGCONF_DEPS))
-LDLIBS = -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config
--cflags $(PKGCONF_DEPS))
+LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs
$(PKGCONF_DEPS))
# ocaml
CAMLOPT = ocamlopt
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 9f5ec30d506..3ba1ce6fe45 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -51,7 +51,7 @@ src_prepare() {
}
src_compile() {
- emake -j1 VERSION=${PV}
+ emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/, app-text/llpp/files/
commit: 045561eb7c94dc7d4acf061a421d541c3a3d3e58 Author: Tim Harder gentoo org> AuthorDate: Sat Dec 22 07:41:29 2018 + Commit: Tim Harder gentoo org> CommitDate: Sat Dec 22 07:49:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045561eb app-text/llpp: version bump to 30 Closes: https://bugs.gentoo.org/662206 Closes: https://bugs.gentoo.org/672360 Signed-off-by: Tim Harder gentoo.org> app-text/llpp/Manifest | 1 + app-text/llpp/files/Makefile | 90 app-text/llpp/files/llpp-30-keysym.patch | 55 +++ app-text/llpp/files/llpp.desktop | 14 + app-text/llpp/llpp-30.ebuild | 70 + 5 files changed, 230 insertions(+) diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest index bfbf28930ce..b3c280baf7e 100644 --- a/app-text/llpp/Manifest +++ b/app-text/llpp/Manifest @@ -1 +1,2 @@ DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314 +DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893 diff --git a/app-text/llpp/files/Makefile b/app-text/llpp/files/Makefile new file mode 100644 index 000..1fb99c9a211 --- /dev/null +++ b/app-text/llpp/files/Makefile @@ -0,0 +1,90 @@ +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 mupdf x11 zlib +CPPFLAGS += -D_GNU_SOURCE -DFFP +CFLAGS += -g -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS)) +LDLIBS = -lpthread -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 + +.PHONY: all clean dist install diff --git a/app-text/llpp/files/llpp-30-keysym.patch b/app-text/llpp/files/llpp-30-keysym.patch new file mode 100644 index 000..b1527e1856f --- /dev/null +++ b/app-text/llpp/files/llpp-30-keysym.patch @@ -0,0 +1,55 @@
[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/, app-text/llpp/files/
commit: b6423e5e4a66ad8e28b4bd1c48766898af139c7f
Author: Michael Weber gentoo org>
AuthorDate: Sat May 13 22:43:18 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Sat May 13 22:46:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6423e5e
app-text/llpp: Remove old version (bug 614044).
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-text/llpp/Manifest | 1 -
app-text/llpp/files/llpp-20-WM_CLASS.patch | 42 ---
app-text/llpp/llpp-23.ebuild | 86 --
3 files changed, 129 deletions(-)
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index cbc881550cc..3771dd64217 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,2 +1 @@
-DIST llpp-23.tar.gz 159922 SHA256
83bf72ad88f0532a0163a6dc9bd285ad5ce8604116ec64764738cdb066748927 SHA512
ef89bead66c22ed218a4f7eb06f6f7d9b1d48f6ab6ef4785a5dc73ad486cdf4a5b1131a8a8cec9020e9caa14468528d9f27c88a29ab221e13c9c55616d20c296
WHIRLPOOL
e2c5468b744e71036745de63e9172b32cfa7cb2aae3c61c2a71d0ffe8b3a8b0e2502ff300d1a23446619353c6e43b7b6e051a6126ddc45b1997213c67cfd2764
DIST llpp-26b.tar.gz 169385 SHA256
1c14c794cefddc38c2acb72233ded21380184333571c9b2b01cfc108c9068798 SHA512
ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
WHIRLPOOL
2f5c85d56cf1ba3c33012fe7c9b783fb343b752a28ffef56bef2e82d560489e55f0fe090261f6582fc1a28fad0b5260e1dc7abe3e106ed24b74ff355def6cb0b
diff --git a/app-text/llpp/files/llpp-20-WM_CLASS.patch
b/app-text/llpp/files/llpp-20-WM_CLASS.patch
deleted file mode 100644
index 7c12ff5ae9b..000
--- a/app-text/llpp/files/llpp-20-WM_CLASS.patch
+++ /dev/null
@@ -1,42 +0,0 @@
llpp-20/link.c
-+++ llpp-20/link.c
-@@ -4305,6 +4305,32 @@
- }
- #endif
-
-+#if !defined (_WIN32) && !defined (__APPLE__)
-+#undef pixel
-+#include
-+#include
-+#include
-+#include
-+
-+static void set_wm_class (void)
-+{
-+Display *dpy;
-+Window win;
-+int screen;
-+XClassHint hint;
-+
-+dpy = XOpenDisplay (getenv ("DISPLAY"));
-+screen = DefaultScreen (dpy);
-+hint.res_name = "llpp";
-+hint.res_class = "llpp";
-+win = glXGetCurrentDrawable ();
-+XSetClassHint (dpy, win, );
-+XCloseDisplay (dpy);
-+}
-+#else
-+#define set_wm_class()
-+#endif
-+
- CAMLprim value ml_init (value csock_v, value params_v)
- {
- CAMLparam2 (csock_v, params_v);
-@@ -4425,5 +4451,6 @@
- errx (1, "pthread_create: %s", strerror (ret));
- }
-
-+set_wm_class ();
- CAMLreturn (Val_unit);
- }
diff --git a/app-text/llpp/llpp-23.ebuild b/app-text/llpp/llpp-23.ebuild
deleted file mode 100644
index 18de8073587..000
--- a/app-text/llpp/llpp-23.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git;
-SRC_URI="http://repo.or.cz/llpp.git/snapshot/b51644926dda712aebdc3f075bdc0771f35d6f7b.tar.gz
-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.10a:0=[static-libs]
- &2 ; "$@" || die ; }
- verbose sh mkhelp.sh KEYS ${PV} > help.ml
- verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
- verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
- verbose ${ocaml} -c -o help.${cmo} help.ml
- verbose ${ocaml} -c -o utils.${cmo} utils.ml
- verbose ${ocaml} -c -o wsi.cmi wsi.mli
- verbose ${ocaml} -c -o wsi.${cmo} wsi.ml
- verbose ${ocaml} -c -o parser.${cmo} parser.ml
- verbose ${ocaml} -c -o config.${cmo} -I +lablGL config.ml
- verbose ${ocaml} -c -pp "sed -f pp.sed" -o main.${cmo} -I +lablGL
main.ml
- verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL\
- str.${cma} unix.${cma} lablgl.${cma} link.o \
- -cclib "${cclib}" \
- help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo}
main.${cmo}
-}
-
-src_install() {
- dobin ${PN} misc/${PN}ac
- dodoc KEYS README Thanks
-}
[gentoo-commits] repo/gentoo:master commit in: app-text/llpp/, app-text/llpp/files/
commit: a5d62a3560a1d960c641722879d33e94ceb28926
Author: Michael Weber gentoo org>
AuthorDate: Fri Apr 28 20:51:14 2017 +
Commit: Michael Weber gentoo org>
CommitDate: Fri Apr 28 20:51:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d62a35
app-text/llpp: Version bump.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
app-text/llpp/Manifest | 1 +
app-text/llpp/files/llpp-26b-WM_CLASS.patch | 41 ++
app-text/llpp/llpp-26b.ebuild | 86 +
3 files changed, 128 insertions(+)
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index abff6c4dd4e..cbc881550cc 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1 +1,2 @@
DIST llpp-23.tar.gz 159922 SHA256
83bf72ad88f0532a0163a6dc9bd285ad5ce8604116ec64764738cdb066748927 SHA512
ef89bead66c22ed218a4f7eb06f6f7d9b1d48f6ab6ef4785a5dc73ad486cdf4a5b1131a8a8cec9020e9caa14468528d9f27c88a29ab221e13c9c55616d20c296
WHIRLPOOL
e2c5468b744e71036745de63e9172b32cfa7cb2aae3c61c2a71d0ffe8b3a8b0e2502ff300d1a23446619353c6e43b7b6e051a6126ddc45b1997213c67cfd2764
+DIST llpp-26b.tar.gz 169385 SHA256
1c14c794cefddc38c2acb72233ded21380184333571c9b2b01cfc108c9068798 SHA512
ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
WHIRLPOOL
2f5c85d56cf1ba3c33012fe7c9b783fb343b752a28ffef56bef2e82d560489e55f0fe090261f6582fc1a28fad0b5260e1dc7abe3e106ed24b74ff355def6cb0b
diff --git a/app-text/llpp/files/llpp-26b-WM_CLASS.patch
b/app-text/llpp/files/llpp-26b-WM_CLASS.patch
new file mode 100644
index 000..e99d9a4e4e5
--- /dev/null
+++ b/app-text/llpp/files/llpp-26b-WM_CLASS.patch
@@ -0,0 +1,41 @@
+--- llpp-26b/link.c
llpp-26b/link.c
+@@ -4392,6 +4392,31 @@
+ return caml_copy_string (FZ_VERSION);
+ }
+
++#if !defined (_WIN32) && !defined (__APPLE__)
++#undef pixel
++#include
++#include
++#include
++#include
++
++static void set_wm_class (void)
++{
++Display *dpy;
++Window win;
++XClassHint hint;
++
++dpy = XOpenDisplay (getenv ("DISPLAY"));
++DefaultScreen (dpy);
++hint.res_name = "llpp";
++hint.res_class = "llpp";
++win = glXGetCurrentDrawable ();
++XSetClassHint (dpy, win, );
++XCloseDisplay (dpy);
++}
++#else
++#define set_wm_class()
++#endif
++
+ CAMLprim void ml_init (value csock_v, value params_v)
+ {
+ CAMLparam2 (csock_v, params_v);
+@@ -4460,5 +4485,6 @@
+ errx (1, "pthread_create: %s", strerror (ret));
+ }
+
++set_wm_class ();
+ CAMLreturn0;
+ }
diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
new file mode 100644
index 000..fc38b4614cc
--- /dev/null
+++ b/app-text/llpp/llpp-26b.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git;
+SRC_URI="http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa04e3a4.tar.gz
-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]
+ media-libs/openjpeg:2[static-libs]
+ media-libs/fontconfig:1.0[static-libs]
+ media-libs/freetype:2[static-libs]
+ media-libs/jbig2dec[static-libs]
+ sys-libs/zlib[static-libs]
+ virtual/jpeg:0[static-libs]
+ x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+ !static? ( ${LIB_DEPEND//\[static-libs]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND}
+ app-arch/bzip2[static-libs]
+ media-libs/libXcm[static-libs]
+ x11-libs/libXau[static-libs]
+ x11-libs/libXdmcp[static-libs]
+ x11-libs/libXmu[static-libs] )
+ >=dev-lang/ocaml-4.02[ocamlopt?]
+ dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-26b-WM_CLASS.patch )
+
+src_compile() {
+ local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
+ local cmo=$(usex ocamlopt cmx cmo)
+ local cma=$(usex ocamlopt cmxa cma)
+ local ccopt="$(freetype-config --cflags ) -O -include ft2build.h
-D_GNU_SOURCE -DUSE_FONTCONFIG -std=c99 -Wextra -Wall -pedantic-errors
-Wunused-parameter -Wsign-compare -Wshadow"
+ if use static ; then
+ local cclib=""
+ local slib=""
+ local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG)
--libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
+ for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf
x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
+ case ${slib} in
+ -lm|-ldl|-lpthread)
+
