diff options
author | Sam James <sam@gentoo.org> | 2021-03-16 18:34:06 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-03-16 19:22:22 +0000 |
commit | 0b355a7af9492adf20bbfa49018ed8d139fcad05 (patch) | |
tree | b6ef51215bdeb80f2253119e65e34e157cf55e70 /app-text/llpp | |
parent | app-text/diction: drop 1.13 (diff) | |
download | gentoo-0b355a7af9492adf20bbfa49018ed8d139fcad05.tar.gz gentoo-0b355a7af9492adf20bbfa49018ed8d139fcad05.tar.bz2 gentoo-0b355a7af9492adf20bbfa49018ed8d139fcad05.zip |
app-text/llpp: drop 30
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-text/llpp')
-rw-r--r-- | app-text/llpp/Manifest | 1 | ||||
-rw-r--r-- | app-text/llpp/files/llpp-30-keysym.patch | 55 | ||||
-rw-r--r-- | app-text/llpp/llpp-30.ebuild | 63 |
3 files changed, 0 insertions, 119 deletions
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest index 1c44ba978bed..11ef261f10d0 100644 --- a/app-text/llpp/Manifest +++ b/app-text/llpp/Manifest @@ -1,2 +1 @@ -DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893 DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8 diff --git a/app-text/llpp/files/llpp-30-keysym.patch b/app-text/llpp/files/llpp-30-keysym.patch deleted file mode 100644 index b1527e1856f1..000000000000 --- a/app-text/llpp/files/llpp-30-keysym.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6e40f7315cb620fef1d96bbe56cfe24dd91e182a Mon Sep 17 00:00:00 2001 -From: Eli Schwartz <eschwartz93@gmail.com> -Date: Tue, 5 Jun 2018 11:56:06 -0400 -Subject: [PATCH] Do not use CPPFLAGS to add headers to source files - -Source code, e.g. #include, belongs in the source code, not the build -system. Build systems are for defining include paths, not the includes -themselves. - -Drop the KeySym keyword since it seems to be a useless alias for -uint32_t which might as well be used directly instead of indirectly -using #define everywhere. ---- - link.c | 4 ++-- - wsi/x11/keysym2ucs.c | 4 +++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/link.c b/link.c -index 783b12f..e8dcac3 100644 ---- a/link.c -+++ b/link.c -@@ -3437,9 +3437,9 @@ CAMLprim value ml_keysymtoutf8 (value keysym_v) - { - CAMLparam1 (keysym_v); - CAMLlocal1 (str_v); -- KeySym keysym = Int_val (keysym_v); -+ uint32_t keysym = Int_val (keysym_v); - Rune rune; -- extern long keysym2ucs (KeySym); -+ extern long keysym2ucs (uint32_t); - int len; - char buf[5]; - -diff --git a/wsi/x11/keysym2ucs.c b/wsi/x11/keysym2ucs.c -index 38f9f1f..0f907c2 100644 ---- a/wsi/x11/keysym2ucs.c -+++ b/wsi/x11/keysym2ucs.c -@@ -37,6 +37,8 @@ - * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl) - */ - -+#include <inttypes.h> -+ - struct codepair { - unsigned short keysym; - unsigned short ucs; -@@ -816,7 +818,7 @@ struct codepair { - { 0x20ac, 0x20ac }, /* EuroSign € EURO SIGN */ - }; - --long keysym2ucs(KeySym keysym) -+long keysym2ucs(uint32_t keysym) - { - int min = 0; - int max = sizeof(keysymtab) / sizeof(struct codepair) - 1; diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild deleted file mode 100644 index 31eafbf3035e..000000000000 --- a/app-text/llpp/llpp-30.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs xdg - -DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)" -HOMEPAGE="https://github.com/moosotc/llpp" -SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="+ocamlopt" - -BDEPEND=" - >=dev-lang/ocaml-4.02:=[ocamlopt?] - virtual/pkgconfig -" -RDEPEND=" - >=app-text/mupdf-1.12.0:0= - media-libs/openjpeg:2 - media-libs/fontconfig:1.0 - media-libs/freetype:2 - media-libs/jbig2dec:= - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libX11 - x11-misc/xsel -" -DEPEND="${RDEPEND} - app-arch/bzip2 - app-text/asciidoc - dev-ml/lablgl:=[glut,ocamlopt?] - media-libs/libXcm - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXmu -" - -RESTRICT="!ocamlopt? ( strip )" - -PATCHES=( "${FILESDIR}"/${P}-keysym.patch ) - -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="${ED}" PREFIX="/usr" install - dodoc README Thanks -} |