* [gentoo-commits] repo/gentoo:master commit in: app-text/fbpdf/, app-text/fbpdf/files/
@ 2017-01-23 21:57 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2017-01-23 21:57 UTC (permalink / raw
To: gentoo-commits
commit: 46beef910284631a394a4060487d8bd0ae6dd61a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 21:57:33 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 21:57:42 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46beef91
app-text/fbpdf: bump to support mupdf-1.10, bug #606876
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/606876
Package-Manager: Portage-2.3.3, Repoman-2.3.1
app-text/fbpdf/Manifest | 1 +
app-text/fbpdf/fbpdf-0_p20161202.ebuild | 41 ++++++++++++++++++++++
.../fbpdf/files/fbpdf-0_p20161202-format.patch | 14 ++++++++
3 files changed, 56 insertions(+)
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index ce49a8c..199046e 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1 +1,2 @@
DIST fbpdf-0_p20160409.tar.gz 7788 SHA256 ae17aa7fb1e472df5fa1be42505305705dff15bdf92006311816b66f2a2e4f3f SHA512 e939f2d1fd9dccfb778756c3dd3f1b4d8c413e55d17fb68d7bfbd42a541a30b6bdc8f190e81d18ebc45c7e4e46ce48a559b9c564710fb66b292f043f7351b684 WHIRLPOOL cb86cdaecf8e35610916f4f2bc990b810c56f200aba96a036a6e65c72258e93d6782a97ffc8356e32c58aeba7126d698e802c77d47553a8ebbf1d915aa04ade7
+DIST fbpdf-0_p20161202.tar.gz 7795 SHA256 9cd0fb4cb2a6602606b7e24cb9b1e81c663b07f0a982236f0de5dc25b4653823 SHA512 c122f12485b9e0055bd5b60d66a5034d20738c6a5a1a9f384ef8cb93e4c6b1275434eea884398590db2b06a746cc0ff00df29ecdc5faecc1730a022435164107 WHIRLPOOL dd576141183548aaa1036eb36524b1c7bf8df6d3645fca11846323687a7b3e6a80d09e709980e8da41ac82763c16b69247be1a33aa758191f79d37d6bb936079
diff --git a/app-text/fbpdf/fbpdf-0_p20161202.ebuild b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
new file mode 100644
index 00000000..0dd4cc6
--- /dev/null
+++ b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="framebuffer pdf and djvu viewer"
+HOMEPAGE="http://repo.or.cz/fbpdf.git"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=app-text/mupdf-1.10:0=
+ dev-lang/mujs:0=
+ media-libs/freetype:2=
+ media-libs/jbig2dec:0=
+ virtual/jpeg:0=
+ media-libs/openjpeg:0=
+ dev-libs/openssl:0=
+ app-text/djvu:0=
+"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=("${FILESDIR}"/${P}-format.patch)
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin fbpdf fbdjvu
+ dodoc README
+}
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
new file mode 100644
index 00000000..0b48d6b
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
@@ -0,0 +1,14 @@
+diff --git a/fbpdf.c b/fbpdf.c
+index 6caa08f..48d12f5 100644
+--- a/fbpdf.c
++++ b/fbpdf.c
+@@ -343,3 +343,3 @@ static void mainloop(void)
+ static char *usage =
+- "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
++ "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
+
+@@ -349,3 +349,3 @@ int main(int argc, char *argv[])
+ if (argc < 2) {
+- printf(usage);
++ puts(usage);
+ return 1;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/fbpdf/, app-text/fbpdf/files/
@ 2017-07-02 9:44 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2017-07-02 9:44 UTC (permalink / raw
To: gentoo-commits
commit: 383eecae5f3cd37c1baed070fec6a7a3a489d70f
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 2 09:44:30 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 09:44:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383eecae
app-text/fbpdf: fix build failure against app-text/mupdf-1.11, bug #623468
app-text/mupdf 1.11 does not provide mupdfthird library anymore
and build fails as:
x86_64-pc-linux-gnu-gcc -o fbpdf fbpdf.o mupdf.o draw.o -Wl,-O1 -Wl,--as-needed -lmupdf -lmupdfthird -lcrypto -lm
/usr/lib/gcc/x86_64-pc-linux-gnu/6.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: cannot find -lmupdfthird
collect2: error: ld returned 1 exit status
Now app-text/mupdf provides single 'mupdf' library.
Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/623468
Package-Manager: Portage-2.3.6, Repoman-2.3.2
app-text/fbpdf/fbpdf-0_p20161202.ebuild | 5 ++++-
app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch | 9 +++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/app-text/fbpdf/fbpdf-0_p20161202.ebuild b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
index d7cb3668d43..02e5ea6ffd6 100644
--- a/app-text/fbpdf/fbpdf-0_p20161202.ebuild
+++ b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/${PN}
-PATCHES=("${FILESDIR}"/${P}-format.patch)
+PATCHES=(
+ "${FILESDIR}"/${P}-format.patch
+ "${FILESDIR}"/${P}-mupdfthird.patch
+)
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
new file mode 100644
index 00000000000..070b7c72ea2
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index f986689..374837f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,3 +13,3 @@ clean:
+ fbpdf: fbpdf.o mupdf.o draw.o
+- $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdfthird -lcrypto -lm
++ $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lcrypto -lm
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/fbpdf/, app-text/fbpdf/files/
@ 2019-02-05 22:49 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2019-02-05 22:49 UTC (permalink / raw
To: gentoo-commits
commit: 73927356d798ebc850245b6fdb179f0ab7f7436d
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 5 22:48:07 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 22:49:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73927356
app-text/fbpdf: drop old
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-text/fbpdf/Manifest | 1 -
app-text/fbpdf/fbpdf-0_p20161202.ebuild | 44 ----------------------
.../fbpdf/files/fbpdf-0_p20161202-format.patch | 14 -------
.../fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch | 9 -----
4 files changed, 68 deletions(-)
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index 387dc549016..cc7b093861d 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,2 +1 @@
-DIST fbpdf-0_p20161202.tar.gz 7795 BLAKE2B 725fb49278ceee0e24bfbdaaa5f93cc78c448666e44ab426739be8db27ad3010911473af6766a45a569356fd322555962d9250f0d655e69594433b29c5d80325 SHA512 c122f12485b9e0055bd5b60d66a5034d20738c6a5a1a9f384ef8cb93e4c6b1275434eea884398590db2b06a746cc0ff00df29ecdc5faecc1730a022435164107
DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
diff --git a/app-text/fbpdf/fbpdf-0_p20161202.ebuild b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
deleted file mode 100644
index a2fd7c2a102..00000000000
--- a/app-text/fbpdf/fbpdf-0_p20161202.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="framebuffer pdf and djvu viewer"
-HOMEPAGE="http://repo.or.cz/fbpdf.git"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=app-text/mupdf-1.10:0=
- app-text/djvu:0=
- dev-lang/mujs:0=
- dev-libs/openssl:0=
- !media-gfx/fbida[fbcon]
- media-libs/freetype:2=
- media-libs/jbig2dec:0=
- media-libs/openjpeg:0=
- virtual/jpeg:0=
-"
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
- "${FILESDIR}"/${P}-format.patch
- "${FILESDIR}"/${P}-mupdfthird.patch
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin fbpdf fbdjvu
- dodoc README
-}
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
deleted file mode 100644
index 0b48d6bff02..00000000000
--- a/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/fbpdf.c b/fbpdf.c
-index 6caa08f..48d12f5 100644
---- a/fbpdf.c
-+++ b/fbpdf.c
-@@ -343,3 +343,3 @@ static void mainloop(void)
- static char *usage =
-- "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
-+ "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
-
-@@ -349,3 +349,3 @@ int main(int argc, char *argv[])
- if (argc < 2) {
-- printf(usage);
-+ puts(usage);
- return 1;
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
deleted file mode 100644
index 070b7c72ea2..00000000000
--- a/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/Makefile b/Makefile
-index f986689..374837f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,3 +13,3 @@ clean:
- fbpdf: fbpdf.o mupdf.o draw.o
-- $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdfthird -lcrypto -lm
-+ $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lcrypto -lm
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/fbpdf/, app-text/fbpdf/files/
@ 2019-02-05 22:49 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2019-02-05 22:49 UTC (permalink / raw
To: gentoo-commits
commit: 0f7d4766f5cdd7e1cde76e971fe90d9dd6087b8b
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 5 22:47:35 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Feb 5 22:49:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7d4766
app-text/fbpdf: bump snapshot up to 0_p20190202
Patch-by: "S. Gilles" <sgilles <AT> math.umd.edu>
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-text/fbpdf/Manifest | 1 +
app-text/fbpdf/fbpdf-0_p20190202.ebuild | 46 ++++++++++++++++++++++
.../files/fbpdf-0_p20190202-use-pkg-config.patch | 41 +++++++++++++++++++
3 files changed, 88 insertions(+)
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index ceec4784084..387dc549016 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1 +1,2 @@
DIST fbpdf-0_p20161202.tar.gz 7795 BLAKE2B 725fb49278ceee0e24bfbdaaa5f93cc78c448666e44ab426739be8db27ad3010911473af6766a45a569356fd322555962d9250f0d655e69594433b29c5d80325 SHA512 c122f12485b9e0055bd5b60d66a5034d20738c6a5a1a9f384ef8cb93e4c6b1275434eea884398590db2b06a746cc0ff00df29ecdc5faecc1730a022435164107
+DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
diff --git a/app-text/fbpdf/fbpdf-0_p20190202.ebuild b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
new file mode 100644
index 00000000000..029af2a8ece
--- /dev/null
+++ b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
+
+DESCRIPTION="framebuffer pdf and djvu viewer"
+HOMEPAGE="https://github.com/aligrudi/fbpdf"
+
+SRC_URI="https://github.com/aligrudi/fbpdf/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
+
+LICENSE="BSD ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=app-text/mupdf-1.10:0=
+ app-text/djvu:0=
+ dev-lang/mujs:0=
+ dev-libs/openssl:0=
+ !media-gfx/fbida[fbcon]
+ media-libs/freetype:2=
+ media-libs/jbig2dec:0=
+ media-libs/openjpeg:0=
+ virtual/jpeg:0=
+"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-${COMMIT}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-use-pkg-config.patch
+)
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin fbpdf fbdjvu
+ dodoc README
+}
diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch
new file mode 100644
index 00000000000..1f5751af75e
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch
@@ -0,0 +1,41 @@
+From 009acf3907bf36cfaa2cb09f16199cfdbe147a0c Mon Sep 17 00:00:00 2001
+From: "S. Gilles" <sgilles@math.umd.edu>
+Date: Mon, 4 Feb 2019 09:43:45 -0500
+Subject: [PATCH] use pkg-config
+
+---
+ Makefile | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -2,6 +2,7 @@ PREFIX = .
+ CC = cc
+ CFLAGS = -Wall -O2 -I$(PREFIX)/include
+ LDFLAGS = -L$(PREFIX)/lib
++PKG_CONFIG = pkg-config
+
+ all: fbpdf fbdjvu
+ %.o: %.c doc.h
+@@ -11,14 +12,14 @@ clean:
+
+ # pdf support using mupdf
+ fbpdf: fbpdf.o mupdf.o draw.o
+- $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdf-third -lmupdf-pkcs7 -lmupdf-threads -lm
++ $(CC) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs mupdf) -lm
+
+ # djvu support
+ fbdjvu: fbpdf.o djvulibre.o draw.o
+- $(CXX) -o $@ $^ $(LDFLAGS) -ldjvulibre -ljpeg -lm -lpthread
++ $(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs ddjvuapi) -ljpeg -lm -lpthread
+
+ # pdf support using poppler
+ poppler.o: poppler.c
+- $(CXX) -c $(CFLAGS) `pkg-config --cflags poppler-cpp` $<
++ $(CXX) -c $(CFLAGS) $(shell $(PKG_CONFIG) --cflags poppler-cpp) $<
+ fbpdf2: fbpdf.o poppler.o draw.o
+- $(CXX) -o $@ $^ $(LDFLAGS) `pkg-config --libs poppler-cpp`
++ $(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs poppler-cpp)
+--
+2.20.1
+
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/fbpdf/, app-text/fbpdf/files/
@ 2020-11-02 10:21 Sergei Trofimovich
0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2020-11-02 10:21 UTC (permalink / raw
To: gentoo-commits
commit: 2907618a6f57d32cc394be0b0ae357f3c7890c8a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 2 08:42:00 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 2 10:20:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2907618a
app-text/fbpdf: drop old
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-text/fbpdf/Manifest | 1 -
app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild | 43 ----------------------
.../fbpdf/files/fbpdf-0_p20190202-printf.patch | 38 -------------------
3 files changed, 82 deletions(-)
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index ef0e2b843e0..ab7e2ce1d18 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,2 +1 @@
-DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
DIST fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz 8432 BLAKE2B 0004f8558b86c349744a37099ef86963d368ee9dedeefca861761f88adc3c94a3db9f46c9e1a6f6026357512a8320b956cd7c48108aa6c6657b84193fd5d4b49 SHA512 e037cd536e3a26b6d2364eb52803de67606bac418db8691c7530a889c95dd1f8661985021237ce7fea95f56ab5a308caf8d470c6c036b51b17211f9c200aba51
diff --git a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild b/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
deleted file mode 100644
index 79bea0cffbd..00000000000
--- a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs vcs-snapshot
-
-COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
-
-DESCRIPTION="framebuffer pdf and djvu viewer"
-HOMEPAGE="https://github.com/aligrudi/fbpdf"
-
-SRC_URI="https://github.com/aligrudi/fbpdf/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
-
-LICENSE="BSD ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >=app-text/mupdf-1.10:0=
- app-text/djvu:0=
- !media-gfx/fbida[fbcon(-)]
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-${COMMIT}
-
-PATCHES=(
- "${FILESDIR}"/${P}-use-pkg-config.patch
- "${FILESDIR}"/${P}-printf.patch
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin fbpdf fbdjvu
- dodoc README
-}
diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
deleted file mode 100644
index 31f9fbe2c8a..00000000000
--- a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/714736
-
-From e89e36c01d09ca6aec03732e922e749257cac3f4 Mon Sep 17 00:00:00 2001
-From: Dmitry Bogatov <KAction@disroot.org>
-Date: Sun, 9 Feb 2020 00:47:09 -0500
-Subject: [PATCH] Avoid passing non-constant format string to printf
-
-gcc complains loudly on any code that uses anything but string literal
-as format string to printf. Right now format string is "const char *"
-and does not contain %-sequences, but should '%' appear in "usage"
-string in future, bad things would happen.
-
-Since formatting functionality of "printf" is not used anyway, replacing
-it with "puts" makes code both safer and easier to understand.
----
- fbpdf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fbpdf.c b/fbpdf.c
-index a58797f..65b654b 100644
---- a/fbpdf.c
-+++ b/fbpdf.c
-@@ -351,13 +351,13 @@ static void mainloop(void)
- }
-
- static char *usage =
-- "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
-+ "usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
-
- int main(int argc, char *argv[])
- {
- int i = 1;
- if (argc < 2) {
-- printf(usage);
-+ puts(usage);
- return 1;
- }
- strcpy(filename, argv[argc - 1]);
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-02 10:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-05 22:49 [gentoo-commits] repo/gentoo:master commit in: app-text/fbpdf/, app-text/fbpdf/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2020-11-02 10:21 Sergei Trofimovich
2019-02-05 22:49 Sergei Trofimovich
2017-07-02 9:44 Sergei Trofimovich
2017-01-23 21:57 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox