Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/fbpdf/, app-text/fbpdf/files/
Date: Mon, 02 Nov 2020 10:21:05
Message-Id: 1604312455.2907618a6f57d32cc394be0b0ae357f3c7890c8a.slyfox@gentoo
1 commit: 2907618a6f57d32cc394be0b0ae357f3c7890c8a
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 2 08:42:00 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 2 10:20:55 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2907618a
7
8 app-text/fbpdf: drop old
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.2
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 app-text/fbpdf/Manifest | 1 -
14 app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild | 43 ----------------------
15 .../fbpdf/files/fbpdf-0_p20190202-printf.patch | 38 -------------------
16 3 files changed, 82 deletions(-)
17
18 diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
19 index ef0e2b843e0..ab7e2ce1d18 100644
20 --- a/app-text/fbpdf/Manifest
21 +++ b/app-text/fbpdf/Manifest
22 @@ -1,2 +1 @@
23 -DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
24 DIST fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz 8432 BLAKE2B 0004f8558b86c349744a37099ef86963d368ee9dedeefca861761f88adc3c94a3db9f46c9e1a6f6026357512a8320b956cd7c48108aa6c6657b84193fd5d4b49 SHA512 e037cd536e3a26b6d2364eb52803de67606bac418db8691c7530a889c95dd1f8661985021237ce7fea95f56ab5a308caf8d470c6c036b51b17211f9c200aba51
25
26 diff --git a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild b/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
27 deleted file mode 100644
28 index 79bea0cffbd..00000000000
29 --- a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
30 +++ /dev/null
31 @@ -1,43 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -inherit toolchain-funcs vcs-snapshot
38 -
39 -COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
40 -
41 -DESCRIPTION="framebuffer pdf and djvu viewer"
42 -HOMEPAGE="https://github.com/aligrudi/fbpdf"
43 -
44 -SRC_URI="https://github.com/aligrudi/fbpdf/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
45 -
46 -LICENSE="BSD ISC"
47 -SLOT="0"
48 -KEYWORDS="~amd64 ~x86"
49 -
50 -RDEPEND="
51 - >=app-text/mupdf-1.10:0=
52 - app-text/djvu:0=
53 - !media-gfx/fbida[fbcon(-)]
54 -"
55 -
56 -DEPEND="${RDEPEND}"
57 -
58 -BDEPEND="virtual/pkgconfig"
59 -
60 -S=${WORKDIR}/${P}-${COMMIT}
61 -
62 -PATCHES=(
63 - "${FILESDIR}"/${P}-use-pkg-config.patch
64 - "${FILESDIR}"/${P}-printf.patch
65 -)
66 -
67 -src_compile() {
68 - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
69 -}
70 -
71 -src_install() {
72 - dobin fbpdf fbdjvu
73 - dodoc README
74 -}
75
76 diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
77 deleted file mode 100644
78 index 31f9fbe2c8a..00000000000
79 --- a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
80 +++ /dev/null
81 @@ -1,38 +0,0 @@
82 -https://bugs.gentoo.org/714736
83 -
84 -From e89e36c01d09ca6aec03732e922e749257cac3f4 Mon Sep 17 00:00:00 2001
85 -From: Dmitry Bogatov <KAction@×××××××.org>
86 -Date: Sun, 9 Feb 2020 00:47:09 -0500
87 -Subject: [PATCH] Avoid passing non-constant format string to printf
88 -
89 -gcc complains loudly on any code that uses anything but string literal
90 -as format string to printf. Right now format string is "const char *"
91 -and does not contain %-sequences, but should '%' appear in "usage"
92 -string in future, bad things would happen.
93 -
94 -Since formatting functionality of "printf" is not used anyway, replacing
95 -it with "puts" makes code both safer and easier to understand.
96 ----
97 - fbpdf.c | 4 ++--
98 - 1 file changed, 2 insertions(+), 2 deletions(-)
99 -
100 -diff --git a/fbpdf.c b/fbpdf.c
101 -index a58797f..65b654b 100644
102 ---- a/fbpdf.c
103 -+++ b/fbpdf.c
104 -@@ -351,13 +351,13 @@ static void mainloop(void)
105 - }
106 -
107 - static char *usage =
108 -- "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
109 -+ "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
110 -
111 - int main(int argc, char *argv[])
112 - {
113 - int i = 1;
114 - if (argc < 2) {
115 -- printf(usage);
116 -+ puts(usage);
117 - return 1;
118 - }
119 - strcpy(filename, argv[argc - 1]);