diff options
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/mc/ChangeLog | 11 | ||||
| -rw-r--r-- | app-misc/mc/Manifest | 9 | ||||
| -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 |
9 files changed, 11 insertions, 144 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/Manifest b/app-misc/mc/Manifest index aa4c4f559783..710a26fe4a3f 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,15 +1,8 @@ -AUX mc-4.7.0.2_hotlist_fix.patch 913 RMD160 344e35fbd503e6fd1f245fe896f4b3c499bdc740 SHA1 857ede6795f9a9c78704c5e6334b3425dc87ea4d SHA256 15775735f244593a3cc9ff49869a91f242226f59bb16649ae484010e5a557dbf -AUX mc-4.7.0.2_syntax_fix.patch 187 RMD160 393228cf02a9e4d1a600e0cffc51eb05e5e00512 SHA1 760cbb70eae34511e5132289639ebb1449c35a76 SHA256 5b7567e9b293b0598c444640f5272f8c78085f7e6920b5c6182d6c4a9852b933 -AUX mc-4.7.1_find-results-panelization-crash.patch 411 RMD160 9c4b8fb9bc9829ec3101b124ad5e8b85c564f248 SHA1 0286d97763c8cc37d16b98f77a236cbd524dd39e SHA256 1ad39b36d5eb0708842cf764a2e963ca3bc7cb19d5af0bf3648d623ce18c4d3d -AUX mc-4.7.3_advanced_chown_segfault_fix.patch 501 RMD160 044cc1a819606132fa7cd373d081d9ac01778379 SHA1 d22a128595cd83088de8e76feb0222fb70b94f92 SHA256 4ae9d11233b9117d746a6d2f43d2c438360904d54c04163cd6c60f7705321b5f -AUX mc-4.7.3_copy_move_dialog_to_field_fix.patch 1112 RMD160 d05b353cde121afeabb4b47f61757f90909e01c1 SHA1 2678686c73f03e7f5457f81a092e15764ff683ea SHA256 47d0e620044d45da094025cf02f88761440cd7f177c4a554c40c760c457df68a -AUX mc-4.7.3_mcedit_quit_dialog_default.patch 933 RMD160 50d3c337069512da5e377d17b4adb648f55e08aa SHA1 d9f2d5984f63d6df3ea5070d3524e38736179be4 SHA256 c7631ae8590745c7c037b2d86a391a09c0f5f72f2b5d59d2f124b6297119afe9 -AUX mc-4.7_mcedit_fix.patch 475 RMD160 eb2234acd6f99abb06c5ae4e20661b43675f2c73 SHA1 f960a559fa7fe3fcb0909ef1b8687c3d786a0b4c SHA256 c08899151ea58423db30eb4d7e5cfb91cc1abec9f1e5b654ed3654f47ea604e6 DIST mc-4.7.0.3.tar.bz2 2793651 RMD160 ecda5e6befe4b1e0442044b732e7903b01ed73ae SHA1 2d319fc940283e4327cd5bc2f977b724461f1305 SHA256 71caeaf00606c45228362fb6a4d2f1b6d47b6c1056db46b975255aac5af45ef7 DIST mc-4.7.0.9.tar.bz2 2833248 RMD160 9138c54f22d933ef760df00459ad0935d3cd7674 SHA1 3ce90e7ecd1f5f424ab6b75551ba1f95e08fd301 SHA256 52f5b8e2fdbbc24fe487909d36f36622c351061b4e10bbcd3812b0c2b6bac385 DIST mc-4.7.4.tar.bz2 2746890 RMD160 d498049ddde8c78d84c22239eedba953f78b72a6 SHA1 301897507344e9312caefe64e3156471e2415ed6 SHA256 3c8fb2cf3361958552b7397e7aa9400f8b35338da2668b4ed7b4f0e4c5377e9a EBUILD mc-4.7.0.3.ebuild 1706 RMD160 47509be466b4c9cb659cbaee63ac3f4919802b30 SHA1 7e81b7de80a5b28b9f458a25f9c7f4e932a2a155 SHA256 5108770f4b2d507a912a0ec5669dd6d23512afd0b70eadfcc10f7359513f9dbf EBUILD mc-4.7.0.9.ebuild 1919 RMD160 a0e19d60056a3d201885939e72a7ceef3ba1ae58 SHA1 5a9e63db13d3169b9bdc93ef0d2d29c094e81ff4 SHA256 6a5ab26028f4b84aa04e50f90b2d7e3ab413aaa273595734a9e4ec75c93bf06e EBUILD mc-4.7.4-r1.ebuild 1864 RMD160 eb92a3acced947bbc4ed989ba0d6e1c30afa47e9 SHA1 736308292068e5f8496c19a7eb90650ad876bfdf SHA256 680590a0867101338e3a2740bdd70298b869c7f1c8554243ebe9e6a497b95669 -MISC ChangeLog 29869 RMD160 805fdfdd0ee64cbc5febae2748260bed5e247195 SHA1 3f52898d42965fc98948d800a540e20edc2ba471 SHA256 18d2c0b3747036912f0bb289210a0edfefc89b502822053ce2b05da2a7a35ad7 +MISC ChangeLog 30267 RMD160 ba50379a39a13e28881cf53182dd4896e644c6ac SHA1 cf7bc36156da3e8492e79c5170bd02da8e299bdb SHA256 1b761c1cf763f50ff81c8a15a9f241c03fb0924d128364e2b2814d0312a06a82 MISC metadata.xml 305 RMD160 319f6d3a222a3028d69dfb5ece59f4ae0343125a SHA1 705291c975a8b25ccc5a040d4fa7feab9190048e SHA256 e8245261e4eaebac2b2f5017c36165f9e733bc1e3619392b8f64c0d5392e7cd9 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 (); - } |