Fix bug 269546, FTBFS w/poppler-0.11.0, patch from Alexis Ballier, the magnificent. Move poppler-0.10.0.patch to ${P}-poppler-0.10.0.patch for consistency. Delete old.

(Portage version: 2.2_rc28/cvs/Linux x86_64)

5 files changed, 28 insertions, 78 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index 65052a636b52..40bbd2d186ee 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/xpdf
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.179 2009/04/07 10:07:45 rbu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.180 2009/05/14 19:54:42 loki_val Exp $
+
+  14 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  -files/poppler-0.10.0.patch, -xpdf-3.02-r1.ebuild, xpdf-3.02-r2.ebuild,
+  +files/xpdf-3.02-poppler-0.10.0.patch,
+  +files/xpdf-3.02-poppler-0.11.0.patch:
+  Fix bug 269546, FTBFS w/poppler-0.11.0, patch from Alexis Ballier, the
+  magnificent. Move poppler-0.10.0.patch to ${P}-poppler-0.10.0.patch for
+  consistency. Delete old.
 
   02 Apr 2009; Markus Meier <maekke@gentoo.org> xpdf-3.02-r2.ebuild:
   amd64 stable (bug #242930)
diff --git a/app-text/xpdf/files/poppler-0.10.0.patch b/app-text/xpdf/files/xpdf-3.02-poppler-0.10.0.patch
index fcf0d7f06195..fcf0d7f06195 100644
--- a/app-text/xpdf/files/poppler-0.10.0.patch
+++ b/app-text/xpdf/files/xpdf-3.02-poppler-0.10.0.patch
diff --git a/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch b/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch
new file mode 100644
index 000000000000..4545a4dce446
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.02-poppler-0.11.0.patch
@@ -0,0 +1,13 @@
+Index: xpdf-3.02-poppler/PDFCore.cc
+===================================================================
+--- xpdf-3.02-poppler.orig/PDFCore.cc
++++ xpdf-3.02-poppler/PDFCore.cc
+@@ -49,7 +49,7 @@ PDFCorePage::~PDFCorePage() {
+     delete links;
+   }
+   if (text) {
+-    delete text;
++    text->decRefCnt();
+   }
+ }
+ 
diff --git a/app-text/xpdf/xpdf-3.02-r1.ebuild b/app-text/xpdf/xpdf-3.02-r1.ebuild
deleted file mode 100644
index d9bf04c2245d..000000000000
--- a/app-text/xpdf/xpdf-3.02-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r1.ebuild,v 1.7 2009/03/30 02:06:40 loki_val Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="An X Viewer for PDF Files"
-HOMEPAGE="http://www.foolabs.com/xpdf/"
-SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}-poppler-20071121.tar.bz2
-	linguas_ar? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic-2003-feb-16.tar.gz )
-	linguas_zh_CN? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2004-jul-27.tar.gz )
-	linguas_zh_TW? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2004-jul-27.tar.gz )
-	linguas_ru? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic-2003-jun-28.tar.gz )
-	linguas_el? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek-2003-jun-28.tar.gz )
-	linguas_he? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew-2003-feb-16.tar.gz )
-	linguas_ja? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2004-jul-27.tar.gz )
-	linguas_ko? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2005-jul-07.tar.gz )
-	linguas_la? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2-2002-oct-22.tar.gz )
-	linguas_th? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai-2002-jan-16.tar.gz )
-	linguas_tr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish-2002-apr-10.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="nodrm linguas_ar linguas_zh_CN linguas_zh_TW linguas_ru linguas_el
-linguas_he linguas_ja linguas_ko linguas_la linguas_th linguas_tr"
-
-RDEPEND=">=virtual/poppler-0.6.1
-	x11-libs/openmotif
-	x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P}-poppler
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use nodrm && \
-		epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
-	has_version '>=virtual/poppler-0.10.0' && \
-		epatch "${FILESDIR}"/poppler-0.10.0.patch
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}
-
-src_install() {
-	dobin xpdf
-	doman xpdf.1 ${FILESDIR}/xpdfrc.5
-	insinto /etc
-	newins ${FILESDIR}/sample-xpdfrc xpdfrc
-	dodoc README ANNOUNCE CHANGES
-
-	use linguas_ar && install_lang arabic
-	use linguas_zh_CN && install_lang chinese-simplified
-	use linguas_zh_TW && install_lang chinese-traditional
-	use linguas_ru && install_lang cyrillic
-	use linguas_el && install_lang greek
-	use linguas_he && install_lang hebrew
-	use linguas_ja && install_lang japanese
-	use linguas_ko && install_lang korean
-	use linguas_la && install_lang latin2
-	use linguas_th && install_lang thai
-	use linguas_tr && install_lang turkish
-}
-
-install_lang() {
-	cd ../xpdf-$1
-	sed 's,/usr/local/share/xpdf/,/usr/share/xpdf/,g' add-to-xpdfrc >> ${D}/etc/xpdfrc
-	insinto /usr/share/xpdf/$1
-	doins -r *.unicodeMap *ToUnicode CMap
-}
diff --git a/app-text/xpdf/xpdf-3.02-r2.ebuild b/app-text/xpdf/xpdf-3.02-r2.ebuild
index 38e1b95a07a1..02b524ba7ef8 100644
--- a/app-text/xpdf/xpdf-3.02-r2.ebuild
+++ b/app-text/xpdf/xpdf-3.02-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild,v 1.7 2009/04/02 21:56:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.02-r2.ebuild,v 1.8 2009/05/14 19:54:42 loki_val Exp $
 
 EAPI=2
 
@@ -40,10 +40,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use nodrm && \
-		epatch "${FILESDIR}"/${P}-poppler-nodrm.patch
+	use nodrm && epatch "${FILESDIR}/${P}-poppler-nodrm.patch"
 	has_version '>=virtual/poppler-0.10.0' && \
-		epatch "${FILESDIR}"/poppler-0.10.0.patch
+		epatch "${FILESDIR}/${P}-poppler-0.10.0.patch"
+	has_version '>=virtual/poppler-0.11.0' && \
+		epatch "${FILESDIR}/${P}-poppler-0.11.0.patch"
 	epatch "${FILESDIR}/${P}-as-needed.patch"
 }