rpms/mame/devel .cvsignore, 1.82, 1.83 mame.spec, 1.97, 1.98 sources, 1.82, 1.83
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9565
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Thu Nov 27 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.156-1
- Updated to 0.156
- Switched to SDL2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- .cvsignore 15 Oct 2014 19:20:08 -0000 1.82
+++ .cvsignore 27 Nov 2014 18:21:01 -0000 1.83
@@ -1 +1 @@
-mame0155s.exe
+mame0156s.exe
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- mame.spec 4 Nov 2014 22:02:28 -0000 1.97
+++ mame.spec 27 Nov 2014 18:21:01 -0000 1.98
@@ -5,7 +5,7 @@
%bcond_with debug
%bcond_with simd
-%global baseversion 155
+%global baseversion 156
#global sourceupdate 1
#global svn 21418
@@ -26,7 +26,7 @@
Version: 0.%{baseversion}
%endif
-Release: 2%{?svnrelease}%{?dist}
+Release: 1%{?svnrelease}%{?dist}
Summary: Multiple Arcade Machine Emulator
License: MAME License and BSD
@@ -53,7 +53,7 @@
BuildRequires: portmidi-devel
BuildRequires: python
BuildRequires: qt-devel
-BuildRequires: SDL_ttf-devel
+BuildRequires: SDL2_ttf-devel
BuildRequires: sqlite-devel
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
@@ -389,6 +389,10 @@
%changelog
+* Thu Nov 27 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.156-1
+- Updated to 0.156
+- Switched to SDL2
+
* Tue Nov 04 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.155-2
- Fixed the ini path correctly
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- sources 15 Oct 2014 19:20:08 -0000 1.82
+++ sources 27 Nov 2014 18:21:02 -0000 1.83
@@ -1 +1 @@
-214f5c6a22002b84cf60645cb8bc4474 mame0155s.exe
+42182044071c4aed2675e28df62fa210 mame0156s.exe
9 years, 5 months
rpms/vdr-skindesigner/devel vdr-skindesigner.spec,1.15,1.16
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-skindesigner/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11152/devel
Modified Files:
vdr-skindesigner.spec
Log Message:
Index: vdr-skindesigner.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/devel/vdr-skindesigner.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- vdr-skindesigner.spec 22 Nov 2014 09:54:07 -0000 1.15
+++ vdr-skindesigner.spec 25 Nov 2014 17:38:19 -0000 1.16
@@ -1,6 +1,6 @@
Name: vdr-skindesigner
Version: 0.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
Group: Applications/Multimedia
@@ -19,7 +19,6 @@
BuildRequires: libjpeg-turbo-devel
BuildRequires: cairo-devel
BuildRequires: librsvg2-devel
-BuildRequires: GraphicsMagick-c++-devel
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
Requires: vdr-softhddevice
Requires: vdr-epgsearch
@@ -44,7 +43,7 @@
%setup -q -n vdr-plugin-skindesigner-%{version}
%build
-make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all
+make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%install
# make install would install the themes under /etc, let's not use that
@@ -74,6 +73,10 @@
%changelog
+* Mon Nov 24 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.6-2
+- Rebuild
+- removed BR GraphicsMagick-c++-devel
+
* Sat Nov 22 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.6-1
- Update to 0.0.6
9 years, 5 months
rpms/vdr-skindesigner/F-20 vdr-skindesigner.spec,1.17,1.18
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-skindesigner/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11009/F-20
Modified Files:
vdr-skindesigner.spec
Log Message:
Index: vdr-skindesigner.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-skindesigner/F-20/vdr-skindesigner.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vdr-skindesigner.spec 22 Nov 2014 09:53:50 -0000 1.17
+++ vdr-skindesigner.spec 25 Nov 2014 17:37:15 -0000 1.18
@@ -1,6 +1,6 @@
Name: vdr-skindesigner
Version: 0.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
Group: Applications/Multimedia
@@ -19,7 +19,6 @@
BuildRequires: libjpeg-turbo-devel
BuildRequires: cairo-devel
BuildRequires: librsvg2-devel
-BuildRequires: GraphicsMagick-c++-devel
Requires: vdr(abi)%{?_isa} = %{vdr_apiversion}
Requires: vdr-softhddevice
Requires: vdr-epgsearch
@@ -44,7 +43,7 @@
%setup -q -n vdr-plugin-skindesigner-%{version}
%build
-make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" IMAGELIB=graphicsmagick %{?_smp_mflags} all
+make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%install
# make install would install the themes under /etc, let's not use that
@@ -74,6 +73,10 @@
%changelog
+* Mon Nov 24 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.6-2
+- Rebuild
+- removed BR GraphicsMagick-c++-devel
+
* Sat Nov 22 2014 Martin Gansser <martinkg(a)fedoraproject.org> - 0.0.6-1
- Update to 0.0.6
9 years, 5 months
rpms/vlc/devel sources, 1.71, 1.72 .cvsignore, 1.61, 1.62 vlc.spec, 1.210, 1.211
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1413
Modified Files:
sources .cvsignore vlc.spec
Log Message:
Update to rc2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- sources 14 Nov 2014 21:28:41 -0000 1.71
+++ sources 25 Nov 2014 09:33:46 -0000 1.72
@@ -1 +1 @@
-0aac1f5f1f6e659770db225768f31f29 vlc-2.2.0-rc1.tar.xz
+2b4d2288605d0b02c22aee4bbcce66ca vlc-2.2.0-rc2.tar.xz
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore 14 Nov 2014 21:28:41 -0000 1.61
+++ .cvsignore 25 Nov 2014 09:33:46 -0000 1.62
@@ -1 +1 @@
-vlc-2.2.0-rc1.tar.xz
+vlc-2.2.0-rc2.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- vlc.spec 14 Nov 2014 21:28:41 -0000 1.210
+++ vlc.spec 25 Nov 2014 09:33:46 -0000 1.211
@@ -1,4 +1,4 @@
-%global vlc_rc -rc1
+%global vlc_rc -rc2
%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
@@ -35,7 +35,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.2.0
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -473,6 +473,9 @@
%changelog
+* Tue Nov 25 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.0-0.2
+- Update to 2.2.0-rc2
+
* Fri Nov 14 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.0-0.1
- Update to 2.2.0-rc1
9 years, 5 months
rpms/VirtualBox-kmod/F-20 VirtualBox-kmod.spec,1.84,1.85
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1144
Modified Files:
VirtualBox-kmod.spec
Log Message:
Fix for current
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-20/VirtualBox-kmod.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- VirtualBox-kmod.spec 23 Nov 2014 16:41:43 -0000 1.84
+++ VirtualBox-kmod.spec 25 Nov 2014 09:09:22 -0000 1.85
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.20
-Release: 1%{?prerel:.%{prerel}}%{?dist}.1
+Release: 1%{?prerel:.%{prerel}}%{?dist}.2
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,8 +98,8 @@
%changelog
-* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.20-1.1
-- Rebuilt for kernel
+* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.20-1.2
+- Rebuilt for current
* Sun Nov 23 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-1
- New upstream release and also build akmods.
9 years, 5 months
rpms/ffmpeg-compat/devel ffmpeg-arm-fix.patch, NONE, 1.1 ffmpeg-compat.spec, 1.20, 1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg-compat/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7128/devel
Modified Files:
ffmpeg-compat.spec
Added Files:
ffmpeg-arm-fix.patch
Log Message:
Fixup arm
ffmpeg-arm-fix.patch:
jrevdct_arm.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE ffmpeg-arm-fix.patch ---
--- libavcodec/arm/jrevdct_arm.S 2014-11-24 14:20:06.352682781 +1100
+++ libavcodec/arm/jrevdct_arm.S 2014-11-24 13:26:48.930757553 +1100
@@ -61,7 +61,7 @@
stmdb sp!, { r4 - r12, lr } @ all callee saved regs
sub sp, sp, #4 @ reserve some space on the stack
- str r0, [ sp ] @ save the DCT pointer to the stack
+ str r0, [sp] @ save the DCT pointer to the stack
mov lr, r0 @ lr = pointer to the current row
mov r12, #8 @ r12 = row-counter
@@ -211,7 +211,7 @@
start_column_loop:
@ Start of column loop
- ldr lr, [ sp ]
+ ldr lr, [sp]
mov r12, #8
column_loop:
ldrsh r0, [lr, #( 0*8)] @ r0 = 'd0'
Index: ffmpeg-compat.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg-compat/devel/ffmpeg-compat.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ffmpeg-compat.spec 1 Sep 2014 02:25:53 -0000 1.20
+++ ffmpeg-compat.spec 24 Nov 2014 19:29:00 -0000 1.21
@@ -10,7 +10,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg-compat
Version: 0.6.7
-Release: 7%{?dist}
+Release: 8%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -23,6 +23,7 @@
Patch0: ffmpeg-0.6.6-compile-fix.patch
Patch1: 0001-Fix-build-when-seletected-fpu-is-not-neon-on-arm.patch
Patch2: 0002-Add-unconditional-return-statement-to-yuva420_rgb32_.patch
+Patch3: ffmpeg-arm-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: bzip2-devel
@@ -120,6 +121,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p0
%build
mkdir generic
@@ -233,6 +235,9 @@
%changelog
+* Mon Nov 24 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.7-8
+- Add patch for arm - reported by Tobias Brodel
+
* Mon Sep 01 2014 Sérgio Basto <sergio(a)serjux.com> - 0.6.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
9 years, 5 months
rpms/gens-gs/devel gens-gs-gtk.patch, NONE, 1.1 gens-gs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Jeremy Newton
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> - 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> - 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> - 2.16.7-3
- Properly link Minizip, fix build issue
* Tue Jul 31 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 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> - 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
9 years, 5 months
rpms/gens-gs/F-20 gens-gs-gtk.patch, NONE, 1.1 gens-gs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/gens-gs/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5189/F-20
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> - 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> - 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> - 2.16.7-3
- Properly link Minizip, fix build issue
* Tue Jul 31 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 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> - 2.16.7-1
- Initial working package SPEC created
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gens-gs/F-20/.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 17:39:07 -0000 1.2
@@ -0,0 +1 @@
+Gens-gs-r7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gens-gs/F-20/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 17:39:07 -0000 1.2
@@ -0,0 +1 @@
+bcb17b49774aa318a224c741028aabc3 Gens-gs-r7.tar.gz
9 years, 5 months
rpms/gens-gs/F-19 gens-gs-gtk.patch, NONE, 1.1 gens-gs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/gens-gs/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4976/F-19
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> - 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> - 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> - 2.16.7-3
- Properly link Minizip, fix build issue
* Tue Jul 31 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 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> - 2.16.7-1
- Initial working package SPEC created
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/gens-gs/F-19/.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 17:37:29 -0000 1.2
@@ -0,0 +1 @@
+Gens-gs-r7.tar.gz
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/gens-gs/F-19/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 17:37:29 -0000 1.2
@@ -0,0 +1 @@
+bcb17b49774aa318a224c741028aabc3 Gens-gs-r7.tar.gz
9 years, 5 months
rpms/wl-kmod/F-19 wl-kmod.spec,1.141,1.142
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31073
Modified Files:
wl-kmod.spec
Log Message:
* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.13
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- wl-kmod.spec 16 Nov 2014 10:27:47 -0000 1.141
+++ wl-kmod.spec 23 Nov 2014 16:43:25 -0000 1.142
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.248
-Release: 1%{?dist}.12
+Release: 1%{?dist}.13
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -88,6 +88,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 23 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.13
+- Rebuilt for kernel
+
* Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.248-1.12
- Rebuilt for kernel
9 years, 5 months