diff --git a/mc-int_ptr_casts.patch b/mc-int_ptr_casts.patch new file mode 100644 index 0000000..48927e9 --- /dev/null +++ b/mc-int_ptr_casts.patch @@ -0,0 +1,31 @@ +Index: lib/tty/color.c +=================================================================== +--- lib/tty/color.c.orig 2010-07-05 21:12:51.000000000 +0200 ++++ lib/tty/color.c 2010-07-09 12:15:45.223012470 +0200 +@@ -85,7 +85,7 @@ tty_color_free_condition_cb (gpointer ke + tty_color_pair_t *mc_color_pair; + (void) key; + +- is_temp_color = (gboolean) user_data; ++ is_temp_color = (gboolean) GINT_TO_POINTER(user_data); + mc_color_pair = (tty_color_pair_t *) value; + return (mc_color_pair->is_temp == is_temp_color); + } +@@ -96,7 +96,7 @@ static void + tty_color_free_all (gboolean is_temp_color) + { + g_hash_table_foreach_remove (mc_tty_color__hashtable, tty_color_free_condition_cb, +- (gpointer) is_temp_color); ++ GINT_TO_POINTER(is_temp_color)); + } + + /* --------------------------------------------------------------------------------------------- */ +@@ -108,7 +108,7 @@ tty_color_get_next_cpn_cb (gpointer key, + tty_color_pair_t *mc_color_pair; + (void) key; + +- cp = (int) user_data; ++ cp = GPOINTER_TO_INT(user_data); + mc_color_pair = (tty_color_pair_t *) value; + + if (cp == mc_color_pair->pair_index) diff --git a/mc.changes b/mc.changes index df221bd..fee3ac6 100644 --- a/mc.changes +++ b/mc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jul 13 11:57:31 CEST 2010 - pth@suse.de + +- Fix pointer <-> int casts. +- Install x11_browser to _datadir/mc. + ------------------------------------------------------------------- Thu Mar 18 07:35:09 UTC 2010 - prusnak@suse.cz diff --git a/mc.spec b/mc.spec index b35bc9f..582cb93 100644 --- a/mc.spec +++ b/mc.spec @@ -50,6 +50,7 @@ Patch41: mc-multi-press-f-keys.patch # Patches from Fedora Patch50: mc-extensions.patch Patch51: mc-mcviewsegfault.patch +Patch52: mc-int_ptr_casts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: audiofile-devel @@ -194,7 +195,7 @@ chmod 755 %{buildroot}/%{_libexecdir}/mc/cons.saver mkdir -p %{buildroot}%{_sysconfdir}/profile.d ln -fs -t %{buildroot}%{_sysconfdir}/profile.d %{_datadir}/mc/mc.{,c}sh #support script for calling available GUI webbrosers -install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/bin +install -m 755 %{SOURCE1} %{buildroot}%{_datadir}/mc/ install -D -m 644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{name}.png %suse_update_desktop_file -i %name System FileManager %{find_lang} %{name}