Author: jem256 Update of /cvs/nonfree/rpms/gens-gs/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6555/devel Modified Files: .cvsignore sources Added Files: gens-gs-gtk.patch gens-gs.spec Log Message: Initial upload gens-gs-gtk.patch: gens/ui/gtk/about/about_window.cpp | 2 +- gens/ui/gtk/bios_misc_files/bmf_window.cpp | 2 +- gens/ui/gtk/directory_config/dir_window.cpp | 2 +- gens/ui/gtk/general_options/genopt_window.cpp | 12 ++++++------ gens/ui/gtk/gens/gens_window_callbacks.cpp | 4 ++-- gens/ui/gtk/opengl_resolution/glres_window.cpp | 2 +- gens/ui/gtk/plugin_manager/pmgr_window.cpp | 9 +++------ gens/ui/gtk/select_cdrom/selcd_window.cpp | 10 +++++----- mdp/misc/game_genie/gg_window_gtk2.cpp | 2 +- 9 files changed, 21 insertions(+), 24 deletions(-) --- NEW FILE gens-gs-gtk.patch --- diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp --- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 @@ -84,7 +84,7 @@ gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); + g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); // Callbacks for if the window is closed. g_signal_connect((gpointer)about_window, "delete_event", 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 --- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 @@ -84,7 +84,7 @@ gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); + g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); // Callbacks for if the window is closed. g_signal_connect((gpointer)bmf_window, "delete_event", diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp --- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 @@ -109,7 +109,7 @@ gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); + g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); // Callbacks for if the window is closed. g_signal_connect((gpointer)(dir_window), "delete_event", diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp --- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 @@ -140,7 +140,7 @@ gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); + g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); // Callbacks for if the window is closed. g_signal_connect((gpointer)genopt_window, "delete_event", @@ -458,11 +458,11 @@ gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); // Dropdown for intro effect. - cboIntroEffect = gtk_combo_box_new_text(); - gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); - gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); - gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); - //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. + cboIntroEffect = gtk_combo_box_text_new(); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); + //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. gtk_widget_show(cboIntroEffect); gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); g_signal_connect((gpointer)(cboIntroEffect), "changed", diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp --- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 @@ -154,9 +154,9 @@ GSFT_UNUSED_PARAMETER(y); GSFT_UNUSED_PARAMETER(user_data); - if (context->targets) + if (gdk_drag_context_list_targets(context)) { - GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); + GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); gtk_drag_get_data(widget, context, target_type, time); return true; } diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp --- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 @@ -75,7 +75,7 @@ gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); + g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); // Callbacks for if the window is closed. g_signal_connect((gpointer)(glres_window), "delete_event", diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp --- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 @@ -80,8 +80,7 @@ // Callbacks. static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); -static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, - guint page_num, gpointer user_data); +static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); @@ -119,7 +118,7 @@ gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); + g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); // Callbacks for if the window is closed. g_signal_connect((gpointer)pmgr_window, "delete_event", @@ -559,11 +558,9 @@ * @param page_num New notebook page index. * @param user_data User data. */ -static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, - guint page_num, gpointer user_data) +static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) { GSFT_UNUSED_PARAMETER(notebook); - GSFT_UNUSED_PARAMETER(page); GSFT_UNUSED_PARAMETER(user_data); // Activate the "cursor-changed" callback for the page. diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp --- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 @@ -94,7 +94,7 @@ gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); + g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); // Callbacks for if the window is closed. g_signal_connect((gpointer)(selcd_window), "delete_event", @@ -128,7 +128,7 @@ gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); // Create the dropdown for the CD-ROM device name. - cboDeviceName = gtk_combo_box_entry_new_text(); + cboDeviceName = gtk_combo_box_text_new_with_entry(); gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); gtk_widget_show(cboDeviceName); @@ -156,7 +156,7 @@ gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); // Create the dropdown for the CD-ROM drive speed selection. - cboDriveSpeed = gtk_combo_box_new_text(); + cboDriveSpeed = gtk_combo_box_text_new(); char tmpSpeed[16]; for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) { @@ -167,7 +167,7 @@ else szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); - gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); } gtk_widget_show(cboDriveSpeed); gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); @@ -252,7 +252,7 @@ continue; // Add the device file. - gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); } } diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp --- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 +++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 @@ -111,7 +111,7 @@ gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); + g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); // Add the window icon. GList *icon_list = NULL; --- NEW FILE gens-gs.spec --- %global orgname gens Name: %{orgname}-gs Version: 2.16.7 Release: 5%{?dist} Summary: Sega Genesis, Sega CD, and Sega 32X emulator Url: http://segaretro.org/Gens/GS #Most source files are GPLv2+ excludding the following, which are LGPLv2+: #Source files for 2xsai, hq*x, super_eagle, super_2xsai, blargg_ntsc filters found in src/mdp/render/ #src/gens/ui/gtk/gtk-uri.h and src/gens/ui/gtk/gtk-uri.c #As well, code in src/starscream uses the starscream license (non-free) License: GPLv2+ and LGPLv2+ and MIT and BSD and Starscream (Nonfree) Source0: http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz #Found via Arch Linux: https://www.archlinux.org/packages/community/i686/gens-gs/ #Replaces deprecated gtk functions with working ones #Cannot be sumbitted upstream, as upcomming version no longers uses GTK Patch0: %{name}-gtk.patch ExclusiveArch: i686 BuildRequires: nasm BuildRequires: SDL-devel BuildRequires: gtk2-devel BuildRequires: mesa-libGL-devel BuildRequires: desktop-file-utils BuildRequires: ImageMagick BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool BuildRequires: libpng-devel BuildRequires: minizip-devel BuildRequires: libpng-devel Requires: hicolor-icon-theme Requires: %{name}-doc %package doc Summary: Documentation Manual for Gens/GS BuildArch: noarch %description #taken from here: http://segaretro.org/Gens/GS Gens/GS is a Sega Mega Drive emulator derived from Gens and maintained by GerbilSoft. Project goals include clean source code, combined features from various developments of Gens, and improved platform portability. %description doc This package contains the documentation manual for Gens/GS %prep %setup -q -n %{name}-r7 %patch0 -p1 #Erase all use of external libs: sed -i '/extlib/d' configure.ac sed -i 's/extlib//' src/Makefile.am #Use shared minizip: sed -i '/minizip/d' src/%{orgname}/Makefile.am sed -i 's/"minizip\/unzip.h"/<minizip\/unzip.h>/' src/%{orgname}/util/file/decompressor/md_zip.c #Remove all bundled code rm -f -r src/extlib #Rename to gens-gs to avoid conflicts: sed -i 's/INIT(gens,/INIT(gens-gs,/' configure.ac sed -i 's/gens.desktop/gens-gs.desktop/' xdg/Makefile.am mv xdg/%{orgname}.desktop xdg/%{name}.desktop #Obsolete macro in configure.ac sed -i 's/AC_PROG_LIBTOOL/LT_INIT([disable-static])/' configure.ac %build autoreconf -f -i %configure --without-7z --enable-mp3=no --with-pic \ --disable-static --build=i686-redhat-linux \ --docdir='%{_defaultdocdir}/%{name}-%{version}' \ LIBS="-ldl -lX11 -lminizip" make %{?_smp_mflags} %install make %{?_smp_mflags} install DESTDIR=%{buildroot} #Use imagemagick to create a 128x128 icon from 128x96 image mkdir -p %{buildroot}%{_datadir}/icons/hicolor/128x128/apps convert images/%{orgname}_small.png -background none -gravity center -extent 128x128! %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png #Copy icons into hicolor for size in 16 32 48; do dim="${size}x${size}" install -p -D -m 0644 images/%{orgname}gs_$dim.png \ %{buildroot}%{_datadir}/icons/hicolor/$dim/apps/%{name}.png done #modify icon field in desktop to use hicolor icons sed -i '/Icon=*/cIcon=%{name}' xdg/%{name}.desktop #rename binary to gens-gs mv %{buildroot}%{_bindir}/%{orgname} %{buildroot}%{_bindir}/%{name} sed -i 's/Exec=gens/Exec=gens-gs/' xdg/%{name}.desktop #install modified desktop file desktop-file-install \ --remove-key=Encoding \ --dir %{buildroot}%{_datadir}/applications \ xdg/%{name}.desktop #remove any .la files that may have generated: rm -f %{buildroot}%{_libdir}/mdp/*.la %files %doc README.txt NEWS.txt COPYING.txt %{_libdir}/mdp/ %{_datadir}/%{name} %{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %{_bindir}/mdp_test %{_datadir}/icons/hicolor/*/apps/%{name}.png %files doc %{_defaultdocdir}/%{name}-%{version} %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Mon Oct 27 2014 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 2.16.7-5 - Patch to remove conflict with gens - Remove prefix=/usr from configure * Mon Oct 6 2014 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 2.16.7-4 - Remove static libraries - Created doc package - Added Readme, News and Copying files * Wed Jan 1 2014 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 2.16.7-3 - Properly link Minizip, fix build issue * Tue Jul 31 2012 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 2.16.7-2 - Fixed License - Disable Bundled 7zip and mpg123 - Added more build requires to avoid use of bundled code - Manually unbundle minizip * Tue Jul 24 2012 Jeremy Newton <alexjnewt(a)hotmail.com&gt; - 2.16.7-1 - Initial working package SPEC created Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/gens-gs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Nov 2014 19:18:02 -0000 1.1 +++ .cvsignore 24 Nov 2014 18:39:09 -0000 1.2 @@ -0,0 +1 @@ +Gens-gs-r7.tar.gz Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/gens-gs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Nov 2014 19:18:02 -0000 1.1 +++ sources 24 Nov 2014 18:39:10 -0000 1.2 @@ -0,0 +1 @@ +bcb17b49774aa318a224c741028aabc3 Gens-gs-r7.tar.gz