gentoo resync : 30.05.2020

5 files changed, 161 insertions, 4 deletions

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 85d74b593d4e..9963e6a93633 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,11 +3,14 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
+AUX poppler-0.88.0-pdfsig-crash.patch 918 BLAKE2B 1cafb94e03afb06729633e117951edf0a14c6d52786eee4d785786e249f22fb4579d909f946ec595c6a7a54fbd594b6b1e94006ea37f97cacc49a93336cb2d37 SHA512 8967348da204da57002fbbff55d318e8065ce422e99bc5fbe7d517aed70c5f962dac87996bd949053ff5844f44aac528de08bbb1b2f7131b7852b3f5ad11653e
 DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
 DIST poppler-0.87.0.tar.xz 1595088 BLAKE2B 7bce4426b057ae8702399f0f3581ee844df89b01151dff9212e1d2c525847eba7614697ef02cc7278930b5e266e15f62d3b7c5d989951d44c62ee3f8fb9b2835 SHA512 4bdc432c75106b3f37643bfd57c66aba659864fdc3c4d9ffa5089ceaa33ad3bd10d2c4abfb09a4f7b9d7d137e31eb559b440d7df53f35f60d70eaef05f987630
 DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
+DIST poppler-0.89.0.tar.xz 1612156 BLAKE2B 071724f823214f3b3a775a1e6ee57992c18c65815cc139d88953ea3a7b348066981ce7933bd00ea27ddb60bf9f2f34a245bf09944d8cfda9732f0e33feecb017 SHA512 e2af2ab20cc1bba72080d42e229379bda0802aff355d2932dd970ee5924f454577529aef21f0f90fc57efba54caf15cd973c75446f309498f88199d5c2d93f11
 EBUILD poppler-0.85.0.ebuild 3354 BLAKE2B 4302a00fdf67d9e6c31a245d3e896cc0bac0663249682efb44c3d307f5a00bb2f7b0195195d70531a784b9bc13dd3b0853c7a4e7189d7f04b2d5f7b572740bdb SHA512 b6f25ae17135528bd64dff6fb068d39026913b332410ec1b512834b339286205a5664564e8f8348e98678c81a4e00042b3e10cef4a70ec3525d91bd4bab2743a
 EBUILD poppler-0.87.0.ebuild 3363 BLAKE2B e9600b268bffbd857c8e0ac79087c61703ec0667126793ae069bb763f2aa3974f3b4b9b0b62b1fc4d323ec7bb7009fd788a948568c83b52f5c1f36ceb54bda63 SHA512 b30393fd43ed0ba92332874794a6ba64d89b88a7f82894571665389aa7a4aa347da663e70818ec6f0a2c56a6195b5e8b5aa179001e9ff9e4e043cb5a7332e227
-EBUILD poppler-0.88.0.ebuild 3363 BLAKE2B c496f6da00a8fe2c38ad90f6d044edcaa12a253853e94e9a3bdeb17db2eb2c7e85a91df308dc175005380d32f8283995738f34d7e1831b73b273b5f0cc4daefb SHA512 60c21666e9e1eb80c6bb76766fa90f4554c7a4650dd87ae63cdb787f5f249c5b8603f89de8634493923ba9ed758274d42a0100cb84e62242d928a93760d2be82
-EBUILD poppler-9999.ebuild 3363 BLAKE2B c496f6da00a8fe2c38ad90f6d044edcaa12a253853e94e9a3bdeb17db2eb2c7e85a91df308dc175005380d32f8283995738f34d7e1831b73b273b5f0cc4daefb SHA512 60c21666e9e1eb80c6bb76766fa90f4554c7a4650dd87ae63cdb787f5f249c5b8603f89de8634493923ba9ed758274d42a0100cb84e62242d928a93760d2be82
+EBUILD poppler-0.88.0-r1.ebuild 3397 BLAKE2B 5e41fe2e4f5fef40d5e20c8ee2ea91be06e797523e193b908afaaa2d6971ad45858c57ea034e23af7e28481cfe4143fa9356316b53c1e525612b7e05f47a20a8 SHA512 0949a2aa4c989d0a6e067097c9efd11233b9eaffe576ed5eef22575aa6e251fecf5a0a5c7d2a3311eea0d6898d3fcf7e8ca27fe5d7285b1b73f9a79ff9e9e16b
+EBUILD poppler-0.89.0.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
+EBUILD poppler-9999.ebuild 3364 BLAKE2B dda70a754a90e073ade7ea7212798448976bd3ef6789a40e5b487a813804bc80cc1f5ae521954dfaca22ea7ae07c3b59404c69310df8d4c2d4ff36e439acac1e SHA512 9b24944e3f04ee159fd1493c04fb5d1a0fe277b04c85630faad6772a868609f16c6f07ec70aff4f700f24422d361b7eaeb62e46234c23045a28183c23379c532
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
new file mode 100644
index 000000000000..4f29727b6fcf
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
@@ -0,0 +1,30 @@
+From 5cdb78fde50e3dc16006070b0884dfb6b23d964c Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Thu, 14 May 2020 00:22:33 +0200
+Subject: [PATCH] Fix crash in PDFDoc::getSignatureFields when there's no Forms
+ at all
+
+---
+ poppler/PDFDoc.cc | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
+index 572c77be..4b5621fc 100644
+--- a/poppler/PDFDoc.cc
++++ b/poppler/PDFDoc.cc
+@@ -613,10 +613,12 @@ static void addSignatureFieldsToVector(FormField *ff, std::vector<FormFieldSigna
+ 
+ std::vector<FormFieldSignature*> PDFDoc::getSignatureFields()
+ {
+-//   const int num_pages = getNumPages();
+   std::vector<FormFieldSignature*> res;
+ 
+   const Form *f = catalog->getForm();
++  if (!f)
++      return res;
++
+   const int nRootFields = f->getNumFields();
+   for (int i = 0; i < nRootFields; ++i) {
+     FormField *ff = f->getRootField(i);
+-- 
+2.26.2
diff --git a/app-text/poppler/poppler-0.88.0-r1.ebuild b/app-text/poppler/poppler-0.88.0-r1.ebuild
new file mode 100644
index 000000000000..9f5630087fb4
--- /dev/null
+++ b/app-text/poppler/poppler-0.88.0-r1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/99"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-pdfsig-crash.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-0.88.0.ebuild b/app-text/poppler/poppler-0.89.0.ebuild
index 0cd5e76d8ec8..ce0b37279855 100644
--- a/app-text/poppler/poppler-0.88.0.ebuild
+++ b/app-text/poppler/poppler-0.89.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/99"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/100"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 0cd5e76d8ec8..ce0b37279855 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/99"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/100"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"