Author: sergiomb Update of /cvs/nonfree/rpms/gmameui/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26910 Modified Files: gmameui.spec Added Files: gmameui-0.2.12-autopoint.patch gmameui-0.2.12-glib2.patch gmameui-0.2.12-libarchive.patch gmameui-0.2.13-g_key_file_save_to_file2.patch Removed Files: gmameui-0.2.12-fix.patch gmameui-fix3.patch gmameui-fix4.patch Log Message: * Sat Jan 17 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 0.2.13-0.6.20120704cvs - work in progress , renaming patches, clean spec gmameui-0.2.12-autopoint.patch: setup-gettext | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) --- NEW FILE gmameui-0.2.12-autopoint.patch --- diff --git a/setup-gettext b/setup-gettext index 833813b..cb14577 100755 --- a/setup-gettext +++ b/setup-gettext @@ -35,14 +35,12 @@ parse_gettext_version() { find_gettext() { GETTEXT_TOOL= -# Use autopoint only if cvs is installed. - (cvs --version) < /dev/null > /dev/null 2>&1 && { - GETTEXT_TOOL=autopoint +# Use autopoint by default. + GETTEXT_TOOL=autopoint - (autopoint --version) < /dev/null > /dev/null 2>&1 || { - GETTEXT_TOOL= - } - } + (autopoint --version) < /dev/null > /dev/null 2>&1 || { + GETTEXT_TOOL= + } if test x$GETTEXT_TOOL = x; then GETTEXT_TOOL=gettextize gmameui-0.2.12-glib2.patch: gmameui.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- NEW FILE gmameui-0.2.12-glib2.patch --- diff -up gmameui-0.2.12/src/gmameui.c.fix gmameui-0.2.12/src/gmameui.c --- gmameui-0.2.12/src/gmameui.c.fix 2009-09-05 13:14:33.000000000 +0200 +++ gmameui-0.2.12/src/gmameui.c 2012-05-13 23:23:40.298904121 +0200 @@ -31,9 +31,7 @@ #include <locale.h> #include <unistd.h> #include <signal.h> -#include <glib/gprintf.h> -#include <glib/gutils.h> -#include <glib/gstdio.h> /* For g_mkdir */ +#include <glib.h> #include <gtk/gtkmain.h> #include <gtk/gtkfilesel.h> gmameui-0.2.12-libarchive.patch: gmameui-zip-utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE gmameui-0.2.12-libarchive.patch --- * Fix FTBFS with libarchive12 * Build-depend on libarchive-dev (>= 3.0.0) --- src/gmameui-zip-utils.c.orig 2012-07-02 05:51:55.114101799 +0100 +++ src/gmameui-zip-utils.c 2012-07-02 05:53:00.638847033 +0100 @@ -96,7 +96,7 @@ read_pixbuf_from_zip_file (gchar *zipfil buffer_data = (gchar *) g_malloc0 (filesize); /* Read the zipped pixbuf into memory */ - archive_read_data_into_buffer (zipfile, buffer_data, filesize); + archive_read_data (zipfile, buffer_data, filesize); pixbuf = load_pixbuf_data (buffer_data, filesize); @@ -266,7 +266,7 @@ GList *get_zip_contents_OLD (gchar *zipf buffer_data = (guchar *) g_malloc0 (filesize); /* Read the zipped ROM into memory */ - i = archive_read_data_into_buffer (zipfile, buffer_data, filesize); + i = archive_read_data (zipfile, buffer_data, filesize); if ((i == ARCHIVE_FATAL) || (i == ARCHIVE_WARN)) { GMAMEUI_DEBUG ("Error/warning from zip file %s - %s", filename, archive_error_string (zipfile)); gmameui-0.2.13-g_key_file_save_to_file2.patch: gui_prefs.c | 10 +++++----- io.c | 2 +- io.h | 2 +- mame_options.c | 8 ++++---- mame_options_legacy.c | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) --- NEW FILE gmameui-0.2.13-g_key_file_save_to_file2.patch --- diff -Nurp gmameui.orig/src/gui_prefs.c gmameui/src/gui_prefs.c --- gmameui.orig/src/gui_prefs.c 2010-09-15 10:59:38.000000000 +0100 +++ gmameui/src/gui_prefs.c 2014-10-13 01:06:07.290499938 +0100 @@ -763,7 +763,7 @@ static void mame_gui_prefs_save_int (Mam /* Set the value and save the file */ g_key_file_set_integer (pr->priv->prefs_ini_file, "Preferences", key, value); - g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename); + g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename); g_free (key); @@ -805,7 +805,7 @@ static void mame_gui_prefs_save_int_arr /* Set the value and save the file */ g_key_file_set_integer_list (pr->priv->prefs_ini_file, "Preferences", key, value, NUMBER_COLUMN); - g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename); + g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename); g_free (key); @@ -832,7 +832,7 @@ static void mame_gui_prefs_save_bool (Ma /* Set the value and save the file */ g_key_file_set_boolean (pr->priv->prefs_ini_file, "Preferences", key, value); - g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename); + g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename); g_free (key); @@ -859,7 +859,7 @@ static void mame_gui_prefs_save_string ( /* Set the value and save the file */ g_key_file_set_string (pr->priv->prefs_ini_file, "Preferences", key, value); - g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename); + g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename); g_free (key); @@ -915,7 +915,7 @@ mame_gui_prefs_save_string_arr (MameGuiP /* Set the value and save the file */ g_key_file_set_string_list (pr->priv->prefs_ini_file, "Preferences", key, value, n_va); } - g_key_file_save_to_file (pr->priv->prefs_ini_file, pr->priv->filename); + g_key_file_save_to_file2 (pr->priv->prefs_ini_file, pr->priv->filename); GMAMEUI_DEBUG ("Saving string array %s... done", key); diff -Nurp gmameui.orig/src/io.c gmameui/src/io.c --- gmameui.orig/src/io.c 2010-09-12 10:25:44.000000000 +0100 +++ gmameui/src/io.c 2014-10-13 01:05:36.265136265 +0100 @@ -124,7 +124,7 @@ my_dtostr (char * buf, gdouble d) /* Custom function to save the keyfile to disk. If the file does not exist, it will be created */ -gboolean g_key_file_save_to_file(GKeyFile *kf, const gchar *file) +gboolean g_key_file_save_to_file2(GKeyFile *kf, const gchar *file) { GError *error = NULL; gsize length, nr; diff -Nurp gmameui.orig/src/io.h gmameui/src/io.h --- gmameui.orig/src/io.h 2009-10-26 06:20:07.000000000 +0000 +++ gmameui/src/io.h 2014-10-13 01:05:18.090923231 +0100 @@ -62,7 +62,7 @@ const gchar * my_dtostr(char* buf, gdouble d); gboolean -g_key_file_save_to_file(GKeyFile *kf, const gchar *file); +g_key_file_save_to_file2(GKeyFile *kf, const gchar *file); gboolean load_games_ini(void); diff -Nurp gmameui.orig/src/mame_options.c gmameui/src/mame_options.c --- gmameui.orig/src/mame_options.c 2009-09-22 11:39:28.000000000 +0100 +++ gmameui/src/mame_options.c 2014-10-13 01:06:40.174885397 +0100 @@ -492,7 +492,7 @@ mame_options_save_string (MameOptions *o g_key_file_set_string (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } static void @@ -519,7 +519,7 @@ mame_options_save_double (MameOptions *o g_key_file_set_double (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } static void @@ -546,7 +546,7 @@ mame_options_save_int (MameOptions *opts g_key_file_set_integer (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } static void @@ -573,7 +573,7 @@ mame_options_save_bool (MameOptions *opt g_key_file_set_boolean (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } /* Gets the value from the keyfile for the specified key, which should be of the diff -Nurp gmameui.orig/src/mame_options_legacy.c gmameui/src/mame_options_legacy.c --- gmameui.orig/src/mame_options_legacy.c 2009-08-11 12:09:03.000000000 +0100 +++ gmameui/src/mame_options_legacy.c 2014-10-13 01:07:11.113248044 +0100 @@ -491,7 +491,7 @@ mame_options_legacy_save_string (MameOpt g_key_file_set_string (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } static void @@ -518,7 +518,7 @@ mame_options_legacy_save_double (MameOpt g_key_file_set_double (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } static void @@ -545,7 +545,7 @@ mame_options_legacy_save_int (MameOption g_key_file_set_integer (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } static void @@ -572,7 +572,7 @@ mame_options_legacy_save_bool (MameOptio g_key_file_set_boolean (opts->priv->options_file, opt->category, opt->key, value); // g_strfreev (stv); - g_key_file_save_to_file (opts->priv->options_file, opts->priv->filename); + g_key_file_save_to_file2 (opts->priv->options_file, opts->priv->filename); } /* Gets the value from the keyfile for the specified key, which should be of the Index: gmameui.spec =================================================================== RCS file: /cvs/nonfree/rpms/gmameui/devel/gmameui.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gmameui.spec 31 Aug 2014 20:40:09 -0000 1.11 +++ gmameui.spec 17 Jan 2015 05:29:05 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Frontend for MAME Name: gmameui Version: 0.2.13 -Release: 0.5.20120704cvs%{?dist} +Release: 0.6.20120704cvs%{?dist} License: GPLv3+ Group: Applications/Emulators URL: http://gmameui.sourceforge.net/ @@ -9,13 +9,14 @@ Source0: gmameui-gmameui20120704cvs.tar.gz #from gnome-icon-theme-gperfection2-2.3-1.noarch.rpm Source1: missingicons.tbz -Patch0: gmameui-0.2.12-fix.patch -Patch2: gmameui-fix3.patch -Patch3: gmameui-fix4.patch -#BuildRequires: gtk2-devel -BuildRequires: libgnome-devel +Patch0: gmameui-0.2.12-glib2.patch +Patch2: gmameui-0.2.12-libarchive.patch +Patch3: gmameui-0.2.12-autopoint.patch +Patch4: gmameui-0.2.13-g_key_file_save_to_file2.patch +BuildRequires: gtk2-devel +#BuildRequires: libgnome-devel BuildRequires: expat-devel -BuildRequires: libglade2-devel +#BuildRequires: libglade2-devel BuildRequires: gettext, bison BuildRequires: intltool, perl(XML::Parser) BuildRequires: libarchive-devel @@ -37,38 +38,33 @@ %prep %setup -q -n gmameui %setup -a1 -qn gmameui -%patch0 -p1 -b .fix -%patch2 -p0 -b .fix3 -%patch3 -p0 -b .fix4 +%patch0 -p1 -b .glib2 +%patch2 -p0 -b .libarchive +%patch3 -p1 -b .autopoint +%patch4 -p1 -b .g_key_file_save_to_file2 %build ./autogen.sh -%configure +%configure --enable-debug %{__make} %{?_smp_mflags} %install -%{__rm} -rf %{buildroot} _docs %{__make} install DESTDIR=%{buildroot} %find_lang %{name} -# Put the docs back into place -%{__mkdir} _docs +# clean empty files %{__rm} -f %{buildroot}%{_docdir}/%{name}*/{README,TODO} -%{__mv} %{buildroot}%{_docdir}/%{name}*/* _docs/ # Install missing icons -#%{__cp} emblem-distinguished.png emblem-sound.png stock_unknown.png stock_filter-navigator.png \ -#stock_toggle-preview.png stock_list_enum-off.png %{buildroot}%{_datadir}/gmameui/ - %{__cp} gmameui-view-list.png gmameui-view-filters.png gmameui-view-screenshot.png \ gmameui-emblem-unknown.png gmameui-emblem-played.png gmameui-emblem-sound.png \ %{buildroot}%{_datadir}/gmameui/ %files -f %{name}.lang %defattr(-,root,root,-) -%doc _docs/* +%doc %{_docdir} %{_bindir}/gmameui %{_datadir}/applications/gmameui.desktop %{_datadir}/pixmaps/gmameui.png @@ -79,6 +75,9 @@ %changelog +* Sat Jan 17 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 0.2.13-0.6.20120704cvs +- work in progress , renaming patches, clean spec + * Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 0.2.13-0.5.20120704cvs - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- gmameui-0.2.12-fix.patch DELETED --- --- gmameui-fix3.patch DELETED --- --- gmameui-fix4.patch DELETED ---