texlive[53259] Build/source/texk/web2c/pdftexdir: Not include

commits+kakuto at tug.org commits+kakuto at tug.org
Mon Dec 30 01:37:33 CET 2019


Revision: 53259
          http://tug.org/svn/texlive?view=revision&revision=53259
Author:   kakuto
Date:     2019-12-30 01:37:32 +0100 (Mon, 30 Dec 2019)
Log Message:
-----------
Not include poppler-config.h, by assuming that POPPLER_VERSION is defined properly

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
    trunk/Build/source/texk/web2c/pdftexdir/NEWS
    trunk/Build/source/texk/web2c/pdftexdir/utils.c

Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2019-12-29 22:28:42 UTC (rev 53258)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2019-12-30 00:37:32 UTC (rev 53259)
@@ -1,3 +1,8 @@
+2019-12-30  Akira Kakuto  <kakuto at w32tex.org>
+
+	* utils.c: Not include poppler-config.h, by assuming that
+	POPPLER_VERSION is defined properly.
+
 2019-12-10  Hironori Kitagawa  <h_kitagawa2001 at yahoo.co.jp>
 
 	* am/pdftex.am (pdftex_ch_srcs): add zlib-fmt.ch.

Modified: trunk/Build/source/texk/web2c/pdftexdir/NEWS
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/NEWS	2019-12-29 22:28:42 UTC (rev 53258)
+++ trunk/Build/source/texk/web2c/pdftexdir/NEWS	2019-12-30 00:37:32 UTC (rev 53259)
@@ -43,20 +43,8 @@
   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)

Modified: trunk/Build/source/texk/web2c/pdftexdir/utils.c
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/utils.c	2019-12-29 22:28:42 UTC (rev 53258)
+++ trunk/Build/source/texk/web2c/pdftexdir/utils.c	2019-12-30 00:37:32 UTC (rev 53259)
@@ -33,7 +33,7 @@
 #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



More information about the tex-live-commits mailing list