gettext compile fix (undef. ref. to _()). Closes bug #83815

(Portage version: 2.0.51.19)

5 files changed, 74 insertions, 6 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 3f399c502d69..dce8d1570351 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.112 2005/03/10 02:19:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.113 2005/03/18 15:15:51 dsd Exp $
+
+  18 Mar 2005; Daniel Drake <dsd@gentoo.org>
+  +files/libgtkhtml-3.2-i18n.patch, libgtkhtml-3.2.3.ebuild,
+  libgtkhtml-3.2.4.ebuild, libgtkhtml-3.2.5.ebuild:
+  gettext compile fix (undef. ref. to _()). Closes bug #83815
 
   09 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> libgtkhtml-3.2.4.ebuild:
   Stable on sparc
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.2-i18n.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-3.2-i18n.patch
new file mode 100644
index 000000000000..e4ad9a3f8123
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/libgtkhtml-3.2-i18n.patch
@@ -0,0 +1,45 @@
+--- gtkhtml-3.2.5/src/gtkhtml.c.orig	2005-03-13 16:04:23.000000000 +0000
++++ gtkhtml-3.2.5/src/gtkhtml.c	2005-03-13 16:07:42.000000000 +0000
+@@ -27,7 +27,7 @@
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gtk/gtk.h>
+ #include <string.h>
+-
++#include <glib/gi18n-lib.h>
+ #include <gnome.h>
+ 
+ #include "../a11y/factory.h"
+--- gtkhtml-3.2.5/src/htmlbutton.c.orig	2005-03-13 16:03:52.000000000 +0000
++++ gtkhtml-3.2.5/src/htmlbutton.c	2005-03-13 16:08:00.000000000 +0000
+@@ -26,6 +26,7 @@
+ #include "htmlform.h"
+ #include <string.h>
+ #include <libgnome/gnome-i18n.h>
++#include <glib/gi18n-lib.h>
+ 
+ HTMLButtonClass html_button_class;
+ 
+--- gtkhtml-3.2.5/src/htmlengine-print.c.orig	2005-03-13 16:06:27.000000000 +0000
++++ gtkhtml-3.2.5/src/htmlengine-print.c	2005-03-13 16:09:36.000000000 +0000
+@@ -23,6 +23,8 @@
+ #include <gtk/gtk.h>
+ #include <libgnome/gnome-i18n.h>
+ #include <libgnomeui/gnome-dialog-util.h>
++#include <glib/gi18n-lib.h>
++
+ #include "gtkhtml.h"
+ #include "gtkhtml-private.h"
+ #include "gtkhtml-properties.h"
+--- gtkhtml-3.2.5/src/test.c.orig	2005-03-13 16:10:20.000000000 +0000
++++ gtkhtml-3.2.5/src/test.c	2005-03-13 16:12:28.000000000 +0000
+@@ -36,8 +36,10 @@
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtksignal.h>
+ 
++#include <config.h>
+ #include <libgnome/gnome-i18n.h>
+ #include <libgnomeui/gnome-ui-init.h>
++#include <glib/gi18n-lib.h>
+ 
+ #include "gtkhtml.h"
+ #include "gtkhtmldebug.h"
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
index 797749e8923a..e46b075d7ec6 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.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/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.10 2005/01/20 00:06:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.3.ebuild,v 1.11 2005/03/18 15:15:51 dsd Exp $
 
 inherit gnome2 eutils versionator
 
@@ -38,3 +38,9 @@ USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+}
+
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
index 51e57fe08d84..d7cce1ffd127 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild,v 1.6 2005/03/12 19:41:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.4.ebuild,v 1.7 2005/03/18 15:15:51 dsd Exp $
 
-inherit gnome2 versionator
+inherit gnome2 versionator eutils
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
@@ -38,3 +38,9 @@ USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+}
+
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
index b3169c1eeda3..911aca64c0d6 100644
--- a/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild,v 1.1 2005/03/02 05:25:37 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.2.5.ebuild,v 1.2 2005/03/18 15:15:51 dsd Exp $
 
-inherit gnome2 versionator
+inherit gnome2 versionator eutils
 
 MY_P=${P/lib/}
 MY_PN=${PN/lib/}
@@ -38,3 +38,9 @@ USE_DESTDIR="1"
 SCROLLKEEPER_UPDATE="0"
 ELTCONF="--reverse-deps"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.2-i18n.patch || die "gettext fix"
+}
+