Fix printing of some pdf files, bug 426674

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 171 insertions, 15 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index ed1ad480a699..e0a181f7dfc9 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.327 2012/07/23 21:36:52 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.328 2012/07/31 08:51:13 dilfridge Exp $
+
+*poppler-0.20.2-r1 (31 Jul 2012)
+
+  31 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +poppler-0.20.2-r1.ebuild, +files/poppler-0.20.2-xyscale.patch:
+  Fix printing of some pdf files, bug 426674
 
   23 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org> poppler-0.20.2.ebuild:
   Needs newer gobject-introspection, bug 379527
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d1e2a7f52e0b..29a3fc7ac8e1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,26 +3,28 @@ Hash: SHA256
 
 AUX poppler-0.18.4-newline.patch 529 SHA256 9bcd45cb6f13caedc01a2c95faccea750a8fc80718fbd2a7c0f991e389c0d40c SHA512 2091cedcc8b4de8ed481db3c647b4996e56780fd95a6840ff8212869e94ad44a872ebee264168a8a7082ed9fd1ad94eb6fd337c453a0ede5cc1647e11bb4aeed WHIRLPOOL 994ebb2a2288ddc67e5f1de6ea9f55fa6a6e99887c52590caa61627a37be9f143a4169d5f7d16336fb73f7377538a63c2e826b18547de0c4f5095068e5503dbf
 AUX poppler-0.20.1-lcms-automagic.patch 4393 SHA256 2a75cd5955fe976d1b052839297561853e6c597256610cf1ebcf6aba28e1b81c SHA512 5c3af759aeaf1a3be534bc2f90dde3674e4967c7257cc2499505cef014d1c7570eaa53cc1ee9e4b079302085130dbb8215c1795cbd701a0c057273310a32bee5 WHIRLPOOL 2657072b71f916f94f8a1e1c2dd4348334aaa8df2369d5e6aa47d5c27493d32cdf6124d643c91681e65ac5d6d3ac0df01524b683e19bed6c96bc5d7097f13471
+AUX poppler-0.20.2-xyscale.patch 1337 SHA256 c15c41d7467744ab5dcdd11982a02e26ddfeee427efd624466353acf61e151a6 SHA512 9509c40572634a42c63fe5b99ee45b65e4cacb9a3df48557a40aa24df102b4fbec3ae69a98113b3fb13d030532a8e9ea8596718ec156c839ff2ff58f3a947853 WHIRLPOOL be81620eb075c4f8448cd4d425a1a13f893947998b75211500cc594819e97e1c94412fd2fd3b8ff12d19a6e9323dfbe3ba3ee6e41da4b57c372f35d7ff6134b6
 DIST poppler-0.18.4.tar.gz 1992993 SHA256 33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e SHA512 dc7a8f059b6d0b1a73160a40226efc7b9d058806cc62c7b59e868453fef679dd92095629d26462f3697e96e6b16f95ce5425b7b96985f04b4d2db83e432e5216 WHIRLPOOL af4b8889aa0005dff5d4dae0414e2c1468e9a5bf58365425dae5cc96ae6afa8c2943cfc632a23781ac558df54e71f55d3195e8219f1410f026aebaf7cb62ba23
 DIST poppler-0.20.2.tar.gz 2146312 SHA256 2debc5034e0e85402957d84fb2674737658a3dbe8a3c631e1792e3f8c88ce369 SHA512 7a9a9e94298be025d8ee2dcba2be61c9d6bf167cee238a2599e211999ce0dcb59b5ef3418c5f3a6ddc8f1600e7ef2954c53f4a4149742a8a87879b1c58e77bed WHIRLPOOL 3c614eec3e054439a0733d00904fb27788c09ad41735397a5283ca74be0ec80b4f5ea77cf02a1a6706a2d0adf7cef2835eefe0e84f976aefcc8bbedd2e7e0430
 EBUILD poppler-0.18.4-r1.ebuild 2704 SHA256 57140d5c35dc153f10db2054a03d9260f28199eef4b6b967c51e8d2c5a1fd1a6 SHA512 96d0b1a1de6eb5664c16e8c409f6ed9af750a6c8b5e02248ba79bc591649cc5220fd3617c16bbe152e8050fbe441d157d9411cf32708de815aa7538cd6a1980a WHIRLPOOL 8db25773e0a98137c2d2a52d6702c226711552d5befe2d26f9a218d2dfd28f01f89b9a1e1cda917f55531f4df075127b44349cc966447349373cc76601c9727c
+EBUILD poppler-0.20.2-r1.ebuild 2835 SHA256 cb5e4c297b57b9e33a391244e2486faa5a06d44b4a219a3faa92aa23aaa4ed44 SHA512 cc0d69a486ad0de2fd2ce821e9765ded1dd17cfe8a1e672e66a7deb2a0050df565a3375f0593a6b4f8a26f895b4d4eceeae2d70d2e4d61342eb4f9c88c2895bf WHIRLPOOL 88f14dbe0fe69d080ea4c6baca76f5b3087b911abf12d3e2cb9c9ac1df9b1db548ae16e926e007f43fec26c516fd6e74f4c7561793e4558b1e56af6c2dcf7baa
 EBUILD poppler-0.20.2.ebuild 2790 SHA256 19e247dbbc6c39ba2c0dcdbf2f4c0ee2540f61e4f92fa30991d4b98406e29ffd SHA512 b0f5b0419dd55d5f7633ecd89f57882e176c190d746c6d02dbe2c36204348d44ed7b4ef0cae39ac6bccb94d0fe4a348d1b8550d08f3c129e419949dc816c9c9d WHIRLPOOL be7f72a54ce9ce6ac6192f68437cee3c1c6067fa4bf137291c1acadb3c626eb5d451c88d93a61f82f23f6325f20c087c2b46550a1b1c197c5cbe40c144fb50d4
-MISC ChangeLog 46355 SHA256 7d71a0bc5a77963d42a104fd94879226a943e5a2f0d4d0e36ee4564c3533fcb0 SHA512 55c3305af3e36a1260b5204032865b495503d0598f469eaf240b994ec749b76727e5b5a13a50bcef604c4b7b2133349876bfc358645be03d57cb9d5ff0f2694e WHIRLPOOL b6c3d405d0ff79bd4f9dda57462dc8bb733d7e764f3c46095990834d71a9b87e7c255dc8580be74f9c031f39dc17ac7a359cb8bf6b27c0de450d3ce008956251
+MISC ChangeLog 46558 SHA256 a7d2ed5f46e5723b9b77d6133513c5db3866898232f1ae16531abed39280e533 SHA512 b648849688dc8aaec7d74ec1867df5faa1c4bb689814835c7e870db12974fcc0bca9635718226f7e58acd2b6ffa77e7e1f3a3e8b35a4a6547d1dd753d81ae196 WHIRLPOOL 7320d0e0c05243acb2f948699b7767e0d3b49736be351c88b3d077c87c9c677a7d325e7a4af0c0e874fe8addc9f4fa2a6cf28d60c94a95f9eb70d1e3eba9cc14
 MISC metadata.xml 471 SHA256 3aa4080929d6187ab9b4579d3d99bcf483593010be27b04e524e19c3292d86fb SHA512 830f8f21e131c4552b383fd4a3c95c6e6fcfd9c6aae4855e71d2c92fa9a3f461e3bf9d66f775d191ac196af692ca9aec5950c7ca7bc7a69cbcd4f864a2011238 WHIRLPOOL 996874d4891b26298e57b4083c03bb1bcd40734941d9aea268cd3cec0a0cf53e47c1a2975fe4631fe351a0ac4db80f0727e5a87ff7272bfd15f79bfe6988e63f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQDcR1AAoJENwGBM22xffe5KYQAKunXd5J17aXj+uoawKUBvPR
-lBT2bY32bJaSTnsNlUFdU07d6KzDtdCt6kdY9S2+5eXWvUJL6ZEzIzKuse5ylY5d
-YyohE5hqeiaDeaUIhFhYGiBFaPC//95EuPRxhOwzdb3/wYi6CgyE76PPR38Q7EN+
-GwYJ90fVzKtdVxaLJbkOLcmD9Q+g0Bev7I0prGmCgkY9M/siOpU/otGEaFH39iaZ
-X7AIjQBCUEfw4RwbisZcuvDlHXq5RSZ/9g8AobgExc61LXrZDetLTzqby9W5OD2Q
-RRWSg8Sq3UNbxi2yibLBhVUKLfhkaY5f8d2jBZTK68y97PBDZ2Jm7j1iLepg1fes
-5Bf1slzzwjnc5mmRcUXIIPYz5ROGA4xAsZq4beOP2dpfiOSnCPBEw7L3/K4sXA5G
-2dTXhSA8z3i9dxIpv8dT/dVkQY0WAxjHMbUBgNqnPlC77nbHVuUogX2zlbwMNbw+
-Wr1KgsAHelMxoCKjQe2Y9TZa8kOh1vyhxK+sTpQv1T+AD31Pw7BAXOgHK836nXOq
-fKn+LvVCBdne87XQ/C2PP65IxjVqZMmKdiaBLR8CkO4RaSHmisinMzYwXUBo4SBf
-CpkFgJlqxMZYdqK6H1ZWBg6TRhy4/v9rgQNCpe+JnhtaXZaiqCiqZMikH/lJTLP4
-rzCcwbxiUoxtbTuZKxSg
-=jP5W
+iQIcBAEBCAAGBQJQF5zlAAoJEEb+UGWnxTyHossQALoxyfE4dQrk4Qc9iyGMOr+J
+MevQ+iUY4TDHPVyY+VVdZxIvu+AY1KkUYeIAXX/zxa4AVdUsXPUvZUBMlEVJgzaN
+wwDqMCEkRWDcP51g3q+JRoCRB/8zRKEqzTuq8/J0dDVGrpw/aNcosAcDWzECR7jr
+Re1wLt/7Js9edlrEwv3FesNg+Q/ByaEi3pUt60PXxgAEFOzhYBfBu/17ZyAy4oiN
+WnDc3NythxVgvu9PsF+kL1t+mn3fOWj3lr3BAj14F3VIRtRpSs75VuH2isRb+Rci
+S8whiFSxojQK9brn3q+WKclvb34scChOf9B9TgPaot3GrCzVCsY1PkdQz52Do6y8
+idyFXZAZz69c4W+EaQYiV//0ISLMZSwWlM4twf9zPJYPpTeyLBPt6HDL+7rZqOkx
+XO0qmqzruXkX6a5EW73OHX+W5FJD2Dewg0WBuB8Z5DGaBtNLOEL8AJrFq3IV6x3f
+11jMQ+hmqY1AGhZTJOAgJecziofjc5EuUnge1LLEIFrN1tE6HLMSfFz/RibIokZ9
+iTAIjpm1KBaKfn92TquOG3hKqQUtq1YkTa9YtjoWacSdiN+VNMSZsIAlMLE/rSse
+4OevAZ3oe/MDOAVfdwIRhL2yIe0sPpnEAkrzmQRnj4AJkCFe0otzU0x8P6tVhSDg
+4C0eXj6C7EoKHDINuHX7
+=563n
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/poppler-0.20.2-xyscale.patch b/app-text/poppler/files/poppler-0.20.2-xyscale.patch
new file mode 100644
index 000000000000..6602dc909c2f
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.20.2-xyscale.patch
@@ -0,0 +1,46 @@
+From 36481939e3064de920e49d9d1742a85473a50963 Mon Sep 17 00:00:00 2001
+From: Thomas Freitag <Thomas.Freitag@alfa.de>
+Date: Sun, 22 Jul 2012 16:40:46 +0000
+Subject: Make sure xScale and yScale are always initialized
+
+Bug #52215
+---
+diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
+index a01a4b3..e15c2e9 100644
+--- a/poppler/PSOutputDev.cc
++++ b/poppler/PSOutputDev.cc
+@@ -3521,6 +3521,7 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
+     saveState(NULL);
+   }
+ 
++  xScale = yScale = 1;
+   switch (mode) {
+ 
+   case psModePSOrigPageSizes:
+@@ -3631,8 +3632,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
+       } else {
+ 	yScale = xScale;
+       }
+-    } else {
+-      xScale = yScale = 1;
+     }
+     // deal with odd bounding boxes or clipping
+     if (clipLLX0 < clipURX0 && clipLLY0 < clipURY0) {
+@@ -3694,7 +3693,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
+     if (tx != 0 || ty != 0) {
+       writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty);
+     }
+-    xScale = yScale = 1;
+     break;
+ 
+   case psModeForm:
+@@ -3702,7 +3700,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) {
+     writePS("begin xpdf begin\n");
+     writePS("pdfStartPage\n");
+     tx = ty = 0;
+-    xScale = yScale = 1;
+     rotate = 0;
+     break;
+   }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/app-text/poppler/poppler-0.20.2-r1.ebuild b/app-text/poppler/poppler-0.20.2-r1.ebuild
new file mode 100644
index 000000000000..468a0fcfe6c9
--- /dev/null
+++ b/app-text/poppler/poppler-0.20.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.20.2-r1.ebuild,v 1.1 2012/07/31 08:51:14 dilfridge Exp $
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="http://poppler.freedesktop.org/"
+SRC_URI="http://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~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"
+IUSE="cairo cjk curl cxx debug doc +introspection jpeg jpeg2k +lcms png qt4 tiff +utils +xpdf-headers"
+
+# 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 )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	lcms? ( media-libs/lcms:2 )
+	png? ( >=media-libs/libpng-1.4:0 )
+	qt4? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!dev-libs/poppler
+	!dev-libs/poppler-glib
+	!dev-libs/poppler-qt3
+	!dev-libs/poppler-qt4
+	!app-text/poppler-utils
+	cjk? ( >=app-text/poppler-data-0.4.4 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.20.1-lcms-automagic.patch"
+	"${FILESDIR}/${PN}-0.20.2-xyscale.patch"
+)
+
+DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		$(cmake-utils_use_enable curl LIBCURL)
+		$(cmake-utils_use_enable cxx CPP)
+		$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
+		$(cmake-utils_use_enable utils)
+		$(cmake-utils_use_enable xpdf-headers XPDF_HEADERS)
+		$(cmake-utils_use_with cairo)
+		$(cmake-utils_use_with introspection GObjectIntrospection)
+		$(cmake-utils_use_with jpeg)
+		$(cmake-utils_use_with png)
+		$(cmake-utils_use_with qt4)
+		$(cmake-utils_use_with tiff)
+	)
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use cairo && use doc; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/* || die 'failed to install API documentation'
+	fi
+}
+
+pkg_postinst() {
+	ewarn "After upgrading app-text/poppler you may need to reinstall packages"
+	ewarn "linking to it. If you're not a portage-2.2_rc user, you're advised"
+	ewarn "to run revdep-rebuild"
+}