From 2daba66c685de3f2d9b7abd7e526c627aa1e9379 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 19 Oct 2012 09:09:07 +0000 Subject: libs/xpdf: Remove TL vs W32TeX diffs (from Akira) git-svn-id: svn://tug.org/texlive/trunk@28030 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/xpdf/ChangeLog | 4 ++ Build/source/libs/xpdf/Makefile.am | 7 +-- Build/source/libs/xpdf/Makefile.in | 6 +-- Build/source/libs/xpdf/xpdf-3.03-PATCHES/ChangeLog | 8 +++ .../libs/xpdf/xpdf-3.03-PATCHES/patch-12-mingw32 | 22 -------- .../patch-20-skip-reading-config-file | 60 +++++++++------------- .../xpdf-3.03-PATCHES/patch-30-include-strings_h | 6 +-- .../libs/xpdf/xpdf-3.03-PATCHES/patch-40-W32TeX | 28 ++++++++++ .../libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc | 14 ++--- .../source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.h | 7 +-- Build/source/libs/xpdf/xpdf-3.03/xpdf/config.h | 5 -- 11 files changed, 78 insertions(+), 89 deletions(-) delete mode 100644 Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-12-mingw32 create mode 100644 Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-40-W32TeX (limited to 'Build') diff --git a/Build/source/libs/xpdf/ChangeLog b/Build/source/libs/xpdf/ChangeLog index a8018ae06d2..573358d0e9b 100644 --- a/Build/source/libs/xpdf/ChangeLog +++ b/Build/source/libs/xpdf/ChangeLog @@ -1,3 +1,7 @@ +2012-10-19 Peter Breitenlohner + + * Makefile.am: Avoid use of deprecated INCLUDES. + 2012-07-22 Peter Breitenlohner * Makefile.am (xpdf_libxpdf_a_sources): Drop PSOutputDev.cc, diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am index c4c3cedaee9..7296710f970 100644 --- a/Build/source/libs/xpdf/Makefile.am +++ b/Build/source/libs/xpdf/Makefile.am @@ -48,11 +48,12 @@ SUBDIRS = goo fofi splash xpdf GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi -SPLAHS_SRC = $(top_srcdir)/$(XPDF_TREE)/splash +SPLASH_SRC = $(top_srcdir)/$(XPDF_TREE)/splash XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf -INCLUDES = -Igoo -Ifofi -Isplash -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(SPLAHS_SRC) -I$(XPDF_SRC) -AM_CPPFLAGS = -DPDF_PARSER_ONLY +AM_CPPFLAGS = -Igoo -Ifofi -Isplash -Ixpdf +AM_CPPFLAGS += -I$(FOFI_SRC) -I$(SPLASH_SRC) -I$(XPDF_SRC) +AM_CPPFLAGS += -DPDF_PARSER_ONLY AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in index 1d396c6243b..b572c5520ed 100644 --- a/Build/source/libs/xpdf/Makefile.in +++ b/Build/source/libs/xpdf/Makefile.in @@ -275,10 +275,10 @@ EXTRA_DIST = $(XPDF_TREE) $(XPDF_TREE)-foolabs $(XPDF_TREE)-PATCHES SUBDIRS = goo fofi splash xpdf GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi -SPLAHS_SRC = $(top_srcdir)/$(XPDF_TREE)/splash +SPLASH_SRC = $(top_srcdir)/$(XPDF_TREE)/splash XPDF_SRC = $(top_srcdir)/$(XPDF_TREE)/xpdf -INCLUDES = -Igoo -Ifofi -Isplash -Ixpdf -I$(GOO_SRC) -I$(FOFI_SRC) -I$(SPLAHS_SRC) -I$(XPDF_SRC) -AM_CPPFLAGS = -DPDF_PARSER_ONLY +AM_CPPFLAGS = -Igoo -Ifofi -Isplash -Ixpdf -I$(FOFI_SRC) \ + -I$(SPLASH_SRC) -I$(XPDF_SRC) -DPDF_PARSER_ONLY AM_CFLAGS = $(WARNING_CFLAGS) AM_CXXFLAGS = $(NO_WARN_CXXFLAGS) noinst_LIBRARIES = libxpdf.a diff --git a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/ChangeLog b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/ChangeLog index 82fed5f082f..0f84b1ceb57 100644 --- a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/ChangeLog +++ b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/ChangeLog @@ -1,3 +1,11 @@ +2012-10-19 Peter Breitenlohner + + * 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 * patch-30-include-strings_h (new): Bug fix for AIX 4.3 and xlc. diff --git a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-12-mingw32 b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-12-mingw32 deleted file mode 100644 index 178290cc8f6..00000000000 --- a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-12-mingw32 +++ /dev/null @@ -1,22 +0,0 @@ - Build fix for mingw32 - -diff -ur -N xpdf-3.03.orig/xpdf/GlobalParams.cc xpdf-3.03/xpdf/GlobalParams.cc ---- xpdf-3.03.orig/xpdf/GlobalParams.cc 2011-08-15 23:08:53.000000000 +0200 -+++ xpdf-3.03/xpdf/GlobalParams.cc 2011-08-22 13:57:15.000000000 +0200 -@@ -5,9 +5,16 @@ - // Copyright 2001-2003 Glyph & Cog, LLC - // - //======================================================================== -+// Modified for TeX Live by Peter Breitenlohner -+// See top-level ChangeLog for a list of all modifications -+//======================================================================== - - #include - -+#ifdef __MINGW32__ -+#undef WIN32 -+#endif -+ - #ifdef USE_GCC_PRAGMAS - #pragma implementation - #endif diff --git a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-20-skip-reading-config-file b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-20-skip-reading-config-file index 0de2b00314e..24d43695ef1 100644 --- a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-20-skip-reading-config-file +++ b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-20-skip-reading-config-file @@ -1,6 +1,6 @@ Patches for pdfTeX / luaTeX / XeTeX - Declare GlobalParams constructor without config file argument + Declare GlobalParams constructor with a default config file argument and skip reading a config file. from: @@ -8,43 +8,37 @@ Peter Breitenlohner diff -ur -N xpdf-3.03.orig/xpdf/GlobalParams.cc xpdf-3.03/xpdf/GlobalParams.cc ---- xpdf-3.03.orig/xpdf/GlobalParams.cc 2011-08-22 13:57:15.000000000 +0200 -+++ xpdf-3.03/xpdf/GlobalParams.cc 2011-08-22 14:11:46.000000000 +0200 -@@ -628,10 +628,15 @@ - // parsing - //------------------------------------------------------------------------ - -+#ifdef PDF_PARSER_ONLY -+GlobalParams::GlobalParams() { -+ UnicodeMap *map; -+#else - GlobalParams::GlobalParams(char *cfgFileName) { - UnicodeMap *map; - GString *fileName; - FILE *f; -+#endif - int i; +--- xpdf-3.03.orig/xpdf/GlobalParams.cc 2011-08-15 23:08:53.000000000 +0200 ++++ xpdf-3.03/xpdf/GlobalParams.cc 2012-10-19 10:01:03.000000000 +0200 +@@ -5,6 +5,9 @@ + // Copyright 2001-2003 Glyph & Cog, LLC + // + //======================================================================== ++// Modified for TeX Live by Peter Breitenlohner ++// See top-level ChangeLog for a list of all modifications ++//======================================================================== - #if MULTITHREADED -@@ -782,6 +787,7 @@ - map = new UnicodeMap("UCS-2", gTrue, &mapUCS2); - residentUnicodeMaps->add(map->getEncodingName(), map); + #include -+#ifndef PDF_PARSER_ONLY - // look for a user config file, then a system-wide config file +@@ -779,6 +782,7 @@ f = NULL; fileName = NULL; -@@ -819,6 +825,7 @@ + if (cfgFileName && cfgFileName[0]) { ++#ifndef PDF_PARSER_ONLY + fileName = new GString(cfgFileName); + if (!(f = fopen(fileName->getCString(), "r"))) { + delete fileName; +@@ -811,6 +815,7 @@ + parseFile(fileName, f); delete fileName; fclose(f); - } +#endif /* !PDF_PARSER_ONLY */ + } } - void GlobalParams::createDefaultKeyBindings() { diff -ur -N xpdf-3.03.orig/xpdf/GlobalParams.h xpdf-3.03/xpdf/GlobalParams.h --- xpdf-3.03.orig/xpdf/GlobalParams.h 2011-08-15 23:08:53.000000000 +0200 -+++ xpdf-3.03/xpdf/GlobalParams.h 2011-08-22 14:11:46.000000000 +0200 ++++ xpdf-3.03/xpdf/GlobalParams.h 2012-10-19 09:58:39.000000000 +0200 @@ -5,6 +5,9 @@ // Copyright 2001-2003 Glyph & Cog, LLC // @@ -55,18 +49,12 @@ diff -ur -N xpdf-3.03.orig/xpdf/GlobalParams.h xpdf-3.03/xpdf/GlobalParams.h #ifndef GLOBALPARAMS_H #define GLOBALPARAMS_H -@@ -171,9 +174,14 @@ - class GlobalParams { - public: +@@ -173,7 +176,7 @@ -+#ifdef PDF_PARSER_ONLY -+ // Initialize the global parameters without reading a config file. -+ GlobalParams(); -+#else // Initialize the global parameters by attempting to read a config // file. - GlobalParams(char *cfgFileName); -+#endif +- GlobalParams(char *cfgFileName); ++ GlobalParams(char *cfgFileName = NULL); ~GlobalParams(); diff --git a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-30-include-strings_h b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-30-include-strings_h index acd799a952e..2a8bae993de 100644 --- a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-30-include-strings_h +++ b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-30-include-strings_h @@ -2,9 +2,9 @@ and this indeed required for AIX 4.3 and xlc. diff -ur -N xpdf-3.03.orig/xpdf/GlobalParams.cc xpdf-3.03/xpdf/GlobalParams.cc ---- xpdf-3.03.orig/xpdf/GlobalParams.cc 2011-08-22 14:11:46.000000000 +0200 -+++ xpdf-3.03/xpdf/GlobalParams.cc 2012-05-16 13:36:12.000000000 +0200 -@@ -52,6 +52,8 @@ +--- xpdf-3.03.orig/xpdf/GlobalParams.cc 2012-10-19 10:01:03.000000000 +0200 ++++ xpdf-3.03/xpdf/GlobalParams.cc 2012-10-19 10:06:40.000000000 +0200 +@@ -48,6 +48,8 @@ #ifdef WIN32 # define strcasecmp stricmp diff --git a/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-40-W32TeX b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-40-W32TeX new file mode 100644 index 00000000000..33ac1784667 --- /dev/null +++ b/Build/source/libs/xpdf/xpdf-3.03-PATCHES/patch-40-W32TeX @@ -0,0 +1,28 @@ + WIN32TeX uses MSVC 5.0 with the kpathsea headers and library. + +diff -ur -N xpdf-3.03.orig/xpdf/GlobalParams.cc xpdf-3.03/xpdf/GlobalParams.cc +--- xpdf-3.03.orig/xpdf/GlobalParams.cc 2012-10-19 10:06:40.000000000 +0200 ++++ xpdf-3.03/xpdf/GlobalParams.cc 2012-10-19 10:15:52.000000000 +0200 +@@ -47,6 +47,7 @@ + #include "GlobalParams.h" + + #ifdef WIN32 ++# undef strcasecmp + # define strcasecmp stricmp + #else + # include +diff -ur -N xpdf-3.03.orig/xpdf/config.h xpdf-3.03/xpdf/config.h +--- xpdf-3.03.orig/xpdf/config.h 2011-08-15 23:08:53.000000000 +0200 ++++ xpdf-3.03/xpdf/config.h 2012-10-19 10:22:29.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 diff --git a/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc b/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc index 018978470a9..aa3b2337931 100644 --- a/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc +++ b/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.cc @@ -11,10 +11,6 @@ #include -#ifdef __MINGW32__ -#undef WIN32 -#endif - #ifdef USE_GCC_PRAGMAS #pragma implementation #endif @@ -51,6 +47,7 @@ #include "GlobalParams.h" #ifdef WIN32 +# undef strcasecmp # define strcasecmp stricmp #else # include @@ -630,15 +627,10 @@ Plugin::~Plugin() { // parsing //------------------------------------------------------------------------ -#ifdef PDF_PARSER_ONLY -GlobalParams::GlobalParams() { - UnicodeMap *map; -#else GlobalParams::GlobalParams(char *cfgFileName) { UnicodeMap *map; GString *fileName; FILE *f; -#endif int i; #if MULTITHREADED @@ -789,11 +781,11 @@ GlobalParams::GlobalParams(char *cfgFileName) { map = new UnicodeMap("UCS-2", gTrue, &mapUCS2); residentUnicodeMaps->add(map->getEncodingName(), map); -#ifndef PDF_PARSER_ONLY // look for a user config file, then a system-wide config file f = NULL; fileName = NULL; if (cfgFileName && cfgFileName[0]) { +#ifndef PDF_PARSER_ONLY fileName = new GString(cfgFileName); if (!(f = fopen(fileName->getCString(), "r"))) { delete fileName; @@ -826,8 +818,8 @@ GlobalParams::GlobalParams(char *cfgFileName) { parseFile(fileName, f); delete fileName; fclose(f); - } #endif /* !PDF_PARSER_ONLY */ + } } void GlobalParams::createDefaultKeyBindings() { diff --git a/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.h b/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.h index d99d6774a74..068e6459a52 100644 --- a/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.h +++ b/Build/source/libs/xpdf/xpdf-3.03/xpdf/GlobalParams.h @@ -174,14 +174,9 @@ public: class GlobalParams { public: -#ifdef PDF_PARSER_ONLY - // Initialize the global parameters without reading a config file. - GlobalParams(); -#else // Initialize the global parameters by attempting to read a config // file. - GlobalParams(char *cfgFileName); -#endif + GlobalParams(char *cfgFileName = NULL); ~GlobalParams(); diff --git a/Build/source/libs/xpdf/xpdf-3.03/xpdf/config.h b/Build/source/libs/xpdf/xpdf-3.03/xpdf/config.h index 998d345139f..39a62cfba25 100644 --- a/Build/source/libs/xpdf/xpdf-3.03/xpdf/config.h +++ b/Build/source/libs/xpdf/xpdf-3.03/xpdf/config.h @@ -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 -- cgit v1.2.3