diff options
Diffstat (limited to 'print/poppler/patches/patch-ab')
| -rw-r--r-- | print/poppler/patches/patch-ab | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab index f08326965c1..7cd37a722fc 100644 --- a/print/poppler/patches/patch-ab +++ b/print/poppler/patches/patch-ab @@ -1,25 +1,26 @@ -$NetBSD: patch-ab,v 1.19 2016/04/15 14:36:21 wiz Exp $ +$NetBSD: patch-ab,v 1.20 2016/05/22 18:17:17 wiz Exp $ Use installed poppler library so we can have a separate poppler-utils package. Always build pdftoppm. ---- utils/Makefile.in.orig 2016-03-16 22:22:14.000000000 +0000 +--- utils/Makefile.in.orig 2016-05-21 16:59:39.000000000 +0000 +++ utils/Makefile.in -@@ -96,9 +96,9 @@ host_triplet = @host@ +@@ -96,10 +96,10 @@ host_triplet = @host@ @BUILD_UTILS_TRUE@ pdfunite$(EXEEXT) $(am__EXEEXT_1) \ @BUILD_UTILS_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3) @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_1 = pdfsig -@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_2 = pdftoppm +am__append_2 = pdftoppm @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_3 = pdftocairo --@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdftoppm.1 -+am__append_4 = pdftoppm.1 - @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftocairo.1 - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_6 = $(LCMS_CFLAGS) - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_LIBS) -@@ -128,8 +128,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__append_4 = pdfsig.1 +-@BUILD_SPLASH_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_5 = pdftoppm.1 ++am__append_5 = pdftoppm.1 + @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__append_6 = pdftocairo.1 + @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_7 = $(LCMS_CFLAGS) + @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__append_8 = $(LCMS_LIBS) +@@ -129,8 +129,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = @BUILD_NSS_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_1 = pdfsig$(EXEEXT) @@ -30,7 +31,7 @@ Always build pdftoppm. @BUILD_CAIRO_OUTPUT_TRUE@@BUILD_UTILS_TRUE@am__EXEEXT_3 = pdftocairo$(EXEEXT) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) -@@ -137,44 +137,44 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX +@@ -138,44 +138,44 @@ am_pdfdetach_OBJECTS = pdfdetach.$(OBJEX pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) pdfdetach_LDADD = $(LDADD) pdfdetach_DEPENDENCIES = libparseargs.la \ @@ -83,7 +84,7 @@ Always build pdftoppm. $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ $(am__DEPENDENCIES_2) am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \ -@@ -183,7 +183,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht +@@ -184,7 +184,7 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) pdftohtml_DEPENDENCIES = libparseargs.la \ @@ -92,7 +93,7 @@ Always build pdftoppm. pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -191,22 +191,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) +@@ -192,22 +192,22 @@ am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) pdftoppm_LDADD = $(LDADD) pdftoppm_DEPENDENCIES = libparseargs.la \ @@ -119,7 +120,7 @@ Always build pdftoppm. AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false -@@ -549,8 +549,9 @@ AM_CPPFLAGS = \ +@@ -550,8 +550,9 @@ AM_CPPFLAGS = \ LDADD = \ libparseargs.la \ @@ -131,7 +132,7 @@ Always build pdftoppm. @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ @BUILD_UTILS_TRUE@ pdfinfo.1 pdftops.1 pdftotext.1 pdftohtml.1 \ -@@ -615,7 +616,7 @@ pdftocairo_SOURCES = \ +@@ -616,7 +617,7 @@ pdftocairo_SOURCES = \ pdftocairo-win32.h pdftocairo_LDADD = \ |