diff options
author | Alex Alexander <wired@gentoo.org> | 2010-11-08 18:48:04 +0000 |
---|---|---|
committer | Alex Alexander <wired@gentoo.org> | 2010-11-08 18:48:04 +0000 |
commit | 43b0e2dc9654e127cc251f73760eb598089bce90 (patch) | |
tree | 729656723f2c62a4d53804fc61d810c14cd646dd /app-misc/mc | |
parent | media-libs/jpeg -> virtual/jpeg (diff) | |
download | gentoo-2-43b0e2dc9654e127cc251f73760eb598089bce90.tar.gz gentoo-2-43b0e2dc9654e127cc251f73760eb598089bce90.tar.bz2 gentoo-2-43b0e2dc9654e127cc251f73760eb598089bce90.zip |
removed old patches
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/mc')
-rw-r--r-- | app-misc/mc/ChangeLog | 11 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch | 33 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch | 8 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch | 11 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.7.3_advanced_chown_segfault_fix.patch | 11 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch | 37 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.7.3_mcedit_quit_dialog_default.patch | 20 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.7_mcedit_fix.patch | 15 |
8 files changed, 10 insertions, 136 deletions
diff --git a/app-misc/mc/ChangeLog b/app-misc/mc/ChangeLog index 3610f02942b0..4639d2591720 100644 --- a/app-misc/mc/ChangeLog +++ b/app-misc/mc/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-misc/mc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.210 2010/11/08 18:21:31 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/mc/ChangeLog,v 1.211 2010/11/08 18:48:03 wired Exp $ + + 08 Nov 2010; Alex Alexander <wired@gentoo.org> + -files/mc-4.7.0.2_hotlist_fix.patch, -files/mc-4.7.0.2_syntax_fix.patch, + -files/mc-4.7.1_find-results-panelization-crash.patch, + -files/mc-4.7.3_advanced_chown_segfault_fix.patch, + -files/mc-4.7.3_copy_move_dialog_to_field_fix.patch, + -files/mc-4.7.3_mcedit_quit_dialog_default.patch, + -files/mc-4.7_mcedit_fix.patch: + removed old patches 08 Nov 2010; Alex Alexander <wired@gentoo.org> -mc-4.7.0.1.ebuild, -mc-4.7.0.8.ebuild, -mc-4.7.0.8-r1.ebuild, -mc-4.7.3-r2.ebuild, diff --git a/app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch b/app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch deleted file mode 100644 index 25bf16110ff5..000000000000 --- a/app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/lib/tty/tty-internal.h -+++ b/lib/tty/tty-internal.h -@@ -8,4 +8,15 @@ - - #include "lib/global.h" /* include <glib.h> */ -+ -+/* Taken from S-Lang's slutty.c */ -+#ifdef ultrix /* Ultrix gets _POSIX_VDISABLE wrong! */ -+# define NULL_VALUE -1 -+#else -+# ifdef _POSIX_VDISABLE -+# define NULL_VALUE _POSIX_VDISABLE -+# else -+# define NULL_VALUE 255 -+# endif -+#endif - - /* If true lines are shown by spaces */ ---- a/lib/tty/tty-ncurses.c -+++ b/lib/tty/tty-ncurses.c -@@ -63,4 +63,5 @@ - - /*** file scope macro definitions **************************************/ -+ - #if defined(_AIX) && !defined(CTRL) - # define CTRL(x) ((x) & 0x1f) -@@ -159,4 +160,6 @@ - /* use Ctrl-g to generate SIGINT */ - cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */ -+ /* disable SIGQUIT to allow use Ctrl-\ key */ -+ cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE; - tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb); - diff --git a/app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch b/app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch deleted file mode 100644 index e62faca66c67..000000000000 --- a/app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/misc/syntax/Syntax -+++ b/misc/syntax/Syntax -@@ -140,5 +140,5 @@ - include spec.syntax - --file ..\*\\.repo$ YUM\sRepo File -+file ..\*\\.repo$ YUM\sRepo\sFile - include yum-repo.syntax diff --git a/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch b/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch deleted file mode 100644 index 37ec18e4d163..000000000000 --- a/app-misc/mc/files/mc-4.7.1_find-results-panelization-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: src/find.c -=================================================================== ---- src/find.c (revision 1947d842a5d87c11862039037dc85051448a6081) -+++ src/find.c (revision 7b9226c5da3a81fb758bee70aafe05bb64d37464) -@@ -1256,5 +1256,5 @@ - WLEntry *le = (WLEntry *) entry->data; - -- if ((le->text == NULL) || (entry->data == NULL)) -+ if ((le->text == NULL) || (le->data == NULL)) - continue; - diff --git a/app-misc/mc/files/mc-4.7.3_advanced_chown_segfault_fix.patch b/app-misc/mc/files/mc-4.7.3_advanced_chown_segfault_fix.patch deleted file mode 100644 index 7def57036b53..000000000000 --- a/app-misc/mc/files/mc-4.7.3_advanced_chown_segfault_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -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] = '+'; diff --git a/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch b/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch deleted file mode 100644 index 8fd8c88c0cf0..000000000000 --- a/app-misc/mc/files/mc-4.7.3_copy_move_dialog_to_field_fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: src/file.c -=================================================================== ---- a/src/file.c -+++ b/src/file.c -@@ -2067,5 +2067,4 @@ - else - dest_dir = panel->cwd; -- - /* - * Add trailing backslash only when do non-local ops. -@@ -2073,20 +2072,14 @@ - * dir is deleted) - */ -- if (force_single || dest_dir[0] == '\0') -+ if (!force_single && dest_dir[0] != '\0' && dest_dir[strlen (dest_dir) - 1] != PATH_SEP) -+ { -+ /* add trailing separator */ -+ dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL); -+ } -+ else - { - /* just copy */ - dest_dir_ = g_strdup (dest_dir); - } -- else if (single_entry) -- { -- /* add filename to dest path */ -- dest_dir_ = g_build_filename (dest_dir, source, (char *) NULL); -- } -- else -- { -- /* add trailing separator */ -- dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char *) NULL); -- } -- - if (dest_dir_ == NULL) - { diff --git a/app-misc/mc/files/mc-4.7.3_mcedit_quit_dialog_default.patch b/app-misc/mc/files/mc-4.7.3_mcedit_quit_dialog_default.patch deleted file mode 100644 index 364db95a866f..000000000000 --- a/app-misc/mc/files/mc-4.7.3_mcedit_quit_dialog_default.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: src/editor/editcmd.c -=================================================================== ---- src/editor/editcmd.c (revision 59a85303a8db608f80bc8f0a828d6d22d43937b4) -+++ src/editor/editcmd.c (revision f660c97698a90234bba8e1e9b61999993ac2db69) -@@ -2068,4 +2068,5 @@ - return FALSE; - -+ query_set_sel (2); - act = edit_query_dialog3 (_("Quit"), _("File was modified. Save with exit?"), - _("&Yes"), _("&No"), _("&Cancel quit")); -Index: src/viewer/lib.c -=================================================================== ---- src/viewer/lib.c (revision 48fe4e6881473ecb2f7188684a92450dc842b7b7) -+++ src/viewer/lib.c (revision f660c97698a90234bba8e1e9b61999993ac2db69) -@@ -150,4 +150,5 @@ - if (!midnight_shutdown) - { -+ query_set_sel (2); - r = query_dialog (_("Quit"), - _("File was modified. Save with exit?"), D_NORMAL, 3, diff --git a/app-misc/mc/files/mc-4.7_mcedit_fix.patch b/app-misc/mc/files/mc-4.7_mcedit_fix.patch deleted file mode 100644 index c574bea0dbfe..000000000000 --- a/app-misc/mc/files/mc-4.7_mcedit_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: src/execute.c -=================================================================== ---- a/src/execute.c -+++ b/src/execute.c -@@ -305,6 +305,8 @@ - #endif /* HAVE_SUBSHELL_SUPPORT */ - -- update_panels (UP_OPTIMIZE, UP_KEEPSEL); -- update_xterm_title_path (); -+ if ((view_one_file == NULL) && (edit_one_file == NULL)) { -+ update_panels (UP_OPTIMIZE, UP_KEEPSEL); -+ update_xterm_title_path (); -+ } - repaint_screen (); - } |