summaryrefslogtreecommitdiff
path: root/Build/source/libs/xpdf/xpdf-3.04-PATCHES
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-3.04-PATCHES')
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/ChangeLog149
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/TL-Changes6
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM23
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-20-skip-reading-config-file60
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-22-exclude-openTempFile34
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-30-include-strings_h15
-rw-r--r--Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-40-W32TeX29
7 files changed, 316 insertions, 0 deletions
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/ChangeLog
new file mode 100644
index 00000000000..409f65cad84
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/ChangeLog
@@ -0,0 +1,149 @@
+2014-05-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported xpdf-3.04 source tree:
+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz
+
+ * patch-10-exclude-body-of-Page_getDefaultCTM,
+ patch-20-skip-reading-config-file,
+ patch-22-exclude-openTempFile, patch-30-include-strings_h,
+ patch-40-W32TeX: Adapted.
+
+2012-10-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-12-mingw32 (removed): The library now needs '-lgdi32'.
+ * patch-20-skip-reading-config-file: Less intrusive solution.
+ * patch-30-include-strings_h: Adapted.
+
+ * patch-40-W32TeX (new): Remove TL vs W32TeX diffs (from Akira).
+
+2012-05-16 Vladimir Volovich <vvv@vsu.ru>
+
+ * patch-30-include-strings_h (new): Bug fix for AIX 4.3 and xlc.
+ The Posix manpage says strcasecmp() is declared in <strings.h>.
+
+2011-08-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-40-objectStream-support-for-pdftosrc: Removed, no longer
+ required with new logic for Object Streams in pdftosrc.cc.
+
+2011-08-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported xpdf-3.03 source tree:
+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz
+
+ * patch-0?-pl?, patch-11-time_h, patch-15-fix-pow-arg,
+ patch-60-bug-fix: Removed, now in distribution.
+ * patch-10-exclude-body-of-Page_getDefaultCTM, patch-12-mingw32,
+ patch-20-skip-reading-config-file,
+ patch-22-exclude-openTempFile,
+ patch-40-objectStream-support-for-pdftosrc: Adapted.
+
+2010-12-02 Karl Berry <karl@tug.org>
+
+ * patch-60-bug-fix: update with Thanh's comments.
+
+2010-12-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-60-bug-fix (new): Bug fix for 4-digit bfrange values in
+ ToUnicode CMap; backport from poppler-0.14.5.
+ Mail from Thanh Han The, Wed, 1 Dec 2010 08:57:29, ref:
+ http://sarovar.org/tracker/index.php?func=detail&aid=4321&group_id=106&atid=493
+
+2010-10-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-05-pl5 (new): Official 3.02pl5 patch plus change of
+ xpdfVersion "3.02pl4" -> "3.02pl5"
+
+2010-04-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-45-getmetadatanf (removed): unnecessary.
+
+2010-04-06 Hartmut Henkel <hartmut_henkel@gmx.de>
+
+ * patch-45-getmetadatanf (new): needed by luaTeX's pdftoepdf.cc.
+
+2009-09-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-04-pl4 (new): Official 3.02pl4 patch plus change of
+ xpdfVersion "3.02pl3" -> "3.02pl4"
+ * patch-40-*: Adapted to presence of patch-04-pl4.
+
+2009-05-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-16-size-of-struct (removed): unnecessary.
+ * patch-17-strCrypt (removed): was never useful.
+ * patch-23-exclude-keyBindings (removed): has removed lots of
+ unused code, but may be problematic with future foolabs updates.
+
+2009-05-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-10-exclude-body-of-Page::getDefaultCTM (removed),
+ * patch-10-exclude-body-of-Page_getDefaultCTM (new): renamed
+ this file to avoid problems with rsync and windows.
+
+2009-05-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Reorganize and simplify pdftex patches.
+
+ * patch-10-PDF_PARSER_ONLY (removed): replaced by ...
+ * patch-10-exclude-body-of-Page::getDefaultCTM (new): ... this.
+
+ from Derek B. Noonburg <derek@foolabs.com>
+
+ * patch-20-pdftex (removed): split into several pieces.
+ * patch-20-skip-reading-config-file (new): simplified version
+ of previous code.
+ * patch-22-exclude-openTempFile: new file.
+ * patch-23-exclude-keyBindings: new file.
+ * patch-40-objectStream-support-for-pdftosrc: new file.
+
+ from Han The Thanh <thanh@pdftex.org>
+
+2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-15-fix-pow-arg (new): Three ...
+ * patch-16-size-of-struct (new): ... small patches ...
+ * patch-17-strCrypt (new): ... split of from ...
+ * patch-20-pdftex: ... this one.
+
+2009-04-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-pl3 (new): Official 3.02pl3 patch plus change of
+ xpdfVersion "3.02pl2" -> "3.02pl3"
+ * patch-[12]?-*: adapted to presence of patch-03-pl3.
+
+2009-04-02 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-12-mingw32 (new): Buld fix for mingw32.
+
+ from Derek B. Noonburg <derek@foolabs.com>
+
+2009-03-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-11-time_h (new): Buld fix for djgpp.
+
+ from Derek B. Noonburg <derek@foolabs.com>
+
+2009-02-08 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-10-PDF_PARSER_ONLY (new): required build with
+ PDF_PARSER_ONLY defined.
+
+ * patch-20-pdftex (new): To restore former tree for pdfTeX.
+
+2007-11-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-02-pl2 (new): Official 3.02pl2 patch plus change of
+ xpdfVersion "3.02pl1" -> "3.02pl2"
+
+2007-08-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-01-pl1 (new): Official 3.02pl1 patch plus change of
+ xpdfVersion "3.02" -> "3.02pl1" in ../xpdf/config.h.
+
+2007-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Imported xpdf-3.02 source tree:
+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz
+ http://www.foolabs.com/xpdf/xpdf-3.02.tar.gz
+
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/TL-Changes b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/TL-Changes
new file mode 100644
index 00000000000..16c6b27b495
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/TL-Changes
@@ -0,0 +1,6 @@
+Changes applied to the xpdf-3.04/ tree as obtained from:
+ ftp://ftp.foolabs.com/pub/xpdf/
+
+Removed:
+ install-sh
+
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM
new file mode 100644
index 00000000000..da4d8519c31
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-10-exclude-body-of-Page_getDefaultCTM
@@ -0,0 +1,23 @@
+ Enable compilation with -DPDF_PARSER_ONLY
+
+diff -ur -N xpdf-3.04.orig/xpdf/Page.cc xpdf-3.04/xpdf/Page.cc
+--- xpdf-3.04.orig/xpdf/Page.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/Page.cc 2014-05-30 19:57:46.000000000 +0200
+@@ -468,9 +468,9 @@
+ delete links;
+ }
+
+-#ifndef PDF_PARSER_ONLY
+ void Page::getDefaultCTM(double *ctm, double hDPI, double vDPI,
+ int rotate, GBool useMediaBox, GBool upsideDown) {
++#ifndef PDF_PARSER_ONLY
+ GfxState *state;
+ int i;
+
+@@ -487,5 +487,5 @@
+ ctm[i] = state->getCTM()[i];
+ }
+ delete state;
+-}
+ #endif
++}
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-20-skip-reading-config-file b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-20-skip-reading-config-file
new file mode 100644
index 00000000000..5c20dccdd72
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-20-skip-reading-config-file
@@ -0,0 +1,60 @@
+ Patches for pdfTeX / luaTeX / XeTeX
+
+ Declare GlobalParams constructor with a default config file argument
+ and skip reading a config file.
+
+ from:
+ Han The Thanh <thanh@pdftex.org>
+ Peter Breitenlohner <tex-live@tug.org>
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc
+--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200
+@@ -5,6 +5,9 @@
+ // Copyright 2001-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
++// See top-level ChangeLog for a list of all modifications
++//========================================================================
+
+ #include <aconf.h>
+
+@@ -812,6 +815,7 @@
+ f = NULL;
+ fileName = NULL;
+ if (cfgFileName && cfgFileName[0]) {
++#ifndef PDF_PARSER_ONLY
+ fileName = new GString(cfgFileName);
+ if (!(f = fopen(fileName->getCString(), "r"))) {
+ delete fileName;
+@@ -844,6 +848,7 @@
+ parseFile(fileName, f);
+ delete fileName;
+ fclose(f);
++#endif /* !PDF_PARSER_ONLY */
+ }
+ }
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.h xpdf-3.04/xpdf/GlobalParams.h
+--- xpdf-3.04.orig/xpdf/GlobalParams.h 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.h 2014-05-30 19:29:23.000000000 +0200
+@@ -5,6 +5,9 @@
+ // Copyright 2001-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
++// See top-level ChangeLog for a list of all modifications
++//========================================================================
+
+ #ifndef GLOBALPARAMS_H
+ #define GLOBALPARAMS_H
+@@ -173,7 +176,7 @@
+
+ // Initialize the global parameters by attempting to read a config
+ // file.
+- GlobalParams(const char *cfgFileName);
++ GlobalParams(const char *cfgFileName = NULL);
+
+ ~GlobalParams();
+
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-22-exclude-openTempFile b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-22-exclude-openTempFile
new file mode 100644
index 00000000000..be04bd4042d
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-22-exclude-openTempFile
@@ -0,0 +1,34 @@
+ Patches for pdfTeX / luaTeX / XeTeX
+
+ from:
+ Han The Thanh <thanh@pdftex.org>
+
+diff -ur -N xpdf-3.04.orig/goo/gfile.cc xpdf-3.04/goo/gfile.cc
+--- xpdf-3.04.orig/goo/gfile.cc 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/goo/gfile.cc 2014-05-30 19:42:41.000000000 +0200
+@@ -7,6 +7,9 @@
+ // Copyright 1996-2003 Glyph & Cog, LLC
+ //
+ //========================================================================
++// Modified for TeX Live by Peter Breitenlohner <tex-live@tug.org>
++// See top-level ChangeLog for a list of all modifications
++//========================================================================
+
+ #include <aconf.h>
+
+@@ -441,6 +444,7 @@
+ #endif
+ }
+
++#ifndef PDF_PARSER_ONLY
+ GBool openTempFile(GString **name, FILE **f,
+ const char *mode, const char *ext) {
+ #if defined(_WIN32)
+@@ -551,6 +555,7 @@
+ return gTrue;
+ #endif
+ }
++#endif
+
+ GBool createDir(char *path, int mode) {
+ #ifdef _WIN32
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-30-include-strings_h b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-30-include-strings_h
new file mode 100644
index 00000000000..f9b694650b1
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-30-include-strings_h
@@ -0,0 +1,15 @@
+ The Posix manpage says strcasecmp() is declared in <strings.h>
+ and this indeed required for AIX 4.3 and xlc.
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc
+--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:29:23.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200
+@@ -54,6 +54,8 @@
+ #ifdef _WIN32
+ # define strcasecmp stricmp
+ # define strncasecmp strnicmp
++#else
++# include <strings.h>
+ #endif
+
+ #if MULTITHREADED
diff --git a/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-40-W32TeX b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-40-W32TeX
new file mode 100644
index 00000000000..53a431f334a
--- /dev/null
+++ b/Build/source/libs/xpdf/xpdf-3.04-PATCHES/patch-40-W32TeX
@@ -0,0 +1,29 @@
+ WIN32TeX uses MSVC 5.0 with the kpathsea headers and library.
+
+diff -ur -N xpdf-3.04.orig/xpdf/GlobalParams.cc xpdf-3.04/xpdf/GlobalParams.cc
+--- xpdf-3.04.orig/xpdf/GlobalParams.cc 2014-05-30 19:47:44.000000000 +0200
++++ xpdf-3.04/xpdf/GlobalParams.cc 2014-05-30 19:52:04.000000000 +0200
+@@ -52,6 +52,8 @@
+ #include "GlobalParams.h"
+
+ #ifdef _WIN32
++# undef strcasecmp
++# undef strncasecmp
+ # define strcasecmp stricmp
+ # define strncasecmp strnicmp
+ #else
+diff -ur -N xpdf-3.04.orig/xpdf/config.h xpdf-3.04/xpdf/config.h
+--- xpdf-3.04.orig/xpdf/config.h 2014-05-28 20:50:50.000000000 +0200
++++ xpdf-3.04/xpdf/config.h 2014-05-30 19:52:04.000000000 +0200
+@@ -78,11 +78,6 @@
+ // popen
+ //------------------------------------------------------------------------
+
+-#if defined(_MSC_VER) || defined(__BORLANDC__)
+-#define popen _popen
+-#define pclose _pclose
+-#endif
+-
+ #if defined(VMS) || defined(VMCMS) || defined(DOS) || defined(OS2) || defined(__EMX__) || defined(_WIN32) || defined(__DJGPP__) || defined(MACOS)
+ #define POPEN_READ_MODE "rb"
+ #else