From 41d895c2fcfe6edb281cf229c9ce6e1eafc1c72857d5fb883cb52f962120606e Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 27 Mar 2020 12:13:48 +0000
Subject: [PATCH] Accepting request 788987 from home:mgorse:factory

- Add source-poppler0.86.0.patch: fix build with poppler 0.86.0.

OBS-URL: https://build.opensuse.org/request/show/788987
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=354
---
 source-poppler0.86.0.patch | 20 ++++++++++++++++++++
 texlive.changes            |  5 +++++
 texlive.spec               |  5 +++++
 3 files changed, 30 insertions(+)
 create mode 100644 source-poppler0.86.0.patch

diff --git a/source-poppler0.86.0.patch b/source-poppler0.86.0.patch
new file mode 100644
index 0000000..dabd1c0
--- /dev/null
+++ b/source-poppler0.86.0.patch
@@ -0,0 +1,20 @@
+diff -urp texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc
+--- texlive-20190407-source.orig/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc	2020-03-26 20:36:35.584513454 -0500
++++ texlive-20190407-source/texk/web2c/pdftexdir/pdftoepdf-poppler0.75.0.cc	2020-03-26 20:37:50.808915680 -0500
+@@ -757,7 +757,7 @@ read_pdf_info(char *image_name, char *pa
+     if (page_name) {
+         // get page by name
+         GString name(page_name);
+-        LinkDest *link = pdf_doc->doc->findDest(&name);
++        std::unique_ptr<LinkDest> link = pdf_doc->doc->findDest(&name);
+         if (link == 0 || !link->isOk())
+             pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
+         const Ref ref = link->getPageRef();
+@@ -765,7 +765,6 @@ read_pdf_info(char *image_name, char *pa
+         if (page_num == 0)
+             pdftex_fail("PDF inclusion: destination is not a page <%s>",
+                         page_name);
+-        delete link;
+     } else {
+         // get page by number
+         if (page_num <= 0 || page_num > epdf_num_pages)
diff --git a/texlive.changes b/texlive.changes
index 1e419d4..627c40b 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Mar 27 01:39:45 UTC 2020 - Michael Gorse <mgorse@suse.com>
+
+- Add source-poppler0.86.0.patch: fix build with poppler 0.86.0.
+
 -------------------------------------------------------------------
 Wed Mar 11 16:16:55 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/texlive.spec b/texlive.spec
index 4e82b4e..9be36b6 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -283,6 +283,8 @@ Patch61:        source-poppler0.83.0.patch
 Patch62:        source-common.patch
 # PATCH-FIX-UPSTREAM source-poppler0.84.0.patch
 Patch63:        source-poppler0.84.0.patch
+# PATCH-FIX-UPSTREAM source-poppler0.86.0.patch
+Patch64:        source-poppler0.86.0.patch
 Prefix:         %{_bindir}
 Provides:       pdfjam = %{version}
 Obsoletes:      pdfjam < %{version}
@@ -3689,6 +3691,9 @@ popd
 %if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.84.0}}%{!?pkg_vcmp:0}
 %patch63 -p1 -b .poppler84
 %endif
+%if %{?pkg_vcmp:%{pkg_vcmp libpoppler-devel >= 0.86.0}}%{!?pkg_vcmp:0}
+%patch64 -p1 -b .poppler86
+%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