Add fix for building with GCC 4.1. See bug #120593.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 105 insertions, 8 deletions

diff --git a/app-dicts/kasumi/ChangeLog b/app-dicts/kasumi/ChangeLog
index 3f6c8bf27322..4cab0bdf4215 100644
--- a/app-dicts/kasumi/ChangeLog
+++ b/app-dicts/kasumi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/kasumi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/ChangeLog,v 1.14 2006/02/06 19:28:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/ChangeLog,v 1.15 2006/03/08 15:00:37 flameeyes Exp $
+
+  08 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kasumi-0.10-gcc41.patch, kasumi-0.10.ebuild:
+  Add fix for building with GCC 4.1. See bug #120593.
 
   06 Feb 2006; Simon Stelling <blubb@gentoo.org> kasumi-0.10.ebuild:
   stable on amd64
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
index 47fbaef66de6..8c099c85aa64 100644
--- a/app-dicts/kasumi/Manifest
+++ b/app-dicts/kasumi/Manifest
@@ -1,6 +1,9 @@
-MD5 b205746aac0ef7e73dfabe12d8ea2bba ChangeLog 1823
-RMD160 a9f9661a3d8f2b3dad84a5fe131efea40e73ca39 ChangeLog 1823
-SHA256 ab7a227982d3facd3d45c64571b0533245cc2902fbe8be96218ac9b3ff490542 ChangeLog 1823
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e66fae0cfdc23323474df449b5686b1d ChangeLog 1989
+RMD160 5f32814adee96317258eae1bd52d6d6ee9c67457 ChangeLog 1989
+SHA256 222445962c37653f55b2e805574eb5a8115f1fada3dd838fd510f17e6a130ece ChangeLog 1989
 MD5 8f57424bdb741e10bce18266e011278d files/digest-kasumi-0.10 63
 RMD160 a831edffc4d7296cb1bb6017cb661e27ceceee26 files/digest-kasumi-0.10 63
 SHA256 9913fca05acb92a2d66eca5747c1157e2d6b2f7675ba63df56239b262082d2ca files/digest-kasumi-0.10 63
@@ -10,9 +13,12 @@ SHA256 c4a222f9468f4ae4c04d6fbebcdb191653891a5f3bd14ac35486be3cd7bbe2f3 files/di
 MD5 5e492f281a838088bd88e7e964255841 files/digest-kasumi-0.8 62
 RMD160 99fcd24883198d428153f62189a21589f2992f14 files/digest-kasumi-0.8 62
 SHA256 fbe3c94acb97fc0f554982a132c83adc791b61e49f59f95c158be87752fba355 files/digest-kasumi-0.8 62
-MD5 fe3c965407921f74ddfb45fec09f3aac kasumi-0.10.ebuild 761
-RMD160 6f30b481ab9683ad3e9bdfe4c09e669ce3f25c34 kasumi-0.10.ebuild 761
-SHA256 fc5c9ed2798f9f26992b7b4c0f85018a219cb1484df46532dd0cfe75308425dc kasumi-0.10.ebuild 761
+MD5 52430ef369183984af9ce8354ee784cc files/kasumi-0.10-gcc41.patch 3254
+RMD160 c21f6d7b888d11c6884c891b99c33c6d862e79fc files/kasumi-0.10-gcc41.patch 3254
+SHA256 48dee7376a1b4184c00d4f32eb2249e2d568df7ceab3d7b8173b445f96a005a9 files/kasumi-0.10-gcc41.patch 3254
+MD5 0fc6f2769b1c39a4a7d19e2a6fc37702 kasumi-0.10.ebuild 861
+RMD160 28a8557792fbe9d9c3098a8f4ea504c4690cda22 kasumi-0.10.ebuild 861
+SHA256 9d21fdb42b962e117a8ab61b05843123c99db3b00c1e91997855961e75bfdf63 kasumi-0.10.ebuild 861
 MD5 edce0f6ab0747579e755483c1b00a8b2 kasumi-0.7.ebuild 749
 RMD160 23b2544a2b379b36385776600eec7712e4b386df kasumi-0.7.ebuild 749
 SHA256 784cebb5a074b47bb15ca4f80990e99458fe827ff65f74a5ed7387831771347d kasumi-0.7.ebuild 749
@@ -22,3 +28,10 @@ SHA256 d0e8a362ae6b110723e9da1b7d79dceb36196e70453429adefa0854a340704d2 kasumi-0
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFEDvGhAiZjviIA2XgRAln6AKDuuKQSjRyVDYbUjjG9x8v+zJDgKACfcx3w
+Ijs3zJ67PaOaa2TQKzKGcyA=
+=2FW2
+-----END PGP SIGNATURE-----
diff --git a/app-dicts/kasumi/files/kasumi-0.10-gcc41.patch b/app-dicts/kasumi/files/kasumi-0.10-gcc41.patch
new file mode 100644
index 000000000000..51f34873f371
--- /dev/null
+++ b/app-dicts/kasumi/files/kasumi-0.10-gcc41.patch
@@ -0,0 +1,71 @@
+Index: kasumi-0.10/KasumiAddWindow.cxx
+===================================================================
+--- kasumi-0.10.orig/KasumiAddWindow.cxx
++++ kasumi-0.10/KasumiAddWindow.cxx
+@@ -15,6 +15,21 @@
+ 
+ using namespace std;
+ 
++void _call_back_add_window_delete_event(GtkWidget *widget,
++                                            GdkEvent *event,
++                                            gpointer data);
++void _call_back_add_window_quit(GtkWidget *widget,
++                                gpointer data);
++void _call_back_add_window_add(GtkWidget *widget,
++                               gpointer data);
++void _call_back_manage_mode(GtkWidget *widget,
++                            gpointer data);
++void _call_back_add_window_changed_word_class_combo(GtkWidget *widget,
++                                                    gpointer data);
++void _call_back_selection_data_received(GtkWidget *widget,
++                                        GtkSelectionData *selection_data,
++                                        gpointer data);
++
+ KasumiAddWindow::KasumiAddWindow(KasumiDic *aDictionary,
+                                  KasumiConfiguration *conf){
+   this->conf = conf;
+Index: kasumi-0.10/KasumiMainWindow.cxx
+===================================================================
+--- kasumi-0.10.orig/KasumiMainWindow.cxx
++++ kasumi-0.10/KasumiMainWindow.cxx
+@@ -16,6 +16,40 @@
+ 
+ using namespace std;
+ 
++void _call_back_delete_event(GtkWidget *widget,
++                             GdkEvent *event,
++                             gpointer data);
++void _call_back_quit(GtkWidget *widget,
++                     gpointer data);
++void _call_back_store(GtkWidget *widget,
++                      gpointer data);
++void _call_back_add(GtkWidget *widget,
++                    gpointer data);
++void _call_back_remove(GtkWidget *widget,
++                       gpointer data);
++void _call_back_adding_mode(GtkWidget *widget,
++                            gpointer data);
++void _call_back_changed_list_cursor(GtkWidget *widget,
++                                    gpointer data);
++void _call_back_changed_sound_entry(GtkWidget *widget,
++                                    gpointer data);
++void _call_back_changed_spelling_entry(GtkWidget *widget,
++                                       gpointer data);
++void _call_back_changed_frequency_spin(GtkWidget *widget,
++                                       gpointer data);
++void _call_back_changed_word_class_combo(GtkWidget *widget,
++                                         gpointer data);
++void _call_back_changed_verb_type_combo(GtkWidget *widget,
++                                         gpointer data);
++void _call_back_toggled_check(GtkWidget *widget,
++                              gpointer data);
++void _call_back_changed_search_entry(GtkWidget *widget,
++                                       gpointer data);
++void _call_back_activate_search_entry(GtkWidget *widget,
++                                       gpointer data);
++void _call_back_clicked_column_header(GtkTreeViewColumn *column,
++                                             gpointer data);
++
+ KasumiMainWindow::KasumiMainWindow(KasumiDic *aDictionary,
+                                    KasumiConfiguration *conf){
+   this->conf = conf;
diff --git a/app-dicts/kasumi/kasumi-0.10.ebuild b/app-dicts/kasumi/kasumi-0.10.ebuild
index 808fed8b1782..e0928b5cfa97 100644
--- a/app-dicts/kasumi/kasumi-0.10.ebuild
+++ b/app-dicts/kasumi/kasumi-0.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/kasumi-0.10.ebuild,v 1.5 2006/02/06 19:28:26 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/kasumi-0.10.ebuild,v 1.6 2006/03/08 15:00:37 flameeyes Exp $
+
+inherit eutils
 
 DESCRIPTION="Anthy dictionary maintenance tool"
 HOMEPAGE="http://kasumi.sourceforge.jp/"
@@ -20,6 +22,13 @@ DEPEND="virtual/libc
 	>=x11-libs/pango-1.2
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-gcc41.patch"
+}
+
 src_compile() {
 	econf $(use_enable nls) || die
 	emake || die