Fixed BUG #50255. Waiting for lisa's approval to go for unconditional patch.

3 files changed, 128 insertions, 16 deletions

diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 15238be55fb2..811a021c16e6 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,18 +1,19 @@
-MD5 9a498950f5bdcd62344264ee2c07edf5 anjuta-1.2.1.ebuild 1378
+MD5 2f3d08a3119fd08f6e799987658b7c61 ChangeLog 5055
 MD5 d57a624f7f0d0e238f4729beb91b4133 anjuta-1.0.2.ebuild 1233
-MD5 6838cfff940142e0ab391f5cc8c56258 anjuta-1.2.1-r1.ebuild 1580
-MD5 4463e6c0396118a605357deb7b5545cb anjuta-1.2.0.ebuild 1358
 MD5 939dc2d97f05e5cc55d7d4964a83cdbc anjuta-1.2.0-r1.ebuild 1436
-MD5 e6a9bc4547498599bb5932827c65ffe5 anjuta-1.2.2.ebuild 1419
-MD5 2f3d08a3119fd08f6e799987658b7c61 ChangeLog 5055
+MD5 4463e6c0396118a605357deb7b5545cb anjuta-1.2.0.ebuild 1358
+MD5 6838cfff940142e0ab391f5cc8c56258 anjuta-1.2.1-r1.ebuild 1580
+MD5 9a498950f5bdcd62344264ee2c07edf5 anjuta-1.2.1.ebuild 1378
 MD5 d15fb5815497bed48e1b2479573388a7 metadata.xml 214
+MD5 63053d78de567c1ced77c8618880121b anjuta-1.2.2.ebuild 1466
 MD5 2be0d20dddfe8337dd643fd7d45d61c3 files/anjuta-1.2.0.globaltagfix.diff.gz 217
+MD5 14e73ac6e0c7c2dd18f51c92bbea0f0d files/anjuta-1.2.0_xim.patch 5241
+MD5 46b29648047d8b6f398457e635e08d92 files/anjuta-1.2.1.fix.cmp.usage.diff.gz 643
+MD5 9e4dc19186e833fd1022c8ebd3932920 files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz 292
 MD5 e85b6f172c9060236ecad97dd8d434e8 files/digest-anjuta-1.0.2 65
 MD5 b0a44b11bc057a2ca046442055e5bd76 files/digest-anjuta-1.2.0 65
-MD5 96da963356329dc0b96562dbf30ba0cd files/digest-anjuta-1.2.1 65
-MD5 59468c68592ef02f4549bf1347508779 files/digest-anjuta-1.2.2 65
-MD5 9e4dc19186e833fd1022c8ebd3932920 files/anjuta-1.2.1.pass.proper.aclocal.args.diff.gz 292
-MD5 46b29648047d8b6f398457e635e08d92 files/anjuta-1.2.1.fix.cmp.usage.diff.gz 643
-MD5 14e73ac6e0c7c2dd18f51c92bbea0f0d files/anjuta-1.2.0_xim.patch 5241
 MD5 b0a44b11bc057a2ca046442055e5bd76 files/digest-anjuta-1.2.0-r1 65
+MD5 96da963356329dc0b96562dbf30ba0cd files/digest-anjuta-1.2.1 65
 MD5 96da963356329dc0b96562dbf30ba0cd files/digest-anjuta-1.2.1-r1 65
+MD5 59468c68592ef02f4549bf1347508779 files/digest-anjuta-1.2.2 65
+MD5 c9ce5f38f8687ffa06796a4ab3e9c081 files/anjuta-1.2.2-64bit.patch 2711
diff --git a/dev-util/anjuta/anjuta-1.2.2.ebuild b/dev-util/anjuta/anjuta-1.2.2.ebuild
index c9615a08d1d1..90729b8bfdcd 100644
--- a/dev-util/anjuta/anjuta-1.2.2.ebuild
+++ b/dev-util/anjuta/anjuta-1.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.2.ebuild,v 1.5 2004/06/25 02:19:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.2.ebuild,v 1.6 2004/07/03 13:20:06 kugelfang Exp $
 
 inherit eutils gnome2
 
@@ -38,13 +38,15 @@ DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
 #lets see if this plays nice this version
-#src_unpack() {
-#	unpack ${A}
-#
-#	cd ${S}
 #	epatch ${FILESDIR}/${P}_xim.patch
-#}
+
+	use amd64 && epatch ${FILESDIR}/${P}-64bit.patch
+}
 
 pkg_postinst() {
 
diff --git a/dev-util/anjuta/files/anjuta-1.2.2-64bit.patch b/dev-util/anjuta/files/anjuta-1.2.2-64bit.patch
new file mode 100644
index 000000000000..1923522126a2
--- /dev/null
+++ b/dev-util/anjuta/files/anjuta-1.2.2-64bit.patch
@@ -0,0 +1,109 @@
+--- scintilla/ScintillaGTK.cxx
++++ scintilla/ScintillaGTK.cxx
+@@ -2120,8 +2120,8 @@
+ extern void Platform_Initialise();
+ extern void Platform_Finalise();
+ 
+-guint scintilla_get_type() {
+-	static guint scintilla_type = 0;
++GType scintilla_get_type() {
++	static GType scintilla_type = 0;
+ 
+ 	if (!scintilla_type) {
+ 		Platform_Initialise();
+--- scintilla/include/ScintillaWidget.h
++++ scintilla/include/ScintillaWidget.h
+@@ -34,7 +34,7 @@
+ 	void (* notify) (ScintillaObject *ttt);
+ };
+ 
+-guint		scintilla_get_type	(void);
++GType		scintilla_get_type	(void);
+ GtkWidget*	scintilla_new		(void);
+ void		scintilla_set_id	(ScintillaObject *sci,int id);
+ sptr_t		scintilla_send_message	(ScintillaObject *sci,unsigned int iMessage, uptr_t wParam, sptr_t lParam);
+--- src/goto_line.c
++++ src/goto_line.c
+@@ -48,10 +48,10 @@
+ static void on_go_to_line_response (GtkDialog* dialog, gint response,
+                                     gpointer user_data);
+ 
+-guint
++GType
+ gotoline_get_type ()
+ {
+-	static guint obj_type = 0;
++	static GType obj_type = 0;
+ 	
+ 	if (!obj_type)
+ 	{
+--- src/goto_line.h
++++ src/goto_line.h
+@@ -52,7 +52,7 @@
+   };
+ 
+   /** GTK widget implementation function */
+-  guint gotoline_get_type (void);
++  GType gotoline_get_type (void);
+   
+   /** Create a new instance of this gotoline dialog */
+   GtkWidget *gotoline_new (void);
+--- src/launcher.c
++++ src/launcher.c
+@@ -158,10 +158,10 @@
+ 	obj->priv->callback_data = NULL;
+ }
+ 
+-guint
++GType
+ anjuta_launcher_get_type ()
+ {
+-	static guint obj_type = 0;
++	static GType obj_type = 0;
+ 	
+ 	if (!obj_type)
+ 	{
+--- src/launcher.h
++++ src/launcher.h
+@@ -66,7 +66,7 @@
+ 	void (*busy_signal) (AnjutaLauncher *launcher, gboolean busy_flag);
+ };
+ 
+-guint anjuta_launcher_get_type (void);
++GType anjuta_launcher_get_type (void);
+ GObject *anjuta_launcher_new (void);
+ gboolean anjuta_launcher_is_busy (AnjutaLauncher *launcher);
+ gboolean anjuta_launcher_execute (AnjutaLauncher *launcher,
+--- src/message-manager.cc
++++ src/message-manager.cc
+@@ -80,7 +80,7 @@
+ 	return amm;
+ }
+ 
+-guint
++GType
+ an_message_manager_get_type (void)
+ {
+ 	static GType type = 0;
+--- src/message-manager.h
++++ src/message-manager.h
+@@ -68,7 +68,7 @@
+ 
+ // Public functions
+ GtkWidget* an_message_manager_new();
+-guint an_message_manager_get_type();
++GType an_message_manager_get_type();
+ 
+ gboolean an_message_manager_add_type(AnMessageManager* amm, const gint type_name, const gchar* pixmap);
+ gboolean an_message_manager_append(AnMessageManager* amm, const gchar* msg_string, gint type_name);
+--- src/preferences.c
++++ src/preferences.c
+@@ -35,6 +35,8 @@
+ 
+ #include <glade/glade-parser.h>
+ 
++#include "anjuta.h"
++
+ struct _AnjutaProperty
+ {
+ 	GtkWidget                *object;