apply patch to fix bug #100265

(Portage version: 2.0.51.22-r2)

5 files changed, 82 insertions, 6 deletions

diff --git a/app-text/gpdf/ChangeLog b/app-text/gpdf/ChangeLog
index 11e9778bc3d2..84c73e64f949 100644
--- a/app-text/gpdf/ChangeLog
+++ b/app-text/gpdf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/gpdf
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.94 2005/07/12 00:08:26 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.95 2005/08/12 13:33:29 allanonjl Exp $
+
+*gpdf-2.10.0-r1 (12 Aug 2005)
+
+  12 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gpdf-2.8.2-CAN-2005-2097.patch, -gpdf-2.10.0.ebuild,
+  +gpdf-2.10.0-r1.ebuild:
+  apply patch to fix bug #100265
 
   12 Jul 2005; Stephen P. Becker <geoman@gentoo.org> gpdf-2.10.0.ebuild:
   stable on mips
diff --git a/app-text/gpdf/Manifest b/app-text/gpdf/Manifest
index 0459c3a3b587..74836ef3eaed 100644
--- a/app-text/gpdf/Manifest
+++ b/app-text/gpdf/Manifest
@@ -1,9 +1,9 @@
 MD5 a805385ef63f46517fcdf018fb0e08d9 gpdf-0.132-r2.ebuild 1169
 MD5 3ec94b0d7a37f7330404f3197c6bfbcd gpdf-2.8.2.ebuild 1130
-MD5 57cfb769fa28af89af78c815b54f8063 gpdf-2.10.0.ebuild 1261
 MD5 d094dcab1afd170dae62b054d98e3acb gpdf-0.132-r1.ebuild 1025
+MD5 3ea20199ee0d6bf672281097531399f6 gpdf-2.10.0-r1.ebuild 1343
 MD5 b492633bcb5170b71ce72fb7d24545c5 gpdf-2.8.3.ebuild 1153
-MD5 7df766e09dea41f9f5ea033fc4560948 ChangeLog 10078
+MD5 759b953d789bd53b42a505d9551d5970 ChangeLog 10287
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 362296e34a1a04a6e5e2a7d9e97547c6 files/gpdf-xpdf2_underflow.patch 2363
 MD5 2a2fc64147e806f72bdda9e2e66731a0 files/digest-gpdf-2.8.2 64
@@ -11,10 +11,11 @@ MD5 5bc556bc031d2f6ed2e0b609253e8b93 files/digest-gpdf-2.8.3 64
 MD5 c32a612ce419b9930ff273cf382558bf files/gpdf-xpdf-3.00pl3.patch 346
 MD5 2fce5bedd61300fad1566a41f991a782 files/gpdf-xpdf_goo_sizet.patch 1424
 MD5 651529b6e386b3a73ffd9cc0c19e9661 files/gpdf-xpdf-CAN-2004-1125.patch 1666
-MD5 388d05f1aabd1c48c3536ac69d0d8505 files/digest-gpdf-2.10.0 65
 MD5 5e63c86e19a1c1387cab38b7e2902c9e files/gpdf-xpdf_3_CAN-2004-0889.patch 8115
+MD5 388d05f1aabd1c48c3536ac69d0d8505 files/digest-gpdf-2.10.0-r1 65
 MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r1 64
 MD5 167bcfd9a6e435acc241c07dc522b562 files/digest-gpdf-0.132-r2 64
+MD5 610ea361ff30d6f30e4075d5bdb44806 files/gpdf-2.8.2-CAN-2005-2097.patch 1973
 MD5 ba500e3211d62fc797db36fdcf1e2b76 files/gpdf-2.10.0-amd64-gcc4.patch 945
 MD5 b32f90fc9249d1f7434659642b36f9d9 files/gpdf-xpdf_2_CAN-2004-0888.patch 2716
 MD5 9336bbbfbb54ba88fb5e4aba2da1833f files/gpdf-0.112-remove_gtk24_call.patch 607
diff --git a/app-text/gpdf/files/digest-gpdf-2.10.0 b/app-text/gpdf/files/digest-gpdf-2.10.0-r1
index 05bc0c9effe5..05bc0c9effe5 100644
--- a/app-text/gpdf/files/digest-gpdf-2.10.0
+++ b/app-text/gpdf/files/digest-gpdf-2.10.0-r1
diff --git a/app-text/gpdf/files/gpdf-2.8.2-CAN-2005-2097.patch b/app-text/gpdf/files/gpdf-2.8.2-CAN-2005-2097.patch
new file mode 100644
index 000000000000..39522500e417
--- /dev/null
+++ b/app-text/gpdf/files/gpdf-2.8.2-CAN-2005-2097.patch
@@ -0,0 +1,66 @@
+Patch to fix CAN-2005-2097.  The patch in #163920 doesn't apply to
+gpdf, since gpdf uses the gnome print api for rendering.  The crux of
+that patch is to avoid using the FoFi (font file) classes for fixing
+up the embedded truetype font, but instead pass the font to freetype
+directly.  This patch does the same thing for the gpdf rendering code.
+
+Kristian Høgsberg <krh@redhat.com>
+
+--- gpdf-2.8.2/xpdf/GPOutputDev.cc.krh	2005-08-01 11:44:43.000000000 -0400
++++ gpdf-2.8.2/xpdf/GPOutputDev.cc	2005-08-01 11:45:32.000000000 -0400
+@@ -258,9 +258,6 @@
+   }
+   case fontTrueType: {
+     FoFiTrueType *ff;
+-    gint fd;
+-    gchar *temp_name;
+-    FILE *f;
+     gushort *code_to_gid;
+ 
+     ff = FoFiTrueType::make((char *)contents, length);
+@@ -269,16 +266,7 @@
+ 
+     code_to_gid = ((Gfx8BitFont *)font)->getCodeToGIDMap(ff); // this is g(oo)malloc'd
+ 
+-    fd = g_file_open_tmp("gpdf-ttf-XXXXXX", &temp_name, NULL);
+-    f = fdopen(fd, "wb");
+-    ff->writeTTF(&fileWrite, f);
+     delete ff;
+-    g_free(contents);
+-    fclose(f);
+-
+-    g_file_get_contents(temp_name, (gchar **)&contents, &length, NULL);
+-    unlink(temp_name);
+-    g_free(temp_name);
+ 
+     gff = gpdf_font_face_download((const guchar *)font_name,
+ 				  (const guchar *)"",
+@@ -324,28 +312,8 @@
+     break;
+   }
+   case fontCIDType2: {
+-    FoFiTrueType *ff;
+-    gint fd;
+-    gchar *temp_name;
+-    FILE *f;
+     gint n_cids;    
+     gushort *code_to_gid;
+-
+-    ff = FoFiTrueType::make((char *)contents, length);
+-    if (!ff)
+-      return getFontFaceFallback(font);
+-
+-    fd = g_file_open_tmp("gpdf-ttf-XXXXXX", &temp_name, NULL);
+-    f = fdopen(fd, "wb");
+-    ff->writeTTF(&fileWrite, f);
+-    delete ff;
+-    g_free(contents);
+-    fclose(f);
+-
+-    g_file_get_contents(temp_name, (gchar **)&contents, &length, NULL);
+-    unlink(temp_name);
+-    g_free(temp_name);
+-
+     gff = gpdf_font_face_download((const guchar *)font_name,
+ 				  (const guchar *)"",
+ 				  GNOME_FONT_REGULAR, FALSE,
diff --git a/app-text/gpdf/gpdf-2.10.0.ebuild b/app-text/gpdf/gpdf-2.10.0-r1.ebuild
index 1f39820185fb..89a8777c0dcf 100644
--- a/app-text/gpdf/gpdf-2.10.0.ebuild
+++ b/app-text/gpdf/gpdf-2.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/gpdf-2.10.0.ebuild,v 1.12 2005/07/12 00:08:26 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/gpdf-2.10.0-r1.ebuild,v 1.1 2005/08/12 13:33:29 allanonjl Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.5.4
@@ -44,6 +44,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-amd64-gcc4.patch
 	# Disable the tests, see bug #73882
 	sed -i -e "s:test-files::" Makefile.in
+	# Fix for bug #100265
+	epatch ${FILESDIR}/${PN}-2.8.2-CAN-2005-2097.patch
 }
 
 src_install() {