summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2019-02-05 22:47:35 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2019-02-05 22:49:19 +0000
commit0f7d4766f5cdd7e1cde76e971fe90d9dd6087b8b (patch)
tree9d14b8b8b40e7ce4d7c484d04131b2613513522c /app-text/fbpdf/files
parentdev-python/cairocffi: remove unused patch. (diff)
downloadgentoo-0f7d4766f5cdd7e1cde76e971fe90d9dd6087b8b.tar.gz
gentoo-0f7d4766f5cdd7e1cde76e971fe90d9dd6087b8b.tar.bz2
gentoo-0f7d4766f5cdd7e1cde76e971fe90d9dd6087b8b.zip
app-text/fbpdf: bump snapshot up to 0_p20190202
Patch-by: "S. Gilles" <sgilles@math.umd.edu> Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-text/fbpdf/files')
-rw-r--r--app-text/fbpdf/files/fbpdf-0_p20190202-use-pkg-config.patch41
1 files changed, 41 insertions, 0 deletions
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 000000000000..1f5751af75e1
--- /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
+