summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-12-30 00:37:32 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-12-30 00:37:32 +0000
commitbd7235b8305d702be89451b252160be0d8216653 (patch)
tree5ae0240eb9360619aaed8ea7970df893ea28557b /Build
parentfa514a942dd370d7fdf62ad1f6e623e89ed80f6b (diff)
Not include poppler-config.h, by assuming that POPPLER_VERSION is defined properly
git-svn-id: svn://tug.org/texlive/trunk@53259 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/NEWS16
-rw-r--r--Build/source/texk/web2c/pdftexdir/utils.c2
3 files changed, 8 insertions, 15 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 693ccbc37cd..d1576ef7ed7 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-30 Akira Kakuto <kakuto@w32tex.org>
+
+ * utils.c: Not include poppler-config.h, by assuming that
+ POPPLER_VERSION is defined properly.
+
2019-12-10 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* am/pdftex.am (pdftex_ch_srcs): add zlib-fmt.ch.
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index 5bbd262683d..99442e23812 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -43,20 +43,8 @@ pdfTeX 3.14159265-2.6-1.40.19 (TeX Live 2018) (April 14, 2018)
pdftoepdf-poppler0.83.0.cc for poppler-0.83.0 and newer.
Note that pdftosrc-*.cc and pdftoepdf-*.cc should be
renamed as pdftosrc.cc, and pdftoepdf.cc, respectively, before
- compilation.
- In the case of 0.84.0, it is necessary to change
- poppler-config.h.cmake as follows:
---- poppler-config.h.cmake.orig Sat Dec 28 21:18:52 2019
-+++ poppler-config.h.cmake Mon Dec 30 07:08:40 2019
-@@ -139,7 +139,7 @@
- //------------------------------------------------------------------------
-
- #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
--#include <cstdio> // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h
-+#include <stdio.h> // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h
- #ifdef __MINGW_PRINTF_FORMAT
- #define GCC_PRINTF_FORMAT(fmt_index, va_index) \
- __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index)))
+ compilation. Further, POPPLER_VERSION should be defined properly
+ like -DPOPPLER_VERSION='"0.84.0"'.
---------------------------------------------------------------
pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017) (April 27, 2017)
diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c
index c93a878199d..7f5e50416b7 100644
--- a/Build/source/texk/web2c/pdftexdir/utils.c
+++ b/Build/source/texk/web2c/pdftexdir/utils.c
@@ -33,7 +33,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ptexlib.h"
#include <png.h>
#ifdef POPPLER_VERSION
-#include <poppler-config.h>
+/* POPPLER_VERSION should be a proper version string */
#define xpdfVersion POPPLER_VERSION
#define xpdfString "poppler"
#else