wok-next rev 8661

Added gens-gtk.patch file to fix gens-gs to work with newer gtk+.
author Christopher Rogers <slaxemulator@gmail.com>
date Wed Feb 16 00:31:38 2011 +0000 (2011-02-16)
parents cbd7b12a6e29
children 565f6ec7e99d
files gens-gs/receipt gens-gs/stuff/gens-gtk.patch
line diff
     1.1 --- a/gens-gs/receipt	Tue Feb 15 23:40:06 2011 +0000
     1.2 +++ b/gens-gs/receipt	Wed Feb 16 00:31:38 2011 +0000
     1.3 @@ -5,7 +5,7 @@
     1.4  CATEGORY="games"
     1.5  SHORT_DESC="An emulator for Sega Genesis, Sega CD and 32X."
     1.6  MAINTAINER="slaxemulator@gmail.com"
     1.7 -DEPENDS="gtk+ libsdl"
     1.8 +DEPENDS="gtk+ libsdl libglu-mesa"
     1.9  BUILD_DEPENDS="gtk+-dev libsdl libsdl-dev nasm autoconf automake"
    1.10  _VERSION=gs-r7
    1.11  TARBALL="Gens-${_VERSION}.tar.gz"
    1.12 @@ -15,15 +15,11 @@
    1.13  # Rules to configure and make the package.
    1.14  compile_rules()
    1.15  {
    1.16 -	ln -s $WOK/$PACKAGE/gens-${_VERSION} $WOK/$PACKAGE/$PACKAGE-$VERSION
    1.17  	cd $src
    1.18 +	patch -Np1 -i ../stuff/gens-gtk.patch || return 1
    1.19  	chmod +x install-sh
    1.20 -	./configure \
    1.21 -		--prefix=/usr \
    1.22 -		--infodir=/usr/share/info \
    1.23 -		--mandir=/usr/share/man \
    1.24 -		$CONFIGURE_ARGS &&
    1.25 -	make && make DESTDIR=$PWD/_pkg install
    1.26 +	./configure &&
    1.27 +	make && make -j1 DESTDIR=$DESTDIR install
    1.28  }
    1.29  
    1.30  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/gens-gs/stuff/gens-gtk.patch	Wed Feb 16 00:31:38 2011 +0000
     2.3 @@ -0,0 +1,134 @@
     2.4 +diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp
     2.5 +--- gens/src/gens/ui/gtk/about/about_window.cpp	2010-10-11 16:32:29.000000000 +0000
     2.6 ++++ gens-build/src/gens/ui/gtk/about/about_window.cpp	2010-10-11 15:46:25.000000000 +0000
     2.7 +@@ -84,7 +84,7 @@
     2.8 + 	gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
     2.9 + 	gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
    2.10 + 	gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
    2.11 +-	gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
    2.12 ++	g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
    2.13 + 	
    2.14 + 	// Callbacks for if the window is closed.
    2.15 + 	g_signal_connect((gpointer)about_window, "delete_event",
    2.16 +diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp
    2.17 +--- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 16:32:29.000000000 +0000
    2.18 ++++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 15:33:03.000000000 +0000
    2.19 +@@ -84,7 +84,7 @@
    2.20 + 	gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
    2.21 + 	gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
    2.22 + 	gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
    2.23 +-	gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
    2.24 ++	g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
    2.25 + 	
    2.26 + 	// Callbacks for if the window is closed.
    2.27 + 	g_signal_connect((gpointer)bmf_window, "delete_event",
    2.28 +diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp
    2.29 +--- gens/src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 16:32:29.000000000 +0000
    2.30 ++++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 15:34:21.000000000 +0000
    2.31 +@@ -110,7 +110,7 @@
    2.32 + 	gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
    2.33 + 	gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
    2.34 + 	gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
    2.35 +-	gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
    2.36 ++	g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
    2.37 + 	
    2.38 + 	// Callbacks for if the window is closed.
    2.39 + 	g_signal_connect((gpointer)(dir_window), "delete_event",
    2.40 +diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp
    2.41 +--- gens/src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 16:32:29.000000000 +0000
    2.42 ++++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 15:36:00.000000000 +0000
    2.43 +@@ -138,7 +138,7 @@
    2.44 + 	gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
    2.45 + 	gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
    2.46 + 	gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
    2.47 +-	gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
    2.48 ++	g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
    2.49 + 	
    2.50 + 	// Callbacks for if the window is closed.
    2.51 + 	g_signal_connect((gpointer)genopt_window, "delete_event",
    2.52 +diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp
    2.53 +--- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 16:32:29.000000000 +0000
    2.54 ++++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 15:21:28.000000000 +0000
    2.55 +@@ -157,9 +157,9 @@
    2.56 + 	GSFT_UNUSED_PARAMETER(y);
    2.57 + 	GSFT_UNUSED_PARAMETER(user_data);
    2.58 + 	
    2.59 +-	if (context->targets)
    2.60 ++	if (gdk_drag_context_list_targets(context))
    2.61 + 	{
    2.62 +-		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
    2.63 ++		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
    2.64 + 		gtk_drag_get_data(widget, context, target_type, time);
    2.65 + 		return true;
    2.66 + 	}
    2.67 +diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp
    2.68 +--- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 16:32:29.000000000 +0000
    2.69 ++++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 15:46:21.000000000 +0000
    2.70 +@@ -75,7 +75,7 @@
    2.71 + 	gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
    2.72 + 	gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
    2.73 + 	gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
    2.74 +-	gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
    2.75 ++	g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
    2.76 + 	
    2.77 + 	// Callbacks for if the window is closed.
    2.78 + 	g_signal_connect((gpointer)(glres_window), "delete_event",
    2.79 +diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp
    2.80 +--- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 16:32:29.000000000 +0000
    2.81 ++++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 15:46:29.000000000 +0000
    2.82 +@@ -80,8 +80,7 @@
    2.83 + // Callbacks.
    2.84 + static gboolean	pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
    2.85 + static void	pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
    2.86 +-static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
    2.87 +-							       guint page_num, gpointer user_data);
    2.88 ++static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
    2.89 + static void	pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
    2.90 + static void	pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
    2.91 + 
    2.92 +@@ -119,7 +118,7 @@
    2.93 + 	gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
    2.94 + 	gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
    2.95 + 	gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
    2.96 +-	gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
    2.97 ++	g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
    2.98 + 	
    2.99 + 	// Callbacks for if the window is closed.
   2.100 + 	g_signal_connect((gpointer)pmgr_window, "delete_event",
   2.101 +@@ -559,11 +558,9 @@
   2.102 +  * @param page_num New notebook page index.
   2.103 +  * @param user_data User data.
   2.104 +  */
   2.105 +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
   2.106 +-							   guint page_num, gpointer user_data)
   2.107 ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
   2.108 + {
   2.109 + 	GSFT_UNUSED_PARAMETER(notebook);
   2.110 +-	GSFT_UNUSED_PARAMETER(page);
   2.111 + 	GSFT_UNUSED_PARAMETER(user_data);
   2.112 + 	
   2.113 + 	// Activate the "cursor-changed" callback for the page.
   2.114 +diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp
   2.115 +--- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 16:32:29.000000000 +0000
   2.116 ++++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 15:46:16.000000000 +0000
   2.117 +@@ -94,7 +94,7 @@
   2.118 + 	gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
   2.119 + 	gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
   2.120 + 	gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
   2.121 +-	gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
   2.122 ++	g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
   2.123 + 	
   2.124 + 	// Callbacks for if the window is closed.
   2.125 + 	g_signal_connect((gpointer)(selcd_window), "delete_event",
   2.126 +diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp
   2.127 +--- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 16:32:29.000000000 +0000
   2.128 ++++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 15:52:05.000000000 +0000
   2.129 +@@ -111,7 +111,7 @@
   2.130 + 	gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
   2.131 + 	gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
   2.132 + 	gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
   2.133 +-	gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
   2.134 ++	g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
   2.135 + 	
   2.136 + 	// Add the window icon.
   2.137 + 	GList *icon_list = NULL;