summaryrefslogtreecommitdiff
path: root/Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file')
-rw-r--r--Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file60
1 files changed, 60 insertions, 0 deletions
diff --git a/Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file b/Build/source/libs/xpdf/TLPATCHES/patch-20-skip-reading-config-file
new file mode 100644
index 00000000000..5c20dccdd72
--- /dev/null
+++ b/Build/source/libs/xpdf/TLPATCHES/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();
+