packages: mc/mc.spec, mc/changeset_r2ac7aeadc8560e8830877677192d0c28290c6a3...
gotar
gotar at pld-linux.org
Sun Aug 1 11:44:17 CEST 2010
Author: gotar Date: Sun Aug 1 09:44:17 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- added patches for #2135, #2264, #2272 and #2284, rel. 2
---- Files affected:
packages/mc:
mc.spec (1.322 -> 1.323) , changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff (NONE -> 1.1) (NEW), changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff (NONE -> 1.1) (NEW), changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff (NONE -> 1.1) (NEW), mc-down2.diff (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mc/mc.spec
diff -u packages/mc/mc.spec:1.322 packages/mc/mc.spec:1.323
--- packages/mc/mc.spec:1.322 Sat Jul 31 21:39:19 2010
+++ packages/mc/mc.spec Sun Aug 1 11:44:11 2010
@@ -22,7 +22,7 @@
Summary(zh_CN.UTF-8): 一个方便实用的文件管理器和虚拟Shell
Name: mc
Version: 4.7.3
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2+
Group: Applications/Shells
@@ -34,9 +34,13 @@
Source8: %{name}.png
Patch0: %{name}-rpmfs.patch
Patch1: slang-8bit_xterm.patch
+Patch2: %{name}-down2.diff
Patch4: %{name}-home_etc2.patch
Patch5: %{name}-pl.patch
Patch6: %{name}-no-ws-visible.patch
+Patch7: changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff
+Patch8: changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff
+Patch9: changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff
Patch11: %{name}-noperl-vfs.patch
# at now syntax highligthing for PLD-update-TODO and CVSROOT/users
Patch12: %{name}-pld-developerfriendly.patch
@@ -166,11 +170,15 @@
#rpm wrapper rewritten
#%patch0 -p1
%patch1 -p1
+%patch2 -p1
# doesn't apply
#%patch4 -p1
# doesn't apply
#%patch5 -p1
%patch6 -p1
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
%{!?with_perl_vfs:%patch11 -p1}
%patch12 -p1
%patch17 -p1
@@ -320,6 +328,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.323 2010/08/01 09:44:11 gotar
+- added patches for #2135, #2264, #2272 and #2284, rel. 2
+
Revision 1.322 2010/07/31 19:39:19 gotar
- upgraded to 4.7.3
- mcserv and mcfs don't compile and to be removed upstream in 4.7.4
================================================================
Index: packages/mc/changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff
diff -u /dev/null packages/mc/changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff:1.1
--- /dev/null Sun Aug 1 11:44:17 2010
+++ packages/mc/changeset_r2ac7aeadc8560e8830877677192d0c28290c6a33.diff Sun Aug 1 11:44:11 2010
@@ -0,0 +1,32 @@
+Index: src/complete.c
+===================================================================
+--- src/complete.c (revision 74651f2e9f112eacc07ed9d1281e27ce6a4be9d4)
++++ src/complete.c (revision 2ac7aeadc8560e8830877677192d0c28290c6a33)
+@@ -1026,5 +1026,5 @@
+ GList *e;
+
+- for (i = 0, e = ((WListbox *) h->current)->list;
++ for (i = 0, e = ((WListbox *) h->current->data)->list;
+ e != NULL; i++, e = g_list_next (e))
+ {
+@@ -1033,5 +1033,5 @@
+ if (strncmp (input->buffer + start, le->text, end - start - 1) == 0)
+ {
+- listbox_select_entry ((WListbox *) h->current, i);
++ listbox_select_entry ((WListbox *) h->current->data, i);
+ end = str_get_prev_char (&(input->buffer[end])) - input->buffer;
+ handle_char (input, parm);
+@@ -1078,5 +1078,5 @@
+ }
+
+- for (i = 0, e = ((WListbox *) h->current)->list;
++ for (i = 0, e = ((WListbox *) h->current->data)->list;
+ e != NULL; i++, e = g_list_next (e))
+ {
+@@ -1118,5 +1118,5 @@
+ {
+ need_redraw = 1;
+- listbox_select_entry ((WListbox *) h->current, i);
++ listbox_select_entry ((WListbox *) h->current->data, i);
+ last_text = le->text;
+ }
================================================================
Index: packages/mc/changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff
diff -u /dev/null packages/mc/changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff:1.1
--- /dev/null Sun Aug 1 11:44:17 2010
+++ packages/mc/changeset_r3322964fbf59f46c49fff2f27d5be86f3d2fde84.diff Sun Aug 1 11:44:11 2010
@@ -0,0 +1,43 @@
+Index: src/editor/editcmd.c
+===================================================================
+--- src/editor/editcmd.c (revision 49f70b533903bb91f9ae915d6285c896359f7fc9)
++++ src/editor/editcmd.c (revision 11e335cdba4b4915f37146b7d268d8dabb3ef0b7)
+@@ -1647,11 +1647,12 @@
+ #ifdef HAVE_CHARSET
+ GString *tmp;
++
+ tmp = str_convert_to_display (str);
+-
+- if (tmp && tmp->len)
+- {
+- return g_string_free (tmp, FALSE);
+- }
+- g_string_free (tmp, TRUE);
++ if (tmp != NULL)
++ {
++ if (tmp->len != 0)
++ return g_string_free (tmp, FALSE);
++ g_string_free (tmp, TRUE);
++ }
+ #endif
+ return g_strdup (str);
+@@ -1663,12 +1664,12 @@
+ #ifdef HAVE_CHARSET
+ GString *tmp;
++
+ tmp = str_convert_to_input (str);
+-
+- if (tmp && tmp->len)
+- {
+- return g_string_free (tmp, FALSE);
+- }
+- g_string_free (tmp, TRUE);
+- return g_strdup (str);
++ if (tmp != NULL)
++ {
++ if (tmp->len != 0)
++ return g_string_free (tmp, FALSE);
++ g_string_free (tmp, TRUE);
++ }
+ #endif
+ return g_strdup (str);
================================================================
Index: packages/mc/changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff
diff -u /dev/null packages/mc/changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff:1.1
--- /dev/null Sun Aug 1 11:44:17 2010
+++ packages/mc/changeset_rce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5.diff Sun Aug 1 11:44:11 2010
@@ -0,0 +1,11 @@
+Index: src/achown.c
+===================================================================
+--- src/achown.c (revision 74651f2e9f112eacc07ed9d1281e27ce6a4be9d4)
++++ src/achown.c (revision ce12059b0e7c7df3b7a1ebc908d48e4eb3b454e5)
+@@ -499,5 +499,5 @@
+ break;
+ flag_pos = f_pos * 3 + i; /* (strchr(ch_perm,parm)-ch_perm); */
+- if (((WButton *) h->current)->text.start[(flag_pos % 3)] ==
++ if (((WButton *) h->current->data)->text.start[(flag_pos % 3)] ==
+ '-')
+ ch_flags[flag_pos] = '+';
================================================================
Index: packages/mc/mc-down2.diff
diff -u /dev/null packages/mc/mc-down2.diff:1.1
--- /dev/null Sun Aug 1 11:44:17 2010
+++ packages/mc/mc-down2.diff Sun Aug 1 11:44:11 2010
@@ -0,0 +1,45 @@
+diff -ur -ruNp mc-4.7.2.orig/src/viewer/move.c mc-4.7.2/src/viewer/move.c
+--- mc-4.7.2.orig/src/viewer/move.c 2010-05-06 14:06:38.000000000 +0200
++++ mc-4.7.2/src/viewer/move.c 2010-05-09 18:54:15.000000000 +0200
+@@ -154,35 +154,33 @@ mcview_move_down (mcview_t * view, off_t
+ else
+ {
+ off_t i;
+- off_t new_offset = 0;
++ off_t new_offset;
+
+ if (view->dpy_end - view->dpy_start > last_byte - view->dpy_end)
+ {
+- i = 0;
+- new_offset = view->dpy_end;
+- while (view->dpy_end < last_byte && lines-- > 0)
++ while (lines-- > 0)
+ {
+ new_offset = mcview_eol (view, view->dpy_end);
+ if (view->text_wrap_mode)
+ new_offset = min (new_offset, view->dpy_end + view->data_area.width);
+ view->dpy_end = new_offset;
++ if(view->dpy_end>=last_byte) lines=0;
+
+ new_offset = mcview_eol (view, view->dpy_start);
+ if (view->text_wrap_mode)
+ new_offset = min (new_offset, view->dpy_start + view->data_area.width);
+- view->dpy_start = new_offset;
++ if(new_offset<last_byte) view->dpy_start = new_offset;
+ }
+- view->dpy_end = last_byte;
+ }
+ else
+ {
+
+- for (i = 0; i < lines && view->dpy_end < last_byte && new_offset < last_byte; i++)
++ for (i = 0; i < lines && new_offset < last_byte; i++)
+ {
+ new_offset = mcview_eol (view, view->dpy_start);
+ if (view->text_wrap_mode)
+ new_offset = min (new_offset, view->dpy_start + view->data_area.width);
+- view->dpy_start = new_offset;
++ if(new_offset<last_byte) view->dpy_start = new_offset;
+ }
+ }
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mc/mc.spec?r1=1.322&r2=1.323&f=u
More information about the pld-cvs-commit
mailing list