Replace GCC 4.1 patch with a working one, submitted by KIMURA Masaru in bug #137540.

Package-Manager: portage-2.1.1_pre1-r1

3 files changed, 76 insertions, 75 deletions

diff --git a/app-dicts/kasumi/ChangeLog b/app-dicts/kasumi/ChangeLog
index f7ed2a7a09d2..b442404f589c 100644
--- a/app-dicts/kasumi/ChangeLog
+++ b/app-dicts/kasumi/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2006/06/21 01:09:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/ChangeLog,v 1.18 2006/06/22 12:28:19 flameeyes Exp $
+
+  22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/kasumi-2.0-gcc41.patch:
+  Replace GCC 4.1 patch with a working one, submitted by KIMURA Masaru in bug
+  #137540.
 
 *kasumi-2.0 (21 Jun 2006)
 
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
index 222cad7d88e6..f117185fff91 100644
--- a/app-dicts/kasumi/Manifest
+++ b/app-dicts/kasumi/Manifest
@@ -2,10 +2,10 @@ AUX kasumi-0.10-gcc41.patch 3254 RMD160 c21f6d7b888d11c6884c891b99c33c6d862e79fc
 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
-AUX kasumi-2.0-gcc41.patch 3341 RMD160 f1152b18faa3b98eb9541b0cc3bb522f978a6b9b SHA1 98850354b2af6a85de9178d90414677f1e6c2ab4 SHA256 75a91eb6800f42d7dc12153f0a805b23ca218392d9f19820e0dc55ecc057d706
-MD5 c4e0d30082d445d97dff285b4a9be5c3 files/kasumi-2.0-gcc41.patch 3341
-RMD160 f1152b18faa3b98eb9541b0cc3bb522f978a6b9b files/kasumi-2.0-gcc41.patch 3341
-SHA256 75a91eb6800f42d7dc12153f0a805b23ca218392d9f19820e0dc55ecc057d706 files/kasumi-2.0-gcc41.patch 3341
+AUX kasumi-2.0-gcc41.patch 2754 RMD160 41b4475800c78dd7a532db53d7e0607af8721f0d SHA1 e65f1c06876002a1d0e308240a1491d8cbd1057c SHA256 07db517821d69aa309f916b3967a0336d450f87979b057df572a3de14e3e5aa7
+MD5 9ee070412d420a5af3c4e44144447e58 files/kasumi-2.0-gcc41.patch 2754
+RMD160 41b4475800c78dd7a532db53d7e0607af8721f0d files/kasumi-2.0-gcc41.patch 2754
+SHA256 07db517821d69aa309f916b3967a0336d450f87979b057df572a3de14e3e5aa7 files/kasumi-2.0-gcc41.patch 2754
 DIST kasumi-0.10.tar.gz 256132 RMD160 9422a36e59e51d899ab5468dac8c11896f9d9230 SHA1 86fe15e091a943b68f906b4a23dd38cb52606b42 SHA256 6567bdca3546dd2d168a6786dfcf8d4341979dbd04970ec6c0272be9fd87fa17
 DIST kasumi-0.7.tar.gz 223656 RMD160 926a0aac5517df0c7ccb875bf812787a8a3c87e1 SHA1 f3bfae86c232655f87814223cec7f1c16eb03bc2 SHA256 bd8f0d402770ec6f396c345c23f0761721c0802f5839ac5e127082146808460b
 DIST kasumi-0.8.tar.gz 266827 RMD160 d0f4cab8eda5841d710428c8348ce241446e8b88 SHA1 c5d14220b446b1c1d40e9f247625e4ce7c47f5e8 SHA256 2ec80fd23e1e46a6ca8809eaab0f2930746fd695d333c2b53a352f6110d149b0
@@ -26,10 +26,10 @@ EBUILD kasumi-2.0.ebuild 889 RMD160 554fec594a2e25827344f66552d737b880f2b8cf SHA
 MD5 f1268fc5dc0f2356cf6e3489fa7eb95e kasumi-2.0.ebuild 889
 RMD160 554fec594a2e25827344f66552d737b880f2b8cf kasumi-2.0.ebuild 889
 SHA256 9956fa461d02593535ca48d8b602ba23b44a13878fc3b4efb95bd92765598696 kasumi-2.0.ebuild 889
-MISC ChangeLog 2370 RMD160 e7e6b20b1a1dc8eda2d21468f044fd183d908636 SHA1 d7fe04e490719b3ab0f998b80ea7b692f2a1ed97 SHA256 a0b54e3467ef7c63a0064ab85280c074ec2d02f95bc9b1e1d5ce8aef9d254ff3
-MD5 84425f1e3d2def726904b9c90efb52ef ChangeLog 2370
-RMD160 e7e6b20b1a1dc8eda2d21468f044fd183d908636 ChangeLog 2370
-SHA256 a0b54e3467ef7c63a0064ab85280c074ec2d02f95bc9b1e1d5ce8aef9d254ff3 ChangeLog 2370
+MISC ChangeLog 2549 RMD160 a85548561d82b8acaaabcff053e12f93bc756aed SHA1 aeaa4d4e24735e8cdbb9f9c1f89a71feaea18af0 SHA256 41ff8fcdfd957d387b239fd181ae1d4457be77baddc11426d521c89492c6293b
+MD5 bb95a78c764a946bf26af39f90e7f03f ChangeLog 2549
+RMD160 a85548561d82b8acaaabcff053e12f93bc756aed ChangeLog 2549
+SHA256 41ff8fcdfd957d387b239fd181ae1d4457be77baddc11426d521c89492c6293b ChangeLog 2549
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
diff --git a/app-dicts/kasumi/files/kasumi-2.0-gcc41.patch b/app-dicts/kasumi/files/kasumi-2.0-gcc41.patch
index 2d72fbf43509..e5237e87fffd 100644
--- a/app-dicts/kasumi/files/kasumi-2.0-gcc41.patch
+++ b/app-dicts/kasumi/files/kasumi-2.0-gcc41.patch
@@ -1,69 +1,65 @@
-diff -urN kasumi-2.0/KasumiAddWindow.cxx kasumi-2.0-gcc41/KasumiAddWindow.cxx
---- kasumi-2.0/KasumiAddWindow.cxx	2006-05-29 03:53:18.000000000 +0900
-+++ kasumi-2.0-gcc41/KasumiAddWindow.cxx	2006-06-21 09:54:07.000000000 +0900
-@@ -45,6 +45,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,
+*** kasumi-2.0.orig/KasumiMainWindow.hxx	2006-05-29 13:56:45.000000000 +0900
+--- kasumi-2.0/KasumiMainWindow.hxx	2006-06-18 17:04:29.000000000 +0900
+***************
+*** 64,69 ****
+--- 64,123 ----
+  typedef _TextColumnEnum SearchBy;
+  typedef _TextColumnEnum TextColumn;
+  
++ void _call_back_changed_wordtype_column(GtkComboBox *combo,
++                                         gpointer data);
++ gboolean _call_back_key_pressed_text_column(GtkWidget *widget,
++                                             GdkEventKey *event,
++                                             gpointer data);
++ void _call_back_activate_search_entry(GtkWidget *widget,
 +                                        gpointer data);
-+
- KasumiAddWindow::KasumiAddWindow(KasumiDic *aDictionary,
-                                  KasumiConfiguration *conf){
-     this->conf = conf;
-diff -urN kasumi-2.0/KasumiMainWindow.cxx kasumi-2.0-gcc41/KasumiMainWindow.cxx
---- kasumi-2.0/KasumiMainWindow.cxx	2006-05-29 13:56:20.000000000 +0900
-+++ kasumi-2.0-gcc41/KasumiMainWindow.cxx	2006-06-21 09:54:37.000000000 +0900
-@@ -46,6 +46,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,
++ void _call_back_changed_search_entry(GtkWidget *widget,
++                                        gpointer data);
++ void _call_back_remove(GtkWidget *widget,
++                        gpointer data);
++ void _call_back_delete_event(GtkWidget *widget,
++                              GdkEvent *event,
++                              gpointer data);
++ void _call_back_quit(GtkWidget *widget,
 +                      gpointer data);
-+void _call_back_add(GtkWidget *widget,
-+                    gpointer data);
-+void _call_back_remove(GtkWidget *widget,
++ void _call_back_store(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;
++ void _call_back_add(GtkWidget *widget,
++                     gpointer data);
++ void _call_back_clicked_column_header(GtkTreeViewColumn *column,
++                                              gpointer data);
++ gboolean _call_back_key_pressed_text_column(GtkWidget *widget,
++ 					    GdkEventKey *event,
++ 					    gpointer data);
++ void _call_back_editing_started_sound_column(GtkCellRenderer *render,
++ 					     GtkCellEditable *editable,
++ 					     gchar *path,
++ 					     gpointer data);
++ void _call_back_edited_sound_column(GtkCellRendererText *renderer,
++ 				    gchar *arg1,
++ 				    gchar *arg2,
++ 				    gpointer data);
++ void _call_back_editing_started_spelling_column(GtkCellRenderer *render,
++ 						GtkCellEditable *editable,
++ 						gchar *path,
++ 						gpointer data);
++ void _call_back_edited_spelling_column(GtkCellRendererText *renderer,
++ 				       gchar *arg1,
++ 				       gchar *arg2,
++ 				       gpointer data);
++ void _call_back_editing_started_freq_column(GtkCellRenderer *render,
++ 					    GtkCellEditable *editable,
++ 					    gchar *path,
++ 					    gpointer data);
++ void _call_back_edited_freq_column(GtkCellRendererText *renderer,
++ 				   gchar *arg1,
++ 				   gchar *arg2,
++ 				   gpointer data);
++ void _call_back_editing_started_wordtype_column(GtkCellRenderer *render,
++ 						GtkCellEditable *editable,
++ 						gchar *path,
++ 						gpointer data);
++ 
+  class KasumiMainWindow : public KasumiDicEventListener{
+      friend void _call_back_delete_event(GtkWidget *widget,
+  					GdkEvent *event,