* Fix build with new eel2

* Use intlhack and lthack


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1668 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 23 insertions, 21 deletions

diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index af3297cba..956fe409d 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -23,8 +23,8 @@ USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui libgnomeui \
-	   	eel2 gtksourceview
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack gnomehier \
+		libgnomeprintui libgnomeui eel2 gtksourceview
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	VERSION="2.6"
diff --git a/editors/gedit2/files/patch-configure b/editors/gedit2/files/patch-configure
index 843cf5e98..3cba7464f 100644
--- a/editors/gedit2/files/patch-configure
+++ b/editors/gedit2/files/patch-configure
@@ -1,13 +1,5 @@
 --- configure.orig	Tue Dec 17 05:27:57 2002
 +++ configure	Sun Dec 22 17:31:25 2002
-@@ -7270,6 +7270,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -10758,17 +10759,17 @@
  if test "x${prefix}" = "xNONE"; then
  
diff --git a/editors/gedit2/files/patch-gedit_gedit-mdi-child.c b/editors/gedit2/files/patch-gedit_gedit-mdi-child.c
new file mode 100644
index 000000000..90475607b
--- /dev/null
+++ b/editors/gedit2/files/patch-gedit_gedit-mdi-child.c
@@ -0,0 +1,21 @@
+--- gedit/gedit-mdi-child.c.orig	Wed Jan 14 17:16:40 2004
++++ gedit/gedit-mdi-child.c	Wed Jan 14 17:18:00 2004
+@@ -37,7 +37,7 @@
+ #include <libgnomevfs/gnome-vfs.h>
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+-#include <eel/eel-input-event-box.h>
++#include <gtk/gtkeventbox.h>
+ 
+ #include <bonobo/bonobo-i18n.h>
+ 
+@@ -751,7 +751,8 @@
+ 						   &w, &h);
+ 
+ 		/* create our layout/event boxes */
+-		event_box = eel_input_event_box_new();
++		event_box = gtk_event_box_new();
++		gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
+ 		event_hbox = gtk_hbox_new (FALSE, 0);
+ 		hbox = gtk_hbox_new (FALSE, 0);
+ 
diff --git a/editors/gedit2/files/patch-intltool-merge.in b/editors/gedit2/files/patch-intltool-merge.in
deleted file mode 100644
index 54c8a2331..000000000
--- a/editors/gedit2/files/patch-intltool-merge.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intltool-merge.in.orig	Wed Nov 12 15:29:28 2003
-+++ intltool-merge.in	Wed Nov 12 15:31:54 2003
-@@ -858,7 +858,7 @@
-     if ($MULTIPLE_OUTPUT) {
-         for my $lang (sort keys %po_files_by_lang) {
- 	    if ( ! -e $lang ) {
--	        mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-+	        mkdir $lang, 0777 or die "Cannot create subdirectory $lang: $!\n";
-             }
-             open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-             my $tree = readXml($FILE);