head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.94 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.92 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.90 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.88 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.86 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.84 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.82 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.80 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.78 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.76 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.74 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.72 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.70 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.68 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.66 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.64 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.62 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.60 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.58 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.56 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.54 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.52 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.50 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.46 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.26 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.48 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.44 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.42 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.40 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.38 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.36 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.34 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.32 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.30 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.28 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.24 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.22 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.20 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.18 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.16 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.14 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.12 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.10 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.8 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.6 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.4 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.2 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.3.0.22 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.20 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.18 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.16 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.14 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.12 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.2.0.16 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.14 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.12 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.10 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.8 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.6 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.4 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.1.0.50 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.48 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.46 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.44 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.42 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.40 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.38 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.36 pkgsrc-2008Q1:1.1.0.34 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.32 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.30 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.28 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.26 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.24 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.22 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.20 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.18 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.16 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.14 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.12 pkgsrc-2005Q2-base:1.1 pkgsrc-2005Q1:1.1.0.10 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.8 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.6 pkgsrc-2004Q3-base:1.1 pkgsrc-2004Q2:1.1.0.4 pkgsrc-2004Q2-base:1.1 pkgsrc-2004Q1:1.1.0.2 pkgsrc-2004Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2014.08.01.12.31.27; author tron; state Exp; branches; next 1.3; commitid rFMYsE9XiAVoLEKx; 1.3 date 2011.10.27.02.35.41; author tez; state Exp; branches 1.3.22.1; next 1.2; 1.2 date 2009.11.13.23.12.02; author christos; state Exp; branches 1.2.16.1; next 1.1; 1.1 date 2004.03.03.10.50.59; author adam; state Exp; branches; next ; 1.3.22.1 date 2014.08.03.18.06.12; author spz; state Exp; branches; next ; commitid kxoFlgLB5fEfyWKx; 1.2.16.1 date 2011.11.02.20.54.05; author tron; state Exp; branches; next ; desc @@ 1.4 log @Update "xpdf" package to version 3.04. Changes since version 3.03: - New text extractor. - Added the pdftohtml tool. - Added the pdftopng tool. - New trapezoid-based rasterizer core (for performance). - Generate appearance streams for Line, PolyLine, and Polygon annotations. - Added the closeWindowOrQuit command, and changed the default binding for ctrl-W from closeWindow to closeWindowOrQuit. - Implemented the new AES-256 mode (R=6, Acrobat X). - Add an object cache. - Added a small cache for object streams. - Modify PSOutputDev to use LZW compression instead of RLE, with a fallback to RLE if the "psLZW no" setting is given. - Pdfinfo now prints page rotation info. - Modified ImageOutputDev, used by pdfimages, to output the masks and soft masks used when drawing images. - Remove non-printable characters from error output, just in case they might cause problems for the terminal program. - Added initial support for Code3of9 bar codes in XFA forms. - Added the mapExtTrueTypeFontsViaUnicode xpdfrc command. - Apply stroke adjustment to rectangular images and clipping regions (in addition to strokes and fills). - Decode JPEG 2000 images at less than full resolution if the full res image isn't needed (i.e., if the raw image is higher resolution than the output). - Implemented knockout groups. - Removed t1lib support. - Added support for images with 16-bit components. - Rewrote the Dict class to use a hash table; as a side effect, this handles dictionaries with multiple definitions for a key, which are in violation of the spec, but Acrobat appears to handle. - The transformed line width computation -- used to implement the minLineWidth setting, and the hairline threshold in monochrome mode -- was incorrect. - Pdftops was not correctly handling the case where it couldn't find a 16-bit font -- this led to crashes and/or invalid PostScript. - A bug in FlateStream::getBlock() was causing problems with narrow images. - Use the correct _WIN32 define instead of WIN32. - Use copy-on-write for the clip path in SplashState (when doing gsave), for performance. - Added a Solaris-specific entry to the ghostscript font search path. - SplashState was initializing line width to 0 instead of 1. - Abort processing on a content stream after getting 500 errors (undefined operator, wrong number of args) -- this avoids very long processing time for malicious PDF files using bogus RLE encoded content streams. - Added the psUseCropBoxAsPage xpdfrc option; "pdftops -pagecrop" now sets psUseCropBoxAsPage; "pdftops -pagecrop -paper match" now uses the CropBox as the page size. - Re-architected the AcroForm support code into a separate AcroForm module. - Fixed the handling of overprinting/transparency interaction, using the CompatibleOverprint blend mode. - The TIFF predictor code for the 1-bit-per-pixel case was broken. - For triangle and patch mesh shadings (types 4-7) with color functions, interpolate the function parameter not the color. - Check the fontFile/fontDir commands before (instead of after) doing Base-14 substitution in PS output. - Correctly handle non-embedded TrueType fonts that have an Identity ToUnicode mapping (display and PS output were failing). - Added support for XFA form rendering, including an "enableXFA" xpdfrc setting. - Handle PFB Type 1 fonts when generating PostScript output. - Unwind any extraneous saved graphics state at the end of the page (before drawing annotations). - Added some integer overflow checks in the GString class. - Handle 16-bit components in JPEG 2000 images. - ActualText spans can end without a valid font, in which case TextPage::beginWord was crashing. - The Domain entry in function shadings wasn't being parsed correctly. - Fixed a bug in the JPEG decoder - successive approximation (progressive mode) coefficients weren't being handled correctly. - Added a better infinite loop test to the xref parser. - When generating PostScript, merge reused TrueType fonts (if their code-to-GID mappings are the same). - Tweak the Gouraud triangle shaded fill code to end the recursive splitting if the triangles get sufficiently small. - Do bilinear interpolation when upsampling images. - When skipping extraneous image data from an inline image, look for EI instead of just EI. - When writing to stdout on Windows, pdftoppm now sets the file mode to binary. [Thanks to Robert Frunzke.] - Accept strings as well as names for the BaseFont entry in font objects. - Removed the TEXTOUT_WORD_LIST config option (with the new text extractor, this is always enabled). - Fixed a bug in the JBIG2 decoder (the TPGD context for template #3 in readGenericBitmap was incorrect). - Rewrote the PostScriptFunction code for performance. - Handle 8-bit OpenType CFF fonts that are missing required tables in the OpenType wrapper. - Handle tiling patterns with reversed coordinates in their bounding boxes. - Added support for 64-bit file offsets, i.e., PDF files larger than 2GB. - Optimize the code that rasterizes pattern-filled image masks. - Added support for Mac OS X system fonts (Base-14 only). - The backdrop color in luminosity-type soft mask groups was not being handled correctly. - Modified behavior of "pdftops -paper match -duplex ..." - it will now duplex consecutive same-sized pages. - Tweak the handling of degenerate fills ('moveto lineto fill') to match Adobe. - Don't honor the OPM=1 setting with ICCBased CMYK color spaces. - Whole-word searches were treating certain punctuation (Unicode number separators and terminators) as part of the word, e.g., searching for "foo" would not match "foo,". - Use the TextString class everywhere it makes sense. - Removed the unnecessary segment sort in Splash (performance optimization). - Handle hyperlinks that use Widget-type annotations. - Fix up the integer overflow checks to avoid issues with clever compilers. [Thanks to Nickolai Zeldovich.] - Correctly handle streams with missing Length entries in damaged PDF files. - Added a compile-time option (LOAD_FONTS_FROM_MEM) to load fonts from memory rather than temporary files on disk. - Added the psRasterSliceSize xpdfrc option. - Fixed a case in the JPEG 2000 arithmetic decoder where extra data is present in packet i, and needs to be saved for use in packet i+1. - Fixed a bug in the JPEG 2000 decoder related to images with fewer than 8 bits per component. - Handle the case in PSOutputDev where slice size overflows a 32-bit integer. - Add (partial) support for TrueType cmap format 2. - Always pass FT_LOAD_NO_BITMAP to FreeType -- bitmaps apparently fail with rotated characters. - Support fonts specified in ExtGState dictionaries. - Annotations with empty Border arrays should not draw a border. - Fix the CMap parser to handle large CID ranges. - Check for Type 3 CharProcs that call q or Q before the d0/d1 operator, and treat them as uncacheable. - Invert the selection color when starting in reverse video mode. - Device{Gray,RGB,CMYK} cannot be mapped via a resource dict. - Changed the PS output for masked images (explicit and color key masking): use a plain old clip path instead of rectclip to avoid array overflows. - Check the StemSnapH/V arrays when converting Type 1C fonts to Type 1 - if there are any duplicate or out-of-order values, skip that StemSnapH/V array. - Added the psMinLineWidth xpdfrc setting. - Fix an obscure issue in converting TrueType fonts to Type 42, related to empty glyph descriptions (12 zero bytes). - Pdftops now reports an error if there were any I/O errors writing to the PS output file. - Fix vertical text (CJK fonts) in PS output -- offset the character origin correctly. - Increased the number of digits used by pdfimages for the image number from three to four. - Handle right-to-left (e.g., Arabic) ligatures correctly in the text extractor. - Added the -loc and -locPS options to pdffonts. - Extend the object parser recursion limit to cover Stream::addFilters() / Stream::makeFilters() - to avoid another possibility of stack overflow. - Disable FreeType autohinting, because it can fail badly with font subsets that use invalid glyph names -- except in the case of Type 1 fonts, which look much better with light autohinting. - Modified the rasterizer pipeline functions to process a scan line at a time (for performance). - Removed VMS build support (it hasn't been updated in ages). - Removed pdftotext's '-htmlmeta' option (use pdftohtml instead). - PSOutputDev's font/form setup code, and pdffonts, were not scanning soft mask groups in ExtGState dictionaries. - Invalid DCT input (e.g., from a damaged PDF file) could overflow the dctClip array. - When upsampling an image mask or image with a large resulting image size, do it in stream mode instead of prescaling the whole image (to avoid running out of memory). - Added infinite loop detection to pdffonts. @ text @$NetBSD$ Don't build command line utilities to avoid conflict with the "poppler-utils" package. --- xpdf/Makefile.in.orig 2014-05-28 19:50:50.000000000 +0100 +++ xpdf/Makefile.in 2014-08-01 13:18:36.000000000 +0100 @@@@ -19,7 +19,7 @@@@ SPLASHSRCDIR = $(srcdir)/../splash SPLASHLIBDIR = ../splash -CXXFLAGS = @@CXXFLAGS@@ @@DEFS@@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @@freetype2_CFLAGS@@ @@Sgm_CFLAGS@@ @@Xm_CFLAGS@@ @@Xt_CFLAGS@@ @@Xp_CFLAGS@@ @@Xext_CFLAGS@@ @@Xpm_CFLAGS@@ @@libpng_CFLAGS@@ @@libpaper_CFLAGS@@ @@X_CFLAGS@@ @@EXTRA_CFLAGS@@ +CXXFLAGS = @@CXXFLAGS@@ @@DEFS@@ -DPREFIX="\"@@prefix@@\"" -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @@freetype2_CFLAGS@@ @@Sgm_CFLAGS@@ @@Xm_CFLAGS@@ @@Xt_CFLAGS@@ @@Xp_CFLAGS@@ @@Xext_CFLAGS@@ @@Xpm_CFLAGS@@ @@libpng_CFLAGS@@ @@libpaper_CFLAGS@@ @@X_CFLAGS@@ @@EXTRA_CFLAGS@@ LDFLAGS = @@LDFLAGS@@ @@@@ -104,25 +104,13 @@@@ $(srcdir)/XpdfPluginAPI.cc \ $(srcdir)/XRef.cc \ $(srcdir)/Zoox.cc \ - $(srcdir)/pdftops.cc \ - $(srcdir)/pdftotext.cc \ - $(srcdir)/pdftohtml.cc \ - $(srcdir)/pdfinfo.cc \ - $(srcdir)/pdffonts.cc \ - $(srcdir)/pdfdetach.cc \ - $(srcdir)/pdftoppm.cc \ - $(srcdir)/pdftopng.cc \ - $(srcdir)/pdfimages.cc \ $(srcdir)/xpdf.cc #------------------------------------------------------------------------ -all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdftohtml$(EXE) \ - pdfinfo$(EXE) pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) \ - pdftopng$(EXE) pdfimages$(EXE) +all: xpdf$(EXE) -all-no-x: pdftops$(EXE) pdftotext$(EXE) pdftohtml$(EXE) pdfinfo$(EXE) \ - pdffonts$(EXE) pdfdetach$(EXE) pdfimages$(EXE) +all-no-x: #------------------------------------------------------------------------ @@@@ -188,496 +176,8 @@@@ #------------------------------------------------------------------------ -PDFTOPS_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - OptionalContent.o \ - Outline.o \ - Object.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PreScanOutputDev.o \ - PSOutputDev.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftops.o -PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ - $(OTHERLIBS) -lm - -pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \ - $(PDFTOPS_LIBS) - -#------------------------------------------------------------------------ - -PDFTOTEXT_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftotext.o -PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm - -pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \ - $(PDFTOTEXT_LIBS) - -#------------------------------------------------------------------------ - -PDFTOHTML_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - HTMLGen.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftohtml.o -PDFTOHTML_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ - $(OTHERLIBS) $(PNGLIBS) -lm - -pdftohtml$(EXE): $(PDFTOHTML_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftohtml$(EXE) $(PDFTOHTML_OBJS) \ - $(PDFTOHTML_LIBS) - -#------------------------------------------------------------------------ - -PDFINFO_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdfinfo.o -PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm - -pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \ - $(PDFINFO_LIBS) - -#------------------------------------------------------------------------ - -PDFFONTS_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdffonts.o -PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm - -pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \ - $(PDFFONTS_LIBS) - -#------------------------------------------------------------------------ - -PDFDETACH_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdfdetach.o -PDFDETACH_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm - -pdfdetach$(EXE): $(PDFDETACH_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfdetach$(EXE) $(PDFDETACH_OBJS) \ - $(PDFDETACH_LIBS) - -#------------------------------------------------------------------------ - -PDFTOPPM_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftoppm.o -PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ - $(OTHERLIBS) -lm - -pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \ - $(PDFTOPPM_LIBS) - -#------------------------------------------------------------------------ - -PDFTOPNG_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftopng.o -PDFTOPNG_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ - $(OTHERLIBS) $(PNGLIBS) -lm - -pdftopng$(EXE): $(PDFTOPNG_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftopng$(EXE) $(PDFTOPNG_OBJS) \ - $(PDFTOPNG_LIBS) - -#------------------------------------------------------------------------ - -PDFIMAGES_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - ImageOutputDev.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdfimages.o -PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm - -pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \ - $(PDFIMAGES_LIBS) - -#------------------------------------------------------------------------ - clean: rm -f $(XPDF_OBJS) xpdf$(EXE) - rm -f $(PDFTOPS_OBJS) pdftops$(EXE) - rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE) - rm -f $(PDFTOHTML_OBJS) pdftohtml$(EXE) - rm -f $(PDFINFO_OBJS) pdfinfo$(EXE) - rm -f $(PDFFONTS_OBJS) pdffonts$(EXE) - rm -f $(PDFDETACH_OBJS) pdfdetach$(EXE) - rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE) - rm -f $(PDFTOPNG_OBJS) pdftopng$(EXE) - rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE) #------------------------------------------------------------------------ @ 1.3 log @Update to 3.03 Fixes multiple vulnerabilites Change list too long to include here, see http://www.foolabs.com/xpdf/CHANGES (file does not note what changes were included in 3.02pl1 - 3.02pl4 and which are new for 3.03) @ text @d3 5 a7 2 --- xpdf/Makefile.in.orig 2011-08-15 16:08:53.000000000 -0500 +++ xpdf/Makefile.in 2011-10-26 20:22:58.948064100 -0500 d12 2 a13 2 -CXXFLAGS = @@CXXFLAGS@@ @@DEFS@@ -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @@freetype2_CFLAGS@@ @@Sgm_CFLAGS@@ @@Xm_CFLAGS@@ @@Xt_CFLAGS@@ @@Xp_CFLAGS@@ @@Xext_CFLAGS@@ @@Xpm_CFLAGS@@ @@t1_CFLAGS@@ @@libpaper_CFLAGS@@ @@X_CFLAGS@@ +CXXFLAGS = @@CXXFLAGS@@ @@DEFS@@ -DPREFIX="\"@@prefix@@\"" -I.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @@freetype2_CFLAGS@@ @@Sgm_CFLAGS@@ @@Xm_CFLAGS@@ @@Xt_CFLAGS@@ @@Xp_CFLAGS@@ @@Xext_CFLAGS@@ @@Xpm_CFLAGS@@ @@t1_CFLAGS@@ @@libpaper_CFLAGS@@ @@X_CFLAGS@@ d17 1 a17 2 @@@@ -97,22 +97,13 @@@@ $(srcdir)/XPDFViewer.cc \ d20 1 d23 1 d28 1 d34 3 a36 2 -all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) \ - pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE) d39 2 a40 2 -all-no-x: pdftops$(EXE) pdftotext$(EXE) pdfinfo$(EXE) pdffonts$(EXE) \ - pdfdetach$(EXE) pdfimages$(EXE) d45 1 a45 1 @@@@ -134,132 +125,8 @@@@ d49 47 a95 10 -PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o OptionalContent.o \ - Outline.o Object.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PreScanOutputDev.o PSOutputDev.o PSTokenizer.o \ - SecurityHandler.o SplashOutputDev.o Stream.o UnicodeMap.o \ - XpdfPluginAPI.o XRef.o pdftops.o -PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ d104 45 a148 9 -PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \ - XRef.o pdftotext.o d157 99 a255 8 -PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfinfo.o d264 43 a306 8 -PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdffonts.o d315 43 a357 8 -PDFDETACH_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfdetach.o d366 47 a412 10 -PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ - GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \ - Lexer.o Link.o NameToCharCode.o Object.o OptionalContent.o \ - Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ - PSTokenizer.o SecurityHandler.o SplashOutputDev.o Stream.o \ - TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \ - XRef.o pdftoppm.o -PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ d421 99 a519 8 -PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ - GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \ - JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfimages.o d532 1 d537 1 @ 1.3.22.1 log @Pullup ticket #4469 - requested by tron print/xpdf: security update Revisions pulled up: - print/xpdf/Makefile 1.81 - print/xpdf/distinfo 1.42 - print/xpdf/patches/patch-al 1.5 - print/xpdf/patches/patch-am 1.4 - print/xpdf/patches/patch-aq deleted - print/xpdf/patches/patch-ar deleted ------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Fri Aug 1 12:31:27 UTC 2014 Modified Files: pkgsrc/print/xpdf: Makefile distinfo pkgsrc/print/xpdf/patches: patch-al patch-am Removed Files: pkgsrc/print/xpdf/patches: patch-aq patch-ar Log Message: Update "xpdf" package to version 3.04. Changes since version 3.03: - New text extractor. - Added the pdftohtml tool. - Added the pdftopng tool. - New trapezoid-based rasterizer core (for performance). - Generate appearance streams for Line, PolyLine, and Polygon annotations. - Added the closeWindowOrQuit command, and changed the default binding for ctrl-W from closeWindow to closeWindowOrQuit. - Implemented the new AES-256 mode (R=3D6, Acrobat X). - Add an object cache. - Added a small cache for object streams. - Modify PSOutputDev to use LZW compression instead of RLE, with a fallback to RLE if the "psLZW no" setting is given. - Pdfinfo now prints page rotation info. - Modified ImageOutputDev, used by pdfimages, to output the masks and soft masks used when drawing images. - Remove non-printable characters from error output, just in case they might cause problems for the terminal program. - Added initial support for Code3of9 bar codes in XFA forms. - Added the mapExtTrueTypeFontsViaUnicode xpdfrc command. - Apply stroke adjustment to rectangular images and clipping regions (in addition to strokes and fills). - Decode JPEG 2000 images at less than full resolution if the full res image isn't needed (i.e., if the raw image is higher resolution than the output). - Implemented knockout groups. - Removed t1lib support. - Added support for images with 16-bit components. - Rewrote the Dict class to use a hash table; as a side effect, this handles dictionaries with multiple definitions for a key, which are in violation of the spec, but Acrobat appears to handle. - The transformed line width computation -- used to implement the minLineWidth setting, and the hairline threshold in monochrome mode -- was incorrect. - Pdftops was not correctly handling the case where it couldn't find a 16-bit font -- this led to crashes and/or invalid PostScript. - A bug in FlateStream::getBlock() was causing problems with narrow images. - Use the correct _WIN32 define instead of WIN32. - Use copy-on-write for the clip path in SplashState (when doing gsave), for performance. - Added a Solaris-specific entry to the ghostscript font search path. - SplashState was initializing line width to 0 instead of 1. - Abort processing on a content stream after getting 500 errors (undefined operator, wrong number of args) -- this avoids very long processing time for malicious PDF files using bogus RLE encoded content streams. - Added the psUseCropBoxAsPage xpdfrc option; "pdftops -pagecrop" now sets psUseCropBoxAsPage; "pdftops -pagecrop -paper match" now uses the CropBox as the page size. - Re-architected the AcroForm support code into a separate AcroForm module. - Fixed the handling of overprinting/transparency interaction, using the CompatibleOverprint blend mode. - The TIFF predictor code for the 1-bit-per-pixel case was broken. - For triangle and patch mesh shadings (types 4-7) with color functions, interpolate the function parameter not the color. - Check the fontFile/fontDir commands before (instead of after) doing Base-14 substitution in PS output. - Correctly handle non-embedded TrueType fonts that have an Identity ToUnicode mapping (display and PS output were failing). - Added support for XFA form rendering, including an "enableXFA" xpdfrc setting. - Handle PFB Type 1 fonts when generating PostScript output. - Unwind any extraneous saved graphics state at the end of the page (before drawing annotations). - Added some integer overflow checks in the GString class. - Handle 16-bit components in JPEG 2000 images. - ActualText spans can end without a valid font, in which case TextPage::beginWord was crashing. - The Domain entry in function shadings wasn't being parsed correctly. - Fixed a bug in the JPEG decoder - successive approximation (progressive mode) coefficients weren't being handled correctly. - Added a better infinite loop test to the xref parser. - When generating PostScript, merge reused TrueType fonts (if their code-to-GID mappings are the same). - Tweak the Gouraud triangle shaded fill code to end the recursive splitting if the triangles get sufficiently small. - Do bilinear interpolation when upsampling images. - When skipping extraneous image data from an inline image, look for EI instead of just EI. - When writing to stdout on Windows, pdftoppm now sets the file mode to binary. [Thanks to Robert Frunzke.] - Accept strings as well as names for the BaseFont entry in font objects. - Removed the TEXTOUT_WORD_LIST config option (with the new text extractor, this is always enabled). - Fixed a bug in the JBIG2 decoder (the TPGD context for template #3 in readGenericBitmap was incorrect). - Rewrote the PostScriptFunction code for performance. - Handle 8-bit OpenType CFF fonts that are missing required tables in the OpenType wrapper. - Handle tiling patterns with reversed coordinates in their bounding boxes. - Added support for 64-bit file offsets, i.e., PDF files larger than 2GB. - Optimize the code that rasterizes pattern-filled image masks. - Added support for Mac OS X system fonts (Base-14 only). - The backdrop color in luminosity-type soft mask groups was not being handled correctly. - Modified behavior of "pdftops -paper match -duplex ..." - it will now duplex consecutive same-sized pages. - Tweak the handling of degenerate fills ('moveto lineto fill') to match Adobe. - Don't honor the OPM=3D1 setting with ICCBased CMYK color spaces. - Whole-word searches were treating certain punctuation (Unicode number separators and terminators) as part of the word, e.g., searching for "foo" would not match "foo,". - Use the TextString class everywhere it makes sense. - Removed the unnecessary segment sort in Splash (performance optimization). - Handle hyperlinks that use Widget-type annotations. - Fix up the integer overflow checks to avoid issues with clever compilers. [Thanks to Nickolai Zeldovich.] - Correctly handle streams with missing Length entries in damaged PDF files. - Added a compile-time option (LOAD_FONTS_FROM_MEM) to load fonts from memory rather than temporary files on disk. - Added the psRasterSliceSize xpdfrc option. - Fixed a case in the JPEG 2000 arithmetic decoder where extra data is present in packet i, and needs to be saved for use in packet i+1. - Fixed a bug in the JPEG 2000 decoder related to images with fewer than 8 bits per component. - Handle the case in PSOutputDev where slice size overflows a 32-bit integer. - Add (partial) support for TrueType cmap format 2. - Always pass FT_LOAD_NO_BITMAP to FreeType -- bitmaps apparently fail with rotated characters. - Support fonts specified in ExtGState dictionaries. - Annotations with empty Border arrays should not draw a border. - Fix the CMap parser to handle large CID ranges. - Check for Type 3 CharProcs that call q or Q before the d0/d1 operator, and treat them as uncacheable. - Invert the selection color when starting in reverse video mode. - Device{Gray,RGB,CMYK} cannot be mapped via a resource dict. - Changed the PS output for masked images (explicit and color key masking): use a plain old clip path instead of rectclip to avoid array overflows. - Check the StemSnapH/V arrays when converting Type 1C fonts to Type 1 - if there are any duplicate or out-of-order values, skip that StemSnapH/V array. - Added the psMinLineWidth xpdfrc setting. - Fix an obscure issue in converting TrueType fonts to Type 42, related to empty glyph descriptions (12 zero bytes). - Pdftops now reports an error if there were any I/O errors writing to the PS output file. - Fix vertical text (CJK fonts) in PS output -- offset the character origin correctly. - Increased the number of digits used by pdfimages for the image number from three to four. - Handle right-to-left (e.g., Arabic) ligatures correctly in the text extractor. - Added the -loc and -locPS options to pdffonts. - Extend the object parser recursion limit to cover Stream::addFilters() / Stream::makeFilters() - to avoid another possibility of stack overflow. - Disable FreeType autohinting, because it can fail badly with font subsets that use invalid glyph names -- except in the case of Type 1 fonts, which look much better with light autohinting. - Modified the rasterizer pipeline functions to process a scan line at a time (for performance). - Removed VMS build support (it hasn't been updated in ages). - Removed pdftotext's '-htmlmeta' option (use pdftohtml instead). - PSOutputDev's font/form setup code, and pdffonts, were not scanning soft mask groups in ExtGState dictionaries. - Invalid DCT input (e.g., from a damaged PDF file) could overflow the dctClip array. - When upsampling an image mask or image with a large resulting image size, do it in stream mode instead of prescaling the whole image (to avoid running out of memory). - Added infinite loop detection to pdffonts. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 pkgsrc/print/xpdf/Makefile cvs rdiff -u -r1.41 -r1.42 pkgsrc/print/xpdf/distinfo cvs rdiff -u -r1.4 -r1.5 pkgsrc/print/xpdf/patches/patch-al cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/xpdf/patches/patch-am cvs rdiff -u -r1.4 -r0 pkgsrc/print/xpdf/patches/patch-aq \ pkgsrc/print/xpdf/patches/patch-ar @ text @d3 2 a4 5 Don't build command line utilities to avoid conflict with the "poppler-utils" package. --- xpdf/Makefile.in.orig 2014-05-28 19:50:50.000000000 +0100 +++ xpdf/Makefile.in 2014-08-01 13:18:36.000000000 +0100 d9 2 a10 2 -CXXFLAGS = @@CXXFLAGS@@ @@DEFS@@ -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @@freetype2_CFLAGS@@ @@Sgm_CFLAGS@@ @@Xm_CFLAGS@@ @@Xt_CFLAGS@@ @@Xp_CFLAGS@@ @@Xext_CFLAGS@@ @@Xpm_CFLAGS@@ @@libpng_CFLAGS@@ @@libpaper_CFLAGS@@ @@X_CFLAGS@@ @@EXTRA_CFLAGS@@ +CXXFLAGS = @@CXXFLAGS@@ @@DEFS@@ -DPREFIX="\"@@prefix@@\"" -I.. -I$(srcdir)/.. -I$(GOOSRCDIR) -I$(FOFISRCDIR) -I$(SPLASHSRCDIR) -I$(srcdir) @@freetype2_CFLAGS@@ @@Sgm_CFLAGS@@ @@Xm_CFLAGS@@ @@Xt_CFLAGS@@ @@Xp_CFLAGS@@ @@Xext_CFLAGS@@ @@Xpm_CFLAGS@@ @@libpng_CFLAGS@@ @@libpaper_CFLAGS@@ @@X_CFLAGS@@ @@EXTRA_CFLAGS@@ d14 2 a15 1 @@@@ -104,25 +104,13 @@@@ a17 1 $(srcdir)/Zoox.cc \ a19 1 - $(srcdir)/pdftohtml.cc \ a23 1 - $(srcdir)/pdftopng.cc \ d29 2 a30 3 -all: xpdf$(EXE) pdftops$(EXE) pdftotext$(EXE) pdftohtml$(EXE) \ - pdfinfo$(EXE) pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) \ - pdftopng$(EXE) pdfimages$(EXE) d33 2 a34 2 -all-no-x: pdftops$(EXE) pdftotext$(EXE) pdftohtml$(EXE) pdfinfo$(EXE) \ - pdffonts$(EXE) pdfdetach$(EXE) pdfimages$(EXE) d39 1 a39 1 @@@@ -188,496 +176,8 @@@@ d43 10 a52 47 -PDFTOPS_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - OptionalContent.o \ - Outline.o \ - Object.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PreScanOutputDev.o \ - PSOutputDev.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftops.o -PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ d61 9 a69 45 -PDFTOTEXT_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftotext.o d78 8 a85 99 -PDFTOHTML_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - HTMLGen.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftohtml.o -PDFTOHTML_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ - $(OTHERLIBS) $(PNGLIBS) -lm - -pdftohtml$(EXE): $(PDFTOHTML_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftohtml$(EXE) $(PDFTOHTML_OBJS) \ - $(PDFTOHTML_LIBS) - -#------------------------------------------------------------------------ - -PDFINFO_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdfinfo.o d94 8 a101 43 -PDFFONTS_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdffonts.o d110 8 a117 43 -PDFDETACH_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdfdetach.o d126 10 a135 47 -PDFTOPPM_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftoppm.o -PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ d144 8 a151 99 -PDFTOPNG_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - SplashOutputDev.o \ - Stream.o \ - TextOutputDev.o \ - TextString.o \ - UnicodeMap.o \ - UnicodeTypeTable.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdftopng.o -PDFTOPNG_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(FTLIBS) \ - $(OTHERLIBS) $(PNGLIBS) -lm - -pdftopng$(EXE): $(PDFTOPNG_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftopng$(EXE) $(PDFTOPNG_OBJS) \ - $(PDFTOPNG_LIBS) - -#------------------------------------------------------------------------ - -PDFIMAGES_OBJS = \ - AcroForm.o \ - Annot.o \ - Array.o \ - BuiltinFont.o \ - BuiltinFontTables.o \ - Catalog.o \ - CharCodeToUnicode.o \ - CMap.o \ - Decrypt.o \ - Dict.o \ - Error.o \ - FontEncodingTables.o \ - Form.o \ - Function.o \ - Gfx.o \ - GfxFont.o \ - GfxState.o \ - GlobalParams.o \ - ImageOutputDev.o \ - JArithmeticDecoder.o \ - JBIG2Stream.o \ - JPXStream.o \ - Lexer.o \ - Link.o \ - NameToCharCode.o \ - Object.o \ - OptionalContent.o \ - Outline.o \ - OutputDev.o \ - Page.o \ - Parser.o \ - PDFDoc.o \ - PDFDocEncoding.o \ - PSTokenizer.o \ - SecurityHandler.o \ - Stream.o \ - TextString.o \ - UnicodeMap.o \ - XFAForm.o \ - XpdfPluginAPI.o \ - XRef.o \ - Zoox.o \ - pdfimages.o a163 1 - rm -f $(PDFTOHTML_OBJS) pdftohtml$(EXE) a167 1 - rm -f $(PDFTOPNG_OBJS) pdftopng$(EXE) @ 1.2 log @make those not conflict, by using the poppler version of the pdftofoo programs. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 2004/03/03 10:50:59 adam Exp $ d3 2 a4 2 --- xpdf/Makefile.in.orig 2004-01-22 01:26:45.000000000 +0000 +++ xpdf/Makefile.in d14 1 a14 1 @@@@ -96,21 +96,13 @@@@ d22 1 d30 2 a31 2 - pdffonts$(EXE) pdftoppm$(EXE) pdfimages$(EXE) +all: xpdf$(EXE) d34 1 a34 1 - pdfimages$(EXE) d39 1 a39 1 @@@@ -132,102 +124,102 @@@@ d47 5 a51 5 - JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \ - OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ - PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \ - SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ - pdftops.o d65 5 a69 4 - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ - OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \ - UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o d82 4 a85 4 - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ - OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ - pdfinfo.o d98 4 a101 4 - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ - OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ - pdffonts.o d110 16 d130 5 a134 4 - Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \ - Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ - SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \ - UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o d149 3 a151 3 - Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ - PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \ - XpdfPluginAPI.o XRef.o pdfimages.o d157 3 a159 101 +#PDFTOPS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +# JPXStream.o Lexer.o Link.o NameToCharCode.o Outline.o Object.o \ +# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ +# PreScanOutputDev.o PSOutputDev.o PSTokenizer.o SecurityHandler.o \ +# SplashOutputDev.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ +# pdftops.o +#PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ +# $(OTHERLIBS) -lm +# +#pdftops$(EXE): $(PDFTOPS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftops$(EXE) $(PDFTOPS_OBJS) \ +# $(PDFTOPS_LIBS) + +#------------------------------------------------------------------------ + +#PDFTOTEXT_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ +# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +# SecurityHandler.o Stream.o TextOutputDev.o UnicodeMap.o \ +# UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftotext.o +#PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +# +#pdftotext$(EXE): $(PDFTOTEXT_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftotext$(EXE) $(PDFTOTEXT_OBJS) \ +# $(PDFTOTEXT_LIBS) + +#------------------------------------------------------------------------ + +#PDFINFO_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ +# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ +# pdfinfo.o +#PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +# +#pdfinfo$(EXE): $(PDFINFO_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfinfo$(EXE) $(PDFINFO_OBJS) \ +# $(PDFINFO_LIBS) + +#------------------------------------------------------------------------ + +#PDFFONTS_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +# FontEncodingTables.o Function.o Gfx.o GfxFont.o \ +# GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ +# JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o Outline.o \ +# OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +# SecurityHandler.o Stream.o UnicodeMap.o XpdfPluginAPI.o XRef.o \ +# pdffonts.o +#PDFFONTS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +# +#pdffonts$(EXE): $(PDFFONTS_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdffonts$(EXE) $(PDFFONTS_OBJS) \ +# $(PDFFONTS_LIBS) + +#------------------------------------------------------------------------ + +#PDFTOPPM_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ +# GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o JPXStream.o \ +# Lexer.o Link.o NameToCharCode.o Object.o Outline.o OutputDev.o \ +# Page.o Parser.o PDFDoc.o PDFDocEncoding.o PSTokenizer.o \ +# SecurityHandler.o SplashOutputDev.o Stream.o TextOutputDev.o \ +# UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o XRef.o pdftoppm.o +#PDFTOPPM_LIBS = -L$(GOOLIBDIR) -lGoo $(SPLASHLIBS) $(T1LIBS) $(FTLIBS) \ +# $(OTHERLIBS) -lm +# +#pdftoppm$(EXE): $(PDFTOPPM_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdftoppm$(EXE) $(PDFTOPPM_OBJS) \ +# $(PDFTOPPM_LIBS) + +#------------------------------------------------------------------------ + +#PDFIMAGES_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ +# Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ +# FontEncodingTables.o Function.o Gfx.o GfxFont.o GfxState.o \ +# GlobalParams.o ImageOutputDev.o JArithmeticDecoder.o \ +# JBIG2Stream.o JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ +# Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ +# PSTokenizer.o SecurityHandler.o Stream.o UnicodeMap.o \ +# XpdfPluginAPI.o XRef.o pdfimages.o +#PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm +# +#pdfimages$(EXE): $(PDFIMAGES_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a +# $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfimages$(EXE) $(PDFIMAGES_OBJS) \ +# $(PDFIMAGES_LIBS) #------------------------------------------------------------------------ @@@@ -239,12 +231,12 @@@@ d166 1 a168 6 +# rm -f $(PDFTOPS_OBJS) pdftops$(EXE) +# rm -f $(PDFTOTEXT_OBJS) pdftotext$(EXE) +# rm -f $(PDFINFO_OBJS) pdfinfo$(EXE) +# rm -f $(PDFFONTS_OBJS) pdffonts$(EXE) +# rm -f $(PDFTOPPM_OBJS) pdftoppm$(EXE) +# rm -f $(PDFIMAGES_OBJS) pdfimages$(EXE) @ 1.2.16.1 log @Pullup ticket #3587 - requested by tez print/xpdf: security update Revisions pulled up: - print/xpdf/MESSAGE 1.4 - print/xpdf/Makefile 1.75 - print/xpdf/distinfo 1.40 - print/xpdf/patches/patch-aa 1.8 - print/xpdf/patches/patch-ab deleted - print/xpdf/patches/patch-ai 1.4 - print/xpdf/patches/patch-ak 1.6 - print/xpdf/patches/patch-al 1.4 - print/xpdf/patches/patch-am 1.3 - print/xpdf/patches/patch-an deleted - print/xpdf/patches/patch-aq 1.4 - print/xpdf/patches/patch-bb deleted - print/xpdf/patches/patch-bc 1.2 - print/xpdf/patches/patch-bd deleted --- Module Name: pkgsrc Committed By: tez Date: Thu Oct 27 02:35:41 UTC 2011 Modified Files: pkgsrc/print/xpdf: Makefile distinfo pkgsrc/print/xpdf/patches: patch-aa patch-ai patch-ak patch-al patch-am patch-aq patch-bc Removed Files: pkgsrc/print/xpdf/patches: patch-ab patch-an patch-bb patch-bd Log Message: Update to 3.03 Fixes multiple vulnerabilites Change list too long to include here, see http://www.foolabs.com/xpdf/CHANGES (file does not note what changes were included in 3.02pl1 - 3.02pl4 and which are new for 3.03) --- Module Name: pkgsrc Committed By: tez Date: Thu Oct 27 14:54:41 UTC 2011 Added Files: pkgsrc/print/xpdf: MESSAGE Log Message: Add MESSAGE to notify users of change in xpdfrc commands. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- xpdf/Makefile.in.orig 2011-08-15 16:08:53.000000000 -0500 +++ xpdf/Makefile.in 2011-10-26 20:22:58.948064100 -0500 d14 1 a14 1 @@@@ -97,22 +97,13 @@@@ a21 1 - $(srcdir)/pdfdetach.cc \ d29 2 a30 2 - pdffonts$(EXE) pdfdetach$(EXE) pdftoppm$(EXE) pdfimages$(EXE) +all: xpdf$(EXE) d33 1 a33 1 - pdfdetach$(EXE) pdfimages$(EXE) d38 1 a38 1 @@@@ -134,132 +125,8 @@@@ d46 5 a50 5 - JPXStream.o Lexer.o Link.o NameToCharCode.o OptionalContent.o \ - Outline.o Object.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PreScanOutputDev.o PSOutputDev.o PSTokenizer.o \ - SecurityHandler.o SplashOutputDev.o Stream.o UnicodeMap.o \ - XpdfPluginAPI.o XRef.o pdftops.o d64 4 a67 5 - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \ - XRef.o pdftotext.o d80 4 a83 4 - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfinfo.o d96 4 a99 4 - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdffonts.o a107 16 -PDFDETACH_OBJS = Annot.o Array.o BuiltinFont.o BuiltinFontTables.o \ - Catalog.o CharCodeToUnicode.o CMap.o Decrypt.o Dict.o Error.o \ - FontEncodingTables.o Function.o Gfx.o GfxFont.o \ - GfxState.o GlobalParams.o JArithmeticDecoder.o JBIG2Stream.o \ - JPXStream.o Lexer.o Link.o NameToCharCode.o Object.o \ - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfdetach.o -PDFDETACH_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm - -pdfdetach$(EXE): $(PDFDETACH_OBJS) $(GOOLIBDIR)/$(LIBPREFIX)Goo.a - $(CXX) $(CXXFLAGS) $(LDFLAGS) -o pdfdetach$(EXE) $(PDFDETACH_OBJS) \ - $(PDFDETACH_LIBS) - -#------------------------------------------------------------------------ - d112 4 a115 5 - Lexer.o Link.o NameToCharCode.o Object.o OptionalContent.o \ - Outline.o OutputDev.o Page.o Parser.o PDFDoc.o PDFDocEncoding.o \ - PSTokenizer.o SecurityHandler.o SplashOutputDev.o Stream.o \ - TextOutputDev.o UnicodeMap.o UnicodeTypeTable.o XpdfPluginAPI.o \ - XRef.o pdftoppm.o d130 3 a132 3 - OptionalContent.o Outline.o OutputDev.o Page.o Parser.o PDFDoc.o \ - PDFDocEncoding.o PSTokenizer.o SecurityHandler.o Stream.o \ - UnicodeMap.o XpdfPluginAPI.o XRef.o pdfimages.o d138 101 a238 3 - -#------------------------------------------------------------------------ - a244 1 - rm -f $(PDFDETACH_OBJS) pdfdetach$(EXE) d247 6 @ 1.1 log @Changes 3.00: * New PDF rasterizer ("Splash"). * Added support for PDF 1.5. * Replaced pdftopbm with pdftoppm (which can generate PBM, PGM, and PPM files). @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -19,7 +19,7 @@@@ FOFILIBDIR = ../fofi d14 242 @