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: Tue, 05 Feb 2019 22:49:31
Message-Id: 1549406959.0f7d4766f5cdd7e1cde76e971fe90d9dd6087b8b.slyfox@gentoo
1 commit: 0f7d4766f5cdd7e1cde76e971fe90d9dd6087b8b
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 5 22:47:35 2019 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 5 22:49:19 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f7d4766
7
8 app-text/fbpdf: bump snapshot up to 0_p20190202
9
10 Patch-by: "S. Gilles" <sgilles <AT> math.umd.edu>
11 Package-Manager: Portage-2.3.59, Repoman-2.3.12
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 app-text/fbpdf/Manifest | 1 +
15 app-text/fbpdf/fbpdf-0_p20190202.ebuild | 46 ++++++++++++++++++++++
16 .../files/fbpdf-0_p20190202-use-pkg-config.patch | 41 +++++++++++++++++++
17 3 files changed, 88 insertions(+)
18
19 diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
20 index ceec4784084..387dc549016 100644
21 --- a/app-text/fbpdf/Manifest
22 +++ b/app-text/fbpdf/Manifest
23 @@ -1 +1,2 @@
24 DIST fbpdf-0_p20161202.tar.gz 7795 BLAKE2B 725fb49278ceee0e24bfbdaaa5f93cc78c448666e44ab426739be8db27ad3010911473af6766a45a569356fd322555962d9250f0d655e69594433b29c5d80325 SHA512 c122f12485b9e0055bd5b60d66a5034d20738c6a5a1a9f384ef8cb93e4c6b1275434eea884398590db2b06a746cc0ff00df29ecdc5faecc1730a022435164107
25 +DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
26
27 diff --git a/app-text/fbpdf/fbpdf-0_p20190202.ebuild b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
28 new file mode 100644
29 index 00000000000..029af2a8ece
30 --- /dev/null
31 +++ b/app-text/fbpdf/fbpdf-0_p20190202.ebuild
32 @@ -0,0 +1,46 @@
33 +# Copyright 1999-2019 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +
38 +inherit toolchain-funcs vcs-snapshot
39 +
40 +COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
41 +
42 +DESCRIPTION="framebuffer pdf and djvu viewer"
43 +HOMEPAGE="https://github.com/aligrudi/fbpdf"
44 +
45 +SRC_URI="https://github.com/aligrudi/fbpdf/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT}.tar.gz"
46 +
47 +LICENSE="BSD ISC"
48 +SLOT="0"
49 +KEYWORDS="~amd64 ~x86"
50 +
51 +RDEPEND="
52 + >=app-text/mupdf-1.10:0=
53 + app-text/djvu:0=
54 + dev-lang/mujs:0=
55 + dev-libs/openssl:0=
56 + !media-gfx/fbida[fbcon]
57 + media-libs/freetype:2=
58 + media-libs/jbig2dec:0=
59 + media-libs/openjpeg:0=
60 + virtual/jpeg:0=
61 +"
62 +
63 +DEPEND="${RDEPEND}"
64 +
65 +S=${WORKDIR}/${P}-${COMMIT}
66 +
67 +PATCHES=(
68 + "${FILESDIR}"/${P}-use-pkg-config.patch
69 +)
70 +
71 +src_compile() {
72 + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
73 +}
74 +
75 +src_install() {
76 + dobin fbpdf fbdjvu
77 + dodoc README
78 +}
79
80 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
81 new file mode 100644
82 index 00000000000..1f5751af75e
83 --- /dev/null
84 +++ b/app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch
85 @@ -0,0 +1,41 @@
86 +From 009acf3907bf36cfaa2cb09f16199cfdbe147a0c Mon Sep 17 00:00:00 2001
87 +From: "S. Gilles" <sgilles@××××××××.edu>
88 +Date: Mon, 4 Feb 2019 09:43:45 -0500
89 +Subject: [PATCH] use pkg-config
90 +
91 +---
92 + Makefile | 9 +++++----
93 + 1 file changed, 5 insertions(+), 4 deletions(-)
94 +
95 +--- a/Makefile
96 ++++ b/Makefile
97 +@@ -2,6 +2,7 @@ PREFIX = .
98 + CC = cc
99 + CFLAGS = -Wall -O2 -I$(PREFIX)/include
100 + LDFLAGS = -L$(PREFIX)/lib
101 ++PKG_CONFIG = pkg-config
102 +
103 + all: fbpdf fbdjvu
104 + %.o: %.c doc.h
105 +@@ -11,14 +12,14 @@ clean:
106 +
107 + # pdf support using mupdf
108 + fbpdf: fbpdf.o mupdf.o draw.o
109 +- $(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdf-third -lmupdf-pkcs7 -lmupdf-threads -lm
110 ++ $(CC) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs mupdf) -lm
111 +
112 + # djvu support
113 + fbdjvu: fbpdf.o djvulibre.o draw.o
114 +- $(CXX) -o $@ $^ $(LDFLAGS) -ldjvulibre -ljpeg -lm -lpthread
115 ++ $(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs ddjvuapi) -ljpeg -lm -lpthread
116 +
117 + # pdf support using poppler
118 + poppler.o: poppler.c
119 +- $(CXX) -c $(CFLAGS) `pkg-config --cflags poppler-cpp` $<
120 ++ $(CXX) -c $(CFLAGS) $(shell $(PKG_CONFIG) --cflags poppler-cpp) $<
121 + fbpdf2: fbpdf.o poppler.o draw.o
122 +- $(CXX) -o $@ $^ $(LDFLAGS) `pkg-config --libs poppler-cpp`
123 ++ $(CXX) -o $@ $^ $(LDFLAGS) $(shell $(PKG_CONFIG) --libs poppler-cpp)
124 +--
125 +2.20.1
126 +