From dfb22b868f68bdecd477acb65139d0c6c2d977d3e08ecd952698adffce083f2a Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 16 Jan 2020 10:30:10 +0000
Subject: [PATCH] Accepting request 764738 from
 home:iznogood:branches:Publishing:TeXLive

- Add source-poppler0.84.0.patch: Fix build with poppler-0.84.

OBS-URL: https://build.opensuse.org/request/show/764738
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=341
---
 source-poppler0.84.0.patch | 31 +++++++++++++++++++++++++++++++
 texlive.changes            |  5 +++++
 texlive.spec               |  7 ++++++-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 source-poppler0.84.0.patch

diff --git a/source-poppler0.84.0.patch b/source-poppler0.84.0.patch
new file mode 100644
index 0000000..5badf16
--- /dev/null
+++ b/source-poppler0.84.0.patch
@@ -0,0 +1,31 @@
+ pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017)  (April 27, 2017)
+diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
+index c93a87819..7f5e50416 100644
+--- a/texk/web2c/pdftexdir/utils.c
++++ b/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
+
+diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
+index 4968ee41e..0aee4ee38 100644
+--- a/texk/web2c/xetexdir/XeTeX_ext.c
++++ b/texk/web2c/xetexdir/XeTeX_ext.c
+@@ -38,7 +38,10 @@ authorization from the copyright holders.
+ 
+ #include <w2c/config.h>
+ 
++#ifndef POPPLER_VERSION
+ #include <poppler-config.h>
++#endif
++
+ #include <png.h>
+ #include <zlib.h>
+ #include <graphite2/Font.h>
+
diff --git a/texlive.changes b/texlive.changes
index 9a151b3..73934ee 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 15 12:21:14 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Add source-poppler0.84.0.patch: Fix build with poppler-0.84.
+
 -------------------------------------------------------------------
 Thu Jan  9 12:02:09 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/texlive.spec b/texlive.spec
index bd82efd..052d958 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package texlive
 #
-# Copyright (c) 2020 SUSE LLC.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -281,6 +281,8 @@ Patch60:        source-fix-axohelp.patch
 Patch61:        source-poppler0.83.0.patch
 # PATCH-FIX-SUSE Avoid common variable (boo#1160417)
 Patch62:        source-common.patch
+# PATCH-FIX-UPSTREAM source-poppler0.84.0.patch
+Patch63:        source-poppler0.84.0.patch
 Prefix:         %{_bindir}
 Provides:       pdfjam = %{version}
 Obsoletes:      pdfjam < %{version}
@@ -3685,6 +3687,9 @@ popd
 %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.83.0}}%{!?pkg_vcmp:0}
 %patch61 -p1 -b .poppler79
 %endif
+%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.84.0}}%{!?pkg_vcmp:0}
+%patch63 -p1 -b .poppler79
+%endif
 pver=$(pkg-config --modversion poppler)
 %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.79.0}}%{!?pkg_vcmp:0}
 cp ./texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc ./texk/web2c/pdftexdir/pdftoepdf-poppler${pver}.cc