apply patch for proper compilation on amd64. Contributed by Yu Yuwei <acevery AT gmail DOT com> and Ed Catmur <ed@ AT atmur DOT co DOT uk> in bug 193458

(Portage version: 2.1.3.19)

3 files changed, 71 insertions, 2 deletions

diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog
index 0d9c1a1e5641..a11a8649e029 100644
--- a/gnome-extra/gtkhtml/ChangeLog
+++ b/gnome-extra/gtkhtml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gtkhtml
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.142 2008/01/29 18:13:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.143 2008/01/30 12:23:13 opfer Exp $
+
+  30 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/gtkhtml-3.2-gi18n.patch, gtkhtml-3.2.5.ebuild:
+  apply patch for proper compilation on amd64. Contributed by Yu Yuwei
+  <acevery AT gmail DOT com> and Ed Catmur <ed@ AT atmur DOT co DOT uk> in bug
+  193458
 
   29 Jan 2008; Daniel Gryniewicz <dang@gentoo.org> gtkhtml-3.2.5.ebuild,
   gtkhtml-3.6.2.ebuild, gtkhtml-3.12.3.ebuild, gtkhtml-3.14.3.ebuild,
diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.2-gi18n.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.2-gi18n.patch
new file mode 100644
index 000000000000..a2e9a6325245
--- /dev/null
+++ b/gnome-extra/gtkhtml/files/gtkhtml-3.2-gi18n.patch
@@ -0,0 +1,61 @@
+--- gtkhtml-3.2.5/components/html-editor/body.c	2007/09/22 22:24:29	1.1
++++ gtkhtml-3.2.5/components/html-editor/body.c	2007/09/22 22:24:50
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #include <libgnome/gnome-i18n.h>
+ #include <string.h>
++#include <glib/gi18n-lib.h>
+ #include "gi-color-combo.h"
+ #include "htmlengine-edit.h"
+ #include "htmlengine-edit-clueflowstyle.h"
+--- gtkhtml-3.2.5/components/html-editor/template.c	2007/09/22 22:41:26	1.1
++++ gtkhtml-3.2.5/components/html-editor/template.c	2007/09/22 22:41:52
+@@ -24,6 +24,7 @@
+ #include <libgnome/gnome-i18n.h>
+ #include <string.h>
+ #include <glade/glade.h>
++#include <glib/gi18n-lib.h>
+ 
+ #include "gtkhtml.h"
+ #include "htmlcursor.h"
+--- gtkhtml-3.2.5/components/html-editor/toolbar.c	2007/09/22 22:43:24	1.1
++++ gtkhtml-3.2.5/components/html-editor/toolbar.c	2007/09/22 22:43:35
+@@ -27,6 +27,7 @@
+ #include <libgnome/gnome-i18n.h>
+ #include <gnome.h>
+ #include <bonobo.h>
++#include <glib/gi18n-lib.h>
+ 
+ #include "gi-color-combo.h"
+ #include "toolbar.h"
+--- gtkhtml-3.2.5/components/html-editor/utils.c	2007/09/22 22:44:03	1.1
++++ gtkhtml-3.2.5/components/html-editor/utils.c	2007/09/22 22:44:16
+@@ -23,6 +23,7 @@
+ #include <config.h>
+ #include <libgnome/gnome-i18n.h>
+ #include <string.h>
++#include <glib/gi18n-lib.h>
+ #include "gtkhtml-compat.h"
+ #include "htmlcursor.h"
+ #include "htmlengine.h"
+--- gtkhtml-3.2.5/components/html-editor/gi-color-palette.c	2007/09/22 22:44:57	1.1
++++ gtkhtml-3.2.5/components/html-editor/gi-color-palette.c	2007/09/22 22:45:11
+@@ -36,6 +36,7 @@
+ #include <libgnomecanvas/gnome-canvas.h>
+ #include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
+ #include <gdk/gdkcolor.h>
++#include <glib/gi18n-lib.h>
+ #include "gi-color-group.h"
+ #include "gi-color-palette.h"
+ #include "gi-colors.h"
+--- gtkhtml-3.2.5/components/html-editor/test-html-editor-control.c	2007/09/22 22:46:35	1.1
++++ gtkhtml-3.2.5/components/html-editor/test-html-editor-control.c	2007/09/22 22:46:46
+@@ -23,6 +23,7 @@
+ 
+ #include <config.h>
+ #include <libgnome/gnome-i18n.h>
++#include <glib/gi18n-lib.h>
+ 
+ #include <gnome.h>
+ #include <bonobo.h>
+
diff --git a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
index 0979439e77b4..524694351ef7 100644
--- a/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.9 2008/01/29 18:13:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.2.5.ebuild,v 1.10 2008/01/30 12:23:13 opfer Exp $
 EAPI="1"
 
 inherit gnome2 eutils
@@ -39,4 +39,6 @@ src_unpack() {
 	# bug 101970
 	epatch "${FILESDIR}/${PN}-3.0.10-no-extern-cluealigned.diff"
 	epatch "${FILESDIR}/${PN}-3.2-i18n.patch" || die "gettext fix"
+	# bug 193458
+	epatch "${FILESDIR}/${PN}-3.2-gi18n.patch" || die
 }