[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/, app-text/poppler/files/

[Andreas Hüttel]

commit:     cba3797d92767648c2a35c431a38a5ec8300b923
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 20:51:02 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 20:51:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cba3797d

app-text/poppler: Backport two crash fixes from upstream git

Package-Manager: portage-2.3.0

 .../poppler/files/poppler-0.46.0-crashfix-1.patch  |  36 +++++
 .../poppler/files/poppler-0.46.0-crashfix-2.patch  |  41 ++++++
 app-text/poppler/poppler-0.46.0-r1.ebuild          | 145 +++++++++++++++++++++
 3 files changed, 222 insertions(+)

diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch b/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch
new file mode 100644
index 0000000..6d2352b
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch
@@ -0,0 +1,36 @@
+From 7d3aea760a14a73962e429059f73d97391660367 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@×××.org>
+Date: Sat, 30 Jul 2016 17:32:59 +0200
+Subject: [PATCH 1/2] Fix abort on documents where the docinfo obj is not a
+ dict
+
+Bug #97134
+---
+ poppler/PDFDoc.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
+index c91d6e4..a51d8b6 100644
+--- a/poppler/PDFDoc.cc
++++ b/poppler/PDFDoc.cc
+@@ -14,7 +14,7 @@
+ // under GPL version 2 or later
+ //
+ // Copyright (C) 2005, 2006, 2008 Brad Hards <bradh@×××××××××.net>
+-// Copyright (C) 2005, 2007-2009, 2011-2015 Albert Astals Cid <aacid@×××.org>
++// Copyright (C) 2005, 2007-2009, 2011-2016 Albert Astals Cid <aacid@×××.org>
+ // Copyright (C) 2008 Julien Rebetez <julienr@×××××××××.org>
+ // Copyright (C) 2008, 2010 Pino Toscano <pino@×××.org>
+ // Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc@×××××.org>
+@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const char *key, GooString *value)
+ GooString *PDFDoc::getDocInfoStringEntry(const char *key) {
+   Object infoObj;
+   getDocInfo(&infoObj);
+-  if (infoObj.isNull()) {
++  if (!infoObj.isDict()) {
+       return NULL;
+   }
+ 
+-- 
+2.9.1
+

diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch b/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch
new file mode 100644
index 0000000..3c2aa0a
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch
@@ -0,0 +1,41 @@
+From 3f5c84e17acfa71dfd44514384398f5a4c449630 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@×××.org>
+Date: Sat, 30 Jul 2016 17:50:42 +0200
+Subject: [PATCH 2/2] Check for XRefEntry existing before using it
+
+Bug #97005
+---
+ poppler/Hints.cc | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/poppler/Hints.cc b/poppler/Hints.cc
+index bdd0d32..6c2fc25 100644
+--- a/poppler/Hints.cc
++++ b/poppler/Hints.cc
+@@ -5,7 +5,7 @@
+ // This file is licensed under the GPLv2 or later
+ //
+ // Copyright 2010, 2012 Hib Eris <hib@×××××××.nl>
+-// Copyright 2010, 2011, 2013, 2014 Albert Astals Cid <aacid@×××.org>
++// Copyright 2010, 2011, 2013, 2014, 2016 Albert Astals Cid <aacid@×××.org>
+ // Copyright 2010, 2013 Pino Toscano <pino@×××.org>
+ // Copyright 2013 Adrian Johnson <ajohnson@×××××××.com>
+ // Copyright 2014 Fabio D'Urso <fabiodurso@×××××××.it>
+@@ -43,7 +43,13 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security
+       pageObjectFirst);
+     pageObjectFirst = 0;
+   }
+-  pageOffsetFirst = xref->getEntry(pageObjectFirst)->offset;
++  XRefEntry *pageObjectFirstXRefEntry = xref->getEntry(pageObjectFirst);
++  if (!pageObjectFirstXRefEntry) {
++      error(errSyntaxWarning, -1, "No XRef entry for first page object");
++      pageOffsetFirst = 0;
++  } else {
++      pageOffsetFirst = pageObjectFirstXRefEntry->offset;
++  }
+ 
+   if (nPages >= INT_MAX / (int)sizeof(Guint)) {
+      error(errSyntaxWarning, -1, "Invalid number of pages ({0:d}) for hints table", nPages);
+-- 
+2.9.1
+

diff --git a/app-text/poppler/poppler-0.46.0-r1.ebuild b/app-text/poppler/poppler-0.46.0-r1.ebuild
new file mode 100644
index 0000000..fcc7008
--- /dev/null
+++ b/app-text/poppler/poppler-0.46.0-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/63"   # 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 cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
+
+REQUIRED_USE="cairo-qt? ( qt4 )"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	cairo-qt? ( >=x11-libs/cairo-1.10.0 )
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+	"${FILESDIR}/${P}-crashfix-1.patch"
+	"${FILESDIR}/${P}-crashfix-2.patch"
+)
+
+src_prepare() {
+	cmake-utils_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 -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	# Enable experimental patchset for subpixel font rendering using cairo
+	# backend for poppler-qt4 from https://github.com/giddie/poppler-qt4-cairo-backend.
+	if use cairo-qt; then
+		ewarn "Enabling unsupported, experimental cairo-qt patchset. Please do not report bugs."
+		epatch "${FILESDIR}/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_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
+}