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

Package-Manager: portage-2.1.3.19

4 files changed, 86 insertions, 13 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/Manifest b/gnome-extra/gtkhtml/Manifest
index cd227832f2ab..3396f1585f8a 100644
--- a/gnome-extra/gtkhtml/Manifest
+++ b/gnome-extra/gtkhtml/Manifest
@@ -9,6 +9,10 @@ AUX gtkhtml-3.14.3-get_left_margin-fix.patch 921 RMD160 a5ec7fcfc9303d6af2fd678d
 MD5 9f33012b4f53d96cf6572255e797a6af files/gtkhtml-3.14.3-get_left_margin-fix.patch 921
 RMD160 a5ec7fcfc9303d6af2fd678d64b3ff7032123f83 files/gtkhtml-3.14.3-get_left_margin-fix.patch 921
 SHA256 31273d61b5488296dba96f70c53fa04048718f82657eb1b8c90a72e803dfc9bc files/gtkhtml-3.14.3-get_left_margin-fix.patch 921
+AUX gtkhtml-3.2-gi18n.patch 2103 RMD160 7685c7b603d425f47b9d3c4ef89fea7c389048a8 SHA1 5ef8c097e0b52d8ce272a4d73279cd4d75226daf SHA256 c86caa3617685172c775fc084dcb28872b5b660770203e4b76b35f83074fa8ce
+MD5 9d330f71c1f8fb46928ff4ede536d4cf files/gtkhtml-3.2-gi18n.patch 2103
+RMD160 7685c7b603d425f47b9d3c4ef89fea7c389048a8 files/gtkhtml-3.2-gi18n.patch 2103
+SHA256 c86caa3617685172c775fc084dcb28872b5b660770203e4b76b35f83074fa8ce files/gtkhtml-3.2-gi18n.patch 2103
 AUX gtkhtml-3.2-i18n.patch 1411 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 SHA1 d7f9050512d63a3a1ac4be2a3bbcdf553ca5088f SHA256 45c7763730b3a886ba6dd4b69d20cb83dcc5c918385971e48905e7ad6e8849f7
 MD5 b954bf799749526cc35e4d73e5ebbaba files/gtkhtml-3.2-i18n.patch 1411
 RMD160 27fd26f798c0294da7fee1fa26cef95546afb283 files/gtkhtml-3.2-i18n.patch 1411
@@ -62,18 +66,18 @@ EBUILD gtkhtml-3.16.3.ebuild 956 RMD160 641b7f1089e6df347bf19ffa8e798f3dff3f192a
 MD5 b00a5e533adf340b0d891937b040fe86 gtkhtml-3.16.3.ebuild 956
 RMD160 641b7f1089e6df347bf19ffa8e798f3dff3f192a gtkhtml-3.16.3.ebuild 956
 SHA256 5d6d31c8d38ef80ac021895ba124e345d8fb894cb56cbfb33230f7a66d20fa8e gtkhtml-3.16.3.ebuild 956
-EBUILD gtkhtml-3.2.5.ebuild 1096 RMD160 8a726fc8bdbaef0e5630612ea7504d2ed12aad17 SHA1 096b8cceaf2f92b8d81cb35f4d8ad2f2c759ecc3 SHA256 685ef3bca971046ddede411c8b886a74eaa410d2ab2617cee0da2834a2c45670
-MD5 bd63303ad29ee4cacb90123a14ddc94c gtkhtml-3.2.5.ebuild 1096
-RMD160 8a726fc8bdbaef0e5630612ea7504d2ed12aad17 gtkhtml-3.2.5.ebuild 1096
-SHA256 685ef3bca971046ddede411c8b886a74eaa410d2ab2617cee0da2834a2c45670 gtkhtml-3.2.5.ebuild 1096
+EBUILD gtkhtml-3.2.5.ebuild 1163 RMD160 d1891c353779fd56c9ed97c3363a339ce28963d4 SHA1 b972a6d5c86b510c30c3bc0d0af6a58583e17d88 SHA256 9d539f6bbcf6f98b869ac2a10e274e43f98236648b92feecba590f0ffa950ecf
+MD5 f1a8a09f68edddd0da1976bb7ce0bf6d gtkhtml-3.2.5.ebuild 1163
+RMD160 d1891c353779fd56c9ed97c3363a339ce28963d4 gtkhtml-3.2.5.ebuild 1163
+SHA256 9d539f6bbcf6f98b869ac2a10e274e43f98236648b92feecba590f0ffa950ecf gtkhtml-3.2.5.ebuild 1163
 EBUILD gtkhtml-3.6.2.ebuild 1111 RMD160 fc2b70311170902fa9c8b6a9592007fb08dd589b SHA1 b1b008def0414a8282711086a14a94a0bcf1979f SHA256 c7995f9e64724d1a392f3d798ceff58f264a7352db2aa2f22afc02f9f6983996
 MD5 fd63b6e2c019cdfe7cea691294d8bdca gtkhtml-3.6.2.ebuild 1111
 RMD160 fc2b70311170902fa9c8b6a9592007fb08dd589b gtkhtml-3.6.2.ebuild 1111
 SHA256 c7995f9e64724d1a392f3d798ceff58f264a7352db2aa2f22afc02f9f6983996 gtkhtml-3.6.2.ebuild 1111
-MISC ChangeLog 19708 RMD160 3a440233d7ac15f26aec601af496f2be4a1665f3 SHA1 f78e67079e8212d8071f99c0af6715198cb2a3ba SHA256 69928358b5daf0ad11cf4d43aaea58db53cb1532959960cc4e59498f850b9ebc
-MD5 228357c4898bcc1760fc1c55dcc2b1ca ChangeLog 19708
-RMD160 3a440233d7ac15f26aec601af496f2be4a1665f3 ChangeLog 19708
-SHA256 69928358b5daf0ad11cf4d43aaea58db53cb1532959960cc4e59498f850b9ebc ChangeLog 19708
+MISC ChangeLog 19980 RMD160 e0683e6c1587d612cbe385ba04b51948c111a7ac SHA1 cb2d5c8594b42558470be3d14700aacf5bcd71d7 SHA256 54f503660c63c3a5540ebf709ef59be9b9920b301d312e1035fedda7271c89e4
+MD5 7859f49c2c963d7a88c4958d718fb43e ChangeLog 19980
+RMD160 e0683e6c1587d612cbe385ba04b51948c111a7ac ChangeLog 19980
+SHA256 54f503660c63c3a5540ebf709ef59be9b9920b301d312e1035fedda7271c89e4 ChangeLog 19980
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -111,7 +115,7 @@ SHA256 b61839611a0d72760e25c475b2d41598fdf167d50b10e08ee1aaefb946d10b18 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHn2zFomPajV0RnrERAlFFAJsG4lzd4UeAmPcgD7rFUsMr2NqNbQCdEcDQ
-GeaPZvpn6jrvrMOdqP/7WNc=
-=5twj
+iD8DBQFHoGxgNQqtfCuFneMRApdsAJ0YMWYp6SuhXrozNekOkNvkXMv10ACeKFjd
+/Fg7NSsBRcHTwzmU2+Q8QMY=
+=v2yq
 -----END PGP SIGNATURE-----
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
 }