diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-10 15:40:27 +0000 |
| commit | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (patch) | |
| tree | cee0a97398040001220ece3cd48c3d568bcddb4a /app-text/fbpdf/files | |
| parent | 1db00cc6e94b90c08090bb5b8c406622946c4ae5 (diff) | |
gentoo resync : 10.02.2019
Diffstat (limited to 'app-text/fbpdf/files')
3 files changed, 41 insertions, 23 deletions
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 0b48d6bff020..000000000000 --- 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 070b7c72ea26..000000000000 --- 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 - 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 + |