Added upstream patch to fix resize bug. Closes bug #105735.

(Portage version: 2.0.51.22-r3)

5 files changed, 172 insertions, 11 deletions

diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog
index b9fab8e28556..7f9fb5c6f324 100644
--- a/app-text/xpdf/ChangeLog
+++ b/app-text/xpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/xpdf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.94 2005/10/10 00:33:39 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.95 2005/10/10 00:42:47 metalgod Exp $
+
+*xpdf-3.01-r1 (10 Oct 2005)
+
+  10 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xpdf-3.01-resize.patch, +xpdf-3.01-r1.ebuild:
+  Added upstream patch to fix resize bug. Closes bug #105735.
 
   10 Oct 2005; Luis Medinas <metalgod@gentoo.org> -xpdf-3.00-r9.ebuild:
   Removing unneeded version.
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 803533169a2a..d50c16a9664a 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,11 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f13e994172ac291729772d570871aca7 ChangeLog 11320
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 0e303cf49620828eff323b0251d0141c xpdf-3.00-r8.ebuild 3622
 MD5 4baf6cdd9480cd938afaede8334c7a72 xpdf-3.00-r10.ebuild 3909
 MD5 763deff18a7e6e7125aca1f3d6be3229 xpdf-3.01.ebuild 3529
+MD5 2091534eb1146f315be5126708ab189f xpdf-3.01-r1.ebuild 3555
 MD5 ec978d9450f061ea49ee697b39d545bf files/digest-xpdf-3.00-r8 767
 MD5 41c050cd5c7ccdcf1676a6852c7a35ed files/xpdf-3.00-PathScanner.patch.bz2 1003
 MD5 3df9058a9971c09627e71dad6b056244 files/xpdf-3.00-core.patch.bz2 271
@@ -27,10 +25,5 @@ MD5 8bcdee9af356073f2e0dd88071379148 files/xpdf-3.01-crash.patch 1057
 MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01 767
 MD5 24d9ec970f2b8178c64f7150be0d7ace files/xpdf-3.00-64bit.patch 1304
 MD5 145b821ca07a9e6a110dfe0088a39dc0 files/xpdf-3.01-pdftoppm.patch 1911
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDScZVwUpWvClEHQoRAnu3AJ9Ht3DKwQBw6SgfEO3PyxiWez65VACdHGjH
-vrSK9bBPJiBb/Pb1Rt03INM=
-=BoBk
------END PGP SIGNATURE-----
+MD5 934ccc815f9aecaa94152266f8fb29d8 files/xpdf-3.01-resize.patch 1232
+MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01-r1 767
diff --git a/app-text/xpdf/files/digest-xpdf-3.01-r1 b/app-text/xpdf/files/digest-xpdf-3.01-r1
new file mode 100644
index 000000000000..a9aeca0c2984
--- /dev/null
+++ b/app-text/xpdf/files/digest-xpdf-3.01-r1
@@ -0,0 +1,12 @@
+MD5 e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz 599778
+MD5 67f05f65bc64bf022b36138c7c26746d xpdf-arabic.tar.gz 1058
+MD5 713659f0282b9e3d169390e246e5eb74 xpdf-chinese-simplified.tar.gz 756127
+MD5 5be730b859f8b01de569eb1bad188426 xpdf-chinese-traditional.tar.gz 698902
+MD5 21f57122247e2e2a63bfed4dc4f6c199 xpdf-cyrillic.tar.gz 1286
+MD5 2240a364b9c28ce09fd8c3107784ce40 xpdf-greek.tar.gz 1124
+MD5 438dd417517641cbb78a94facf2d938e xpdf-hebrew.tar.gz 1314
+MD5 57bb9359437583479b6670e75fa06c31 xpdf-japanese.tar.gz 430478
+MD5 10cd92e4eef065a6a26341d9a2a1b5c2 xpdf-korean.tar.gz 419081
+MD5 ac19ef990cd63afd2837c10dc7e1c3ab xpdf-latin2.tar.gz 1435
+MD5 9af495766ee4eaf3411d1fa74560f0ec xpdf-thai.tar.gz 1876
+MD5 f9233880805e3d8d2cf15a4fe679f25b xpdf-turkish.tar.gz 1140
diff --git a/app-text/xpdf/files/xpdf-3.01-resize.patch b/app-text/xpdf/files/xpdf-3.01-resize.patch
new file mode 100644
index 000000000000..c1240c3406f0
--- /dev/null
+++ b/app-text/xpdf/files/xpdf-3.01-resize.patch
@@ -0,0 +1,36 @@
+--- xpdf-3.01/xpdf/XPDFCore.cc.resize	2005-10-06 23:40:10.000000000 +0200
++++ xpdf-3.01/xpdf/XPDFCore.cc	2005-10-06 23:40:10.000000000 +0200
+@@ -979,6 +979,9 @@
+   XPDFCore *core = (XPDFCore *)ptr;
+   XEvent event;
+   Widget top;
++  Window rootWin;
++  int x1, y1;
++  Guint w1, h1, bw1, depth1;
+   Arg args[2];
+   int n;
+   Dimension w, h;
+@@ -986,15 +989,20 @@
+ 
+   // find the top-most widget which has an associated window, and look
+   // for a pending ConfigureNotify in the event queue -- if there is
+-  // one, that means we're still resizing, and we want to skip the
+-  // current event
++  // one, and it specifies a different width or height, that means
++  // we're still resizing, and we want to skip the current event
+   for (top = core->parentWidget;
+        XtParent(top) && XtWindow(XtParent(top));
+        top = XtParent(top)) ;
+   if (XCheckTypedWindowEvent(core->display, XtWindow(top),
+ 			     ConfigureNotify, &event)) {
+     XPutBackEvent(core->display, &event);
+-    return;
++    XGetGeometry(core->display, event.xconfigure.window,
++		 &rootWin, &x1, &y1, &w1, &h1, &bw1, &depth1);
++    if ((Guint)event.xconfigure.width != w1 ||
++	(Guint)event.xconfigure.height != h1) {
++      return;
++    }
+   }
+ 
+   n = 0;
diff --git a/app-text/xpdf/xpdf-3.01-r1.ebuild b/app-text/xpdf/xpdf-3.01-r1.ebuild
new file mode 100644
index 000000000000..a8bf900490dc
--- /dev/null
+++ b/app-text/xpdf/xpdf-3.01-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.01-r1.ebuild,v 1.1 2005/10/10 00:42:47 metalgod Exp $
+
+inherit eutils
+
+DESCRIPTION="An X Viewer for PDF Files"
+HOMEPAGE="http://www.foolabs.com/xpdf/"
+SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz
+	linguas_ar? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic.tar.gz )
+	linguas_zh_CN? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified.tar.gz )
+	linguas_zh_TW? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional.tar.gz )
+	linguas_ru? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic.tar.gz )
+	linguas_el? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek.tar.gz )
+	linguas_he? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew.tar.gz )
+	linguas_ja? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese.tar.gz )
+	linguas_ko? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean.tar.gz )
+	linguas_la? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz )
+	linguas_th? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai.tar.gz )
+	linguas_tr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="motif X"
+
+DEPEND="motif? ( !s390? ( virtual/x11
+	x11-libs/openmotif ) )
+	X? (
+		>=media-libs/freetype-2.0.5
+		media-libs/t1lib
+		virtual/ghostscript
+		virtual/x11 )"
+
+RDEPEND="${DEPEND}
+	linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 )
+	linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 )
+	linguas_ko? ( >=media-fonts/baekmuk-fonts-2.2 )
+	!app-text/xpdf-chinese-simplified
+	!app-text/xpdf-chinese-traditional
+	!app-text/xpdf-cyrillic
+	!app-text/xpdf-greek
+	!app-text/xpdf-japanese
+	!app-text/xpdf-korean
+	!app-text/xpdf-latin2
+	!app-text/xpdf-thai
+	!app-text/xpdf-turkish"
+PROVIDE="virtual/pdfviewer"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.00-gcc41.patch
+	epatch ${FILESDIR}/${PN}-3.00-64bit.patch
+	epatch ${FILESDIR}/${P}-crash.patch
+	epatch ${FILESDIR}/${P}-pdftoppm.patch
+	epatch ${FILESDIR}/${P}-resize.patch
+	autoconf
+}
+
+src_compile() {
+
+	local myconf
+	if use X; then
+		myconf="${myconf} --with-x --enable-freetype2 \
+		--with-freetype2-includes=/usr/include/freetype2"
+	else
+		myconf="${myconf} --without-x --without-freetype2-library"
+	fi
+
+	econf \
+		${myconf} \
+		--enable-opi -enable-multithreaded  || die "Configure Failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	prepallman
+	dodoc README ANNOUNCE CHANGES
+	insinto /etc
+	newins ${FILESDIR}/xpdfrc.1 xpdfrc
+
+	# install languages, but not on ppc64 (produces crashes...)
+	if use !ppc64; then
+		use linguas_ar && install_lang turkish
+		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
+	fi
+}
+
+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 *.unicodeMap
+	doins *.cid*
+	insinto /usr/share/xpdf/$1/CMap
+	doins CMap/*
+}
+
+pkg_postinst() {
+	use motif || einfo "If you want to compile xpdf binary you have to set USE=motif"
+}