summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-06-18 14:08:24 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-06-18 14:08:24 +0000
commitb2b6a9947fa38941362d7699644fd3351f4b9d17 (patch)
tree2a40d031cd90b26e7f6134bafdb316d09ca43952 /app-text
parentVersion bump. (diff)
downloadgentoo-2-b2b6a9947fa38941362d7699644fd3351f4b9d17.tar.gz
gentoo-2-b2b6a9947fa38941362d7699644fd3351f4b9d17.tar.bz2
gentoo-2-b2b6a9947fa38941362d7699644fd3351f4b9d17.zip
Update amd64 gcc4 patch, bug #96461.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-text')
-rw-r--r--app-text/gpdf/ChangeLog6
-rw-r--r--app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch21
2 files changed, 25 insertions, 2 deletions
diff --git a/app-text/gpdf/ChangeLog b/app-text/gpdf/ChangeLog
index d3290b476171..4eb0cea49bfc 100644
--- a/app-text/gpdf/ChangeLog
+++ b/app-text/gpdf/ChangeLog
@@ -1,6 +1,10 @@
# 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.90 2005/06/12 19:22:42 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gpdf/ChangeLog,v 1.91 2005/06/18 14:08:24 azarah Exp $
+
+ 18 Jun 2005; Martin Schlemmer <azarah@gentoo.org>
+ files/gpdf-2.10.0-amd64-gcc4.patch:
+ Update amd64 gcc4 patch, bug #96461.
12 Jun 2005; Olivier Crête <tester@gentoo.org> gpdf-2.10.0.ebuild:
Stable on amd64
diff --git a/app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch b/app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch
index 31482548c414..63cc6d488d69 100644
--- a/app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch
+++ b/app-text/gpdf/files/gpdf-2.10.0-amd64-gcc4.patch
@@ -1,6 +1,12 @@
--- gpdf-2.10.0/xpdf/gpdf-control.cc 2005-05-20 15:03:29.000000000 +0200
+++ gpdf-2.10.0.az/xpdf/gpdf-control.cc 2005-05-20 15:06:39.000000000 +0200
-@@ -213,7 +213,7 @@
+@@ -209,12 +209,12 @@
+ const gchar * status)
+ {
+ GPdfControlPrivate *priv;
+- guint to_id;
++ unsigned long to_id;
+
g_return_if_fail (GPDF_IS_NON_NULL_CONTROL (control));
priv = control->priv;
@@ -9,3 +15,16 @@
g_object_get_data (G_OBJECT (control),
"status-timeout-id")) != 0) {
g_object_set_data (G_OBJECT (control),
+--- xpdf-3.00.old/xpdf/TextOutputDev.h 2004-01-22 09:26:45.000000000 +0800
++++ xpdf-3.00/xpdf/TextOutputDev.h 2005-06-08 10:15:45.000000000 +0800
+@@ -26,6 +26,10 @@
+ class GfxState;
+ class UnicodeMap;
+
++class TextBlock;
++class TextPage;
++class TextLineFrag;
++
+ //------------------------------------------------------------------------
+
+ typedef void (*TextOutputFunc)(void *stream, char *text, int len);