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 D16B9138350 for ; Sun, 5 Apr 2020 17:05:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DD54E0AB6; Sun, 5 Apr 2020 17:05:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 830B1E0AB6 for ; Sun, 5 Apr 2020 17:05:09 +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 64D3F34EF28 for ; Sun, 5 Apr 2020 17:05:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9040F1BE for ; Sun, 5 Apr 2020 17:05:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1586106282.b8247fa646d67c9385ffb3c05d1f6a1420cad014.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch app-office/libreoffice/libreoffice-6.4.2.2.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b8247fa646d67c9385ffb3c05d1f6a1420cad014 X-VCS-Branch: master Date: Sun, 5 Apr 2020 17:05:05 +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: 732ab7f3-08e9-4858-b978-37ebddf6c142 X-Archives-Hash: 730dcfc1eb5e16de91dfa132b32de47e commit: b8247fa646d67c9385ffb3c05d1f6a1420cad014 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 5 16:12:49 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 5 17:04:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8247fa6 app-office/libreoffice: Fix build with poppler-0.86.0 Closes: https://bugs.gentoo.org/711102 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/libreoffice-6.4.2.2-poppler-0.86.patch | 15 +++++++++++++++ app-office/libreoffice/libreoffice-6.4.2.2.ebuild | 3 +++ 2 files changed, 18 insertions(+) diff --git a/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch new file mode 100644 index 00000000000..c56ba89ade5 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.4.2.2-poppler-0.86.patch @@ -0,0 +1,15 @@ +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index e9c2a407c279..16ad04bf660a 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*) + if (!(pAction && pAction->getKind() == actionURI)) + return; + +-#if POPPLER_CHECK_VERSION(0, 72, 0) ++#if POPPLER_CHECK_VERSION(0, 86, 0) ++ const char* pURI = static_cast(pAction)->getURI().c_str(); ++#elif POPPLER_CHECK_VERSION(0, 72, 0) + const char* pURI = static_cast(pAction)->getURI()->c_str(); + #else + const char* pURI = static_cast(pAction)->getURI()->getCString(); diff --git a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild index a6f3687b3c4..b3b6af835f9 100644 --- a/app-office/libreoffice/libreoffice-6.4.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.2.2.ebuild @@ -252,6 +252,9 @@ PATCHES=( "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" + + # TODO: upstream (for now taken from Arch Linux) + "${FILESDIR}/${P}-poppler-0.86.patch" # bug 711102 ) S="${WORKDIR}/${PN}-${MY_PV}"