From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 352C9138350 for ; Sun, 8 Mar 2020 10:11:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75085E0895; Sun, 8 Mar 2020 10:11:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD4CDE0895 for ; Sun, 8 Mar 2020 10:11:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8139534F04F for ; Sun, 8 Mar 2020 10:11:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28DA2162 for ; Sun, 8 Mar 2020 10:11:06 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1583662218.64fd416a0b3452d063025f7f65063eef17d8120c.zlogene@gentoo> Subject: [gentoo-commits] proj/tex:master commit in: 2019/patches/ X-VCS-Repository: proj/tex X-VCS-Files: 2019/patches/texlive-core-2019-poppler086.patch X-VCS-Directories: 2019/patches/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 64fd416a0b3452d063025f7f65063eef17d8120c X-VCS-Branch: master Date: Sun, 8 Mar 2020 10:11:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 68ab3ce4-771d-4839-98b1-047eeb934ebf X-Archives-Hash: 3997fd67308a0396a5857f2243515af6 commit: 64fd416a0b3452d063025f7f65063eef17d8120c Author: Mikle Kolyada gentoo org> AuthorDate: Sun Mar 8 10:10:18 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Mar 8 10:10:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/tex.git/commit/?id=64fd416a fix poppler-0.86 compat with XeTeX Signed-off-by: Mikle Kolyada gentoo.org> 2019/patches/texlive-core-2019-poppler086.patch | 40 +++++++++++++++++-------- 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/2019/patches/texlive-core-2019-poppler086.patch b/2019/patches/texlive-core-2019-poppler086.patch index 4ab4f95..8109222 100644 --- a/2019/patches/texlive-core-2019-poppler086.patch +++ b/2019/patches/texlive-core-2019-poppler086.patch @@ -1,17 +1,18 @@ -From 1203f6d9d51d6bedf11e36509f3a56638b1c816e Mon Sep 17 00:00:00 2001 +From 15e3bef2a1ec72007706705a31d9bd4c8eae53b1 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada -Date: Fri, 6 Mar 2020 13:31:24 +0000 +Date: Sun, 8 Mar 2020 10:05:15 +0000 Subject: [PATCH] poppler-0.86 compat Signed-off-by: Mikle Kolyada --- - pdftoepdf.cc | 308 ++++++++++++++++++++++++++------------------------- - pdftosrc.cc | 76 ++++++------- - utils.c | 1 - - 3 files changed, 192 insertions(+), 193 deletions(-) + texk/web2c/pdftexdir/pdftoepdf.cc | 308 +++++++++++++++--------------- + texk/web2c/pdftexdir/pdftosrc.cc | 76 ++++---- + texk/web2c/pdftexdir/utils.c | 1 - + texk/web2c/xetexdir/XeTeX_ext.c | 3 + + 4 files changed, 195 insertions(+), 193 deletions(-) -diff --git a/pdftoepdf.cc b/pdftoepdf.cc -index 4db0c90..d13293e 100644 +diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc +index 4db0c90a..d13293e9 100644 --- a/texk/web2c/pdftexdir/pdftoepdf.cc +++ b/texk/web2c/pdftexdir/pdftoepdf.cc @@ -1,5 +1,5 @@ @@ -629,8 +630,8 @@ index 4db0c90..d13293e 100644 - delete globalParams; } } -diff --git a/pdftosrc.cc b/pdftosrc.cc -index 67be229..b6700fd 100644 +diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc +index 67be229e..b6700fd6 100644 --- a/texk/web2c/pdftexdir/pdftosrc.cc +++ b/texk/web2c/pdftexdir/pdftosrc.cc @@ -16,6 +16,14 @@ GNU General Public License for more details. @@ -803,8 +804,8 @@ index 67be229..b6700fd 100644 delete doc; - delete globalParams; } -diff --git a/utils.c b/utils.c -index c93a878..6f866e7 100644 +diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c +index c93a8781..6f866e76 100644 --- a/texk/web2c/pdftexdir/utils.c +++ b/texk/web2c/pdftexdir/utils.c @@ -33,7 +33,6 @@ with this program. If not, see . @@ -815,6 +816,21 @@ index c93a878..6f866e7 100644 #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 4968ee41..0aee4ee3 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 + ++#ifndef POPPLER_VERSION + #include ++#endif ++ + #include + #include + #include -- 2.24.1