Initial import from sunrise, fixes #91403

(Portage version: 2.2_rc31/cvs/Linux x86_64)

3 files changed, 142 insertions, 0 deletions

diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch
new file mode 100644
index 000000000000..66ad7af8b0c5
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-gcc4.3.patch
@@ -0,0 +1,23 @@
+--- src/settings_window.cc	2005-10-10 06:48:29.000000000 +0200
++++ src/settings_window.cc.new	2009-03-18 18:15:12.000000000 +0100
+@@ -6,6 +6,7 @@
+ // This file is for your program, I won't touch it again!
+ 
+ #include <gtkmm.h>
++#include <cstring>
+ #include "config.h"
+ #include "settings_window.hh"
+ 
+
+--- src/main_window.cc	2009-03-18 18:16:03.000000000 +0100
++++ src/main_window.cc.new	2009-03-18 18:19:08.000000000 +0100
+@@ -9,6 +9,8 @@
+ #include <gtkmm.h>
+ #include <gtkmm/main.h>
+ #include <iomanip>
++#include <cstring>
++#include <sys/stat.h>
+ #include "config.h"
+ #include "main_window.hh"
+ 
+
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch
new file mode 100644
index 000000000000..3a89120a3d8c
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-libsigc.patch
@@ -0,0 +1,107 @@
+diff -uarN src/about_box_glade.cc src.new/about_box_glade.cc
+--- src/about_box_glade.cc	2009-03-18 19:22:34.000000000 +0100
++++ src.new/about_box_glade.cc	2009-03-18 19:23:08.000000000 +0100
+@@ -1530,8 +1530,8 @@
+    hbuttonbox1->show();
+    vbox3->show();
+    about_box->show();
+-   about_close_button->signal_clicked().connect(SigC::slot(*this, &about_box_glade::on_about_close_button_clicked), false);
+-   about_box->signal_realize().connect(SigC::slot(*this, &about_box_glade::on_about_box_realize), false);
++   about_close_button->signal_clicked().connect(sigc::mem_fun(*this, &about_box_glade::on_about_close_button_clicked), false);
++   about_box->signal_realize().connect(sigc::mem_fun(*this, &about_box_glade::on_about_box_realize), false);
+ }
+ 
+ about_box_glade::~about_box_glade()
+diff -uarN src/main_window_glade.cc src.new/main_window_glade.cc
+--- src/main_window_glade.cc	2009-03-18 19:22:34.000000000 +0100
++++ src.new/main_window_glade.cc	2009-03-18 19:23:08.000000000 +0100
+@@ -998,19 +998,19 @@
+    main_status->show();
+    vbox1->show();
+    main_window->show();
+-   menu_set_run_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_set_run_options_activate), false);
+-   menu_save_options_default->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_options_default_activate), false);
+-   menu_load_default_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_load_default_options_activate), false);
+-   menu_save_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_options_activate), false);
+-   save_load_options->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_load_options_activate), false);
+-   menu_quit->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_quit_activate), false);
+-   menu_run->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_run_activate), false);
+-   menu_stop->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_stop_activate), false);
+-   menu_save_output->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_menu_save_output_activate), false);
+-   menu_about->signal_activate().connect(SigC::slot(*this, &main_window_glade::on_about1_activate), false);
+-   toolbar_settings_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_settings_button_clicked), false);
+-   toolbar_run_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_run_button_clicked), false);
+-   toolbar_stop_button->signal_clicked().connect(SigC::slot(*this, &main_window_glade::on_toolbar_stop_button_clicked), false);
++   menu_set_run_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_set_run_options_activate), false);
++   menu_save_options_default->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_options_default_activate), false);
++   menu_load_default_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_load_default_options_activate), false);
++   menu_save_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_options_activate), false);
++   save_load_options->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_load_options_activate), false);
++   menu_quit->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_quit_activate), false);
++   menu_run->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_run_activate), false);
++   menu_stop->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_stop_activate), false);
++   menu_save_output->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_menu_save_output_activate), false);
++   menu_about->signal_activate().connect(sigc::mem_fun(*this, &main_window_glade::on_about1_activate), false);
++   toolbar_settings_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_settings_button_clicked), false);
++   toolbar_run_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_run_button_clicked), false);
++   toolbar_stop_button->signal_clicked().connect(sigc::mem_fun(*this, &main_window_glade::on_toolbar_stop_button_clicked), false);
+ }
+ 
+ main_window_glade::~main_window_glade()
+diff -uarN src/settings_window_glade.cc src.new/settings_window_glade.cc
+--- src/settings_window_glade.cc	2009-03-18 19:22:34.000000000 +0100
++++ src.new/settings_window_glade.cc	2009-03-18 19:23:08.000000000 +0100
+@@ -391,11 +391,11 @@
+    hbuttonbox3->show();
+    vbox6->show();
+    settings_window->show();
+-   settings_benchmark_browse_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_benchmark_browse_button_clicked), false);
+-   settings_config_browse_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_config_browse_button_clicked), false);
+-   settings_seed_check->signal_toggled().connect(SigC::slot(*this, &settings_window_glade::on_settings_seed_check_toggled), false);
+-   settings_cancel_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_cancel_button_clicked), false);
+-   settings_okay_button->signal_clicked().connect(SigC::slot(*this, &settings_window_glade::on_settings_okay_button_clicked), false);
++   settings_benchmark_browse_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_benchmark_browse_button_clicked), false);
++   settings_config_browse_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_config_browse_button_clicked), false);
++   settings_seed_check->signal_toggled().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_seed_check_toggled), false);
++   settings_cancel_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_cancel_button_clicked), false);
++   settings_okay_button->signal_clicked().connect(sigc::mem_fun(*this, &settings_window_glade::on_settings_okay_button_clicked), false);
+ }
+ 
+ settings_window_glade::~settings_window_glade()
+diff -uarN src/about_box_glade.cc src.new/about_box_glade.cc
+--- src/about_box_glade.cc	2009-03-18 18:08:58.000000000 +0100
++++ src.new/about_box_glade.cc	2009-03-18 18:12:50.000000000 +0100
+@@ -14,8 +14,7 @@
+ #endif //
+ #include "config.h"
+ #include <gtkmmconfig.h>
+ #if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
+-#include <sigc++/compatibility.h>
+ #define GMM_GTKMM_22_24(a,b) b
+ #else //gtkmm 2.2
+ #define GMM_GTKMM_22_24(a,b) a
+diff -uarN src/main_window_glade.cc src.new/main_window_glade.cc
+--- src/main_window_glade.cc	2009-03-18 18:08:58.000000000 +0100
++++ src.new/main_window_glade.cc	2009-03-18 18:12:53.000000000 +0100
+@@ -14,8 +14,7 @@
+ #endif //
+ #include "config.h"
+ #include <gtkmmconfig.h>
+ #if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
+-#include <sigc++/compatibility.h>
+ #define GMM_GTKMM_22_24(a,b) b
+ #else //gtkmm 2.2
+ #define GMM_GTKMM_22_24(a,b) a
+diff -uarN src/settings_window_glade.cc src.new/settings_window_glade.cc
+--- src/settings_window_glade.cc	2009-03-18 18:08:58.000000000 +0100
++++ src.new/settings_window_glade.cc	2009-03-18 18:12:56.000000000 +0100
+@@ -14,8 +14,7 @@
+ #endif //
+ #include "config.h"
+ #include <gtkmmconfig.h>
+ #if GTKMM_MAJOR_VERSION==2 && GTKMM_MINOR_VERSION>2
+-#include <sigc++/compatibility.h>
+ #define GMM_GTKMM_22_24(a,b) b
+ #else //gtkmm 2.2
+ #define GMM_GTKMM_22_24(a,b) a
+
diff --git a/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch
new file mode 100644
index 000000000000..7486f3946609
--- /dev/null
+++ b/app-benchmarks/acovea-gtk/files/acovea-gtk-1.0.1-unicode.patch
@@ -0,0 +1,12 @@
+--- acovea-gtk-1.0.1/src/main_window.cc	2005-10-10 04:48:29.000000000 +0000
++++ acovea-gtk-1.0.1/src/main_window.cc	2006-03-03 10:23:13.000000000 +0000
+@@ -488,7 +488,7 @@
+ {
+     Glib::RefPtr<Gtk::TextBuffer> buffer = main_window_output->get_buffer();
+     Gtk::TextIter end = buffer->end();
+-    buffer->insert(buffer->end(),text->c_str());
++    buffer->insert(buffer->end(),Glib::convert (text->c_str(), "UTF-8", "ISO-8859-1"));
+ } 
+ 
+ void main_window::set_ui_running(bool running)
+