Репозиторий Sisyphus
Последнее обновление: 2 февраля 2023 | Пакетов: 18159 | Посещений: 26620627
en ru br
Репозитории ALT
4.1: 0.35-alt0.4
4.0: 0.35-alt0.3
www.altlinux.org/Changes

Группа :: Эмуляторы
Пакет: generator

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: generator-0.35-cbiere-r2-alt-gtk2.patch
Скачать


--- generator/glade/interface.c.orig	2005-01-10 07:13:34 +0500
+++ generator/glade/interface.c	2006-12-03 21:29:02 +0500
@@ -146,7 +146,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "file_menu", file_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (file), file_menu);
-  file_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (file_menu));
 
   rom = gtk_menu_item_new_with_label ("ROM");
   gtk_widget_ref (rom);
@@ -160,7 +159,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "rom_menu", rom_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (rom), rom_menu);
-  rom_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (rom_menu));
 
   load_rom = gtk_menu_item_new_with_label ("Load");
   gtk_widget_ref (load_rom);
@@ -188,7 +186,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "state_menu", state_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (state), state_menu);
-  state_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (state_menu));
 
   load_state = gtk_menu_item_new_with_label ("Load");
   gtk_widget_ref (load_state);
@@ -222,7 +219,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "game_genie_patch_menu", game_genie_patch_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (game_genie_patch), game_genie_patch_menu);
-  game_genie_patch_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (game_genie_patch_menu));
 
   load = gtk_menu_item_new_with_label ("Load");
   gtk_widget_ref (load);
@@ -250,7 +246,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "gym_menu", gym_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (gym), gym_menu);
-  gym_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (gym_menu));
 
   save_gym = gtk_menu_item_new_with_label ("Start");
   gtk_widget_ref (save_gym);
@@ -278,7 +273,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "gnm_menu", gnm_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (gnm), gnm_menu);
-  gnm_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (gnm_menu));
 
   start_gnm = gtk_menu_item_new_with_label ("Start");
   gtk_widget_ref (start_gnm);
@@ -306,7 +300,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "avi_menu", avi_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (avi), avi_menu);
-  avi_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (avi_menu));
 
   start_avi = gtk_menu_item_new_with_label ("Start");
   gtk_widget_ref (start_avi);
@@ -352,7 +345,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "emulation_menu", emulation_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (emulation), emulation_menu);
-  emulation_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (emulation_menu));
 
   options = gtk_menu_item_new_with_label ("Options");
   gtk_widget_ref (options);
@@ -383,7 +375,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "view_menu", view_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (view), view_menu);
-  view_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (view_menu));
 
   zoom_100 = gtk_radio_menu_item_new_with_label (view_group, "100%");
   view_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (zoom_100));
@@ -469,7 +460,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "reset1_menu", reset1_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (reset1), reset1_menu);
-  reset1_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (reset1_menu));
 
   reset_soft = gtk_menu_item_new_with_label ("Soft");
   gtk_widget_ref (reset_soft);
@@ -503,7 +493,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "debug_menu", debug_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (debug), debug_menu);
-  debug_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (debug_menu));
 
   console = gtk_menu_item_new_with_label ("Console");
   gtk_widget_ref (console);
@@ -527,7 +516,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "disassemble_64k_menu", disassemble_64k_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (disassemble_64k), disassemble_64k_menu);
-  disassemble_64k_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (disassemble_64k_menu));
 
   disassemble_rom = gtk_menu_item_new_with_label ("ROM");
   gtk_widget_ref (disassemble_rom);
@@ -555,7 +543,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "disassemble_vdp_menu", disassemble_vdp_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (disassemble_vdp), disassemble_vdp_menu);
-  disassemble_vdp_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (disassemble_vdp_menu));
 
   disassemble_vram = gtk_menu_item_new_with_label ("VRAM");
   gtk_widget_ref (disassemble_vram);
@@ -590,7 +577,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "disassemble_z80_menu", disassemble_z80_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (disassemble_z80), disassemble_z80_menu);
-  disassemble_z80_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (disassemble_z80_menu));
 
   disassemble_sram = gtk_menu_item_new_with_label ("SRAM");
   gtk_widget_ref (disassemble_sram);
@@ -612,7 +598,6 @@
   gtk_object_set_data_full (GTK_OBJECT (mainwin), "about_menu", about_menu,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (about), about_menu);
-  about_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (about_menu));
 
   about_generator = gtk_menu_item_new_with_label ("Generator");
   gtk_widget_ref (about_generator);
@@ -3259,13 +3244,13 @@
   gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow_breakpoints), 4);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow_breakpoints), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 
-  text_breakpoints = gtk_text_new (NULL, NULL);
+  text_breakpoints = gtk_text_view_new_with_buffer(gtk_text_buffer_new(NULL));
   gtk_widget_ref (text_breakpoints);
   gtk_object_set_data_full (GTK_OBJECT (console), "text_breakpoints", text_breakpoints,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (text_breakpoints);
   gtk_container_add (GTK_CONTAINER (scrolledwindow_breakpoints), text_breakpoints);
-  gtk_text_set_editable (GTK_TEXT (text_breakpoints), TRUE);
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (text_breakpoints), TRUE);
 
   frame_internals = gtk_frame_new ("Internals");
   gtk_widget_ref (frame_internals);
--- generator/main/ui-gtk.c.orig	2005-09-02 08:46:38 +0600
+++ generator/main/ui-gtk.c	2006-12-03 21:35:52 +0500
@@ -376,7 +376,6 @@
 void ui_final(void)
 {
   gdk_font_unref(ui_dissfont);
-  gdk_key_repeat_restore();
   SDL_Quit();
   gtk_exit(0);
 }
@@ -1635,7 +1634,7 @@
     hborder = ui_hborder;
     vborder = ui_vborder;
     gtk_widget_show(ui_win_main);
-    gtk_widget_set_usize(w, HSIZE, VSIZE);
+    gtk_window_set_default_size(GTK_WINDOW(ui_win_main), HSIZE, VSIZE);
     ui_sdl_window_hack(1);
     ui_gtk_reinit_video();
     screen = SDL_SetVideoMode(HSIZE, VSIZE, 0, SDL_RESIZABLE);
@@ -1647,7 +1646,7 @@
     hborder = ui_hborder;
     vborder = ui_vborder;
     gtk_widget_show(ui_win_main);
-    gtk_widget_set_usize(w, HSIZE * 2, VSIZE * 2);
+    gtk_window_set_default_size(GTK_WINDOW(ui_win_main), HSIZE * 2, VSIZE * 2);
     ui_sdl_window_hack(1);
     ui_gtk_reinit_video();
     screen = SDL_SetVideoMode(HSIZE * 2, VSIZE * 2, 0, SDL_RESIZABLE);
@@ -2676,12 +2675,10 @@
 {
   /* clear out current state */
   memset(mem68k_cont, 0, sizeof(mem68k_cont));
-  gdk_key_repeat_disable();
 }
 
 void ui_gtk_mainleave(void)
 {
-  gdk_key_repeat_restore();
 }
 
 static void ui_gtk_opts_to_menu(void)
--- generator/configure.ac.orig	2005-09-02 09:04:59 +0600
+++ generator/configure.ac	2006-12-03 21:29:02 +0500
@@ -274,7 +274,7 @@
 
   if [[ "x$MY_PROG" = "xgenerator-gtk" ]]; then
     MY_SUBDIRS="glade gtkopts $MY_SUBDIRS"
-    AM_PATH_GTK(1.2.10,,AC_MSG_ERROR(Generator needs gtk 1.2.10 or later))
+    AM_PATH_GTK_2_0(2.4.0,,AC_MSG_ERROR(Generator needs gtk2 2.4.0 or later))
     AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
 
     MY_LIBS="$MY_LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin