summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-misc/mc/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-misc/mc/files')
-rw-r--r--app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch38
-rw-r--r--app-misc/mc/files/mc-4.8.13-3297-prealloc.patch120
-rw-r--r--app-misc/mc/files/mc-4.8.13-tinfo.patch39
3 files changed, 197 insertions, 0 deletions
diff --git a/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch b/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch
new file mode 100644
index 000000000000..0d986eb59f83
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch
@@ -0,0 +1,38 @@
+Index: lib/tty/key.c
+===================================================================
+--- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
++++ lib/tty/key.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
+@@ -1947,4 +1947,5 @@
+ {
+ int c;
++ static int flag = 0; /* Return value from select */
+ #ifdef HAVE_LIBGPM
+ static struct Gpm_Event ev; /* Mouse event */
+@@ -1979,5 +1980,4 @@
+ {
+ int nfd;
+- static int flag = 0; /* Return value from select */
+ fd_set select_set;
+
+Index: lib/tty/tty-ncurses.c
+===================================================================
+--- lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
++++ lib/tty/tty-ncurses.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
+@@ -50,4 +50,5 @@
+ #include "tty.h"
+ #include "color-internal.h"
++#include "key.h"
+ #include "mouse.h"
+ #include "win.h"
+@@ -531,4 +532,5 @@
+ {
+ int res;
++ unsigned char str[UTF8_CHAR_LEN + 1];
+
+ res = g_unichar_to_utf8 (c, (char *) str);
+@@ -541,5 +543,4 @@
+ else
+ {
+- unsigned char str[UTF8_CHAR_LEN + 1];
+ const char *s;
+
diff --git a/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch b/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch
new file mode 100644
index 000000000000..d84c3484ceba
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch
@@ -0,0 +1,120 @@
+commit a3486faac37680e3bcf7d0b3905f745765a823fd
+Author: Andrew Borodin <aborodin@vmail.ru>
+Date: Mon Nov 10 10:32:34 2014 +0300
+
+ Ticket #3297: don't lose file in case of preallocate space fail.
+
+ Don't remove the destination file if it was retrieved incompletely
+ but it was already exist and appended during copy/move operation.
+
+ Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+
+diff --git a/src/filemanager/file.c b/src/filemanager/file.c
+index 9fbf081..3009ccf 100644
+--- a/src/filemanager/file.c
++++ b/src/filemanager/file.c
+@@ -1497,7 +1497,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
+ int open_flags;
+ gboolean is_first_time = TRUE;
+ vfs_path_t *src_vpath = NULL, *dst_vpath = NULL;
+- gboolean write_errno_nospace = FALSE;
+
+ /* FIXME: We should not be using global variables! */
+ ctx->do_reget = 0;
+@@ -1739,28 +1738,39 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
+ goto ret;
+ }
+
+- while (TRUE)
++ /* try preallocate space; if fail, try copy anyway */
++ while (vfs_preallocate (dest_desc, file_size, ctx->do_append != 0 ? sb.st_size : 0) != 0)
+ {
+- errno = vfs_preallocate (dest_desc, file_size, (ctx->do_append != 0) ? sb.st_size : 0);
+- if (errno == 0)
++ if (ctx->skip_all)
++ {
++ /* cannot allocate, start the file copying anyway */
++ return_status = FILE_CONT;
+ break;
++ }
+
+- if (ctx->skip_all)
+- return_status = FILE_SKIPALL;
+- else
++ return_status =
++ file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path);
++
++ if (return_status == FILE_SKIPALL)
++ ctx->skip_all = TRUE;
++
++ if (ctx->skip_all || return_status == FILE_SKIP)
+ {
+- return_status =
+- file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path);
+- if (return_status == FILE_RETRY)
+- continue;
+- if (return_status == FILE_SKIPALL)
+- ctx->skip_all = TRUE;
++ /* skip the space allocation error, start file copying */
++ return_status = FILE_CONT;
++ break;
+ }
+- mc_close (dest_desc);
+- dest_desc = -1;
+- mc_unlink (dst_vpath);
+- dst_status = DEST_NONE;
+- goto ret;
++
++ if (return_status == FILE_ABORT)
++ {
++ mc_close (dest_desc);
++ dest_desc = -1;
++ mc_unlink (dst_vpath);
++ dst_status = DEST_NONE;
++ goto ret;
++ }
++
++ /* return_status == FILE_RETRY -- try allocate space again */
+ }
+
+ ctx->eta_secs = 0.0;
+@@ -1822,6 +1832,8 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
+ /* dst_write */
+ while ((n_written = mc_write (dest_desc, t, n_read)) < n_read)
+ {
++ gboolean write_errno_nospace;
++
+ if (n_written > 0)
+ {
+ n_read -= n_written;
+@@ -1851,10 +1863,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
+ }
+ if (return_status != FILE_RETRY)
+ goto ret;
+-
+- /* User pressed "Retry". Will the next mc_write() call be successful?
+- * Reset error flag to be ready for that. */
+- write_errno_nospace = FALSE;
+ }
+ }
+
+@@ -1933,16 +1941,9 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
+
+ if (dst_status == DEST_SHORT)
+ {
+- /* Remove short file */
+- int result = 0;
+-
+- /* In case of copy/move to full partition, keep source file
+- * and remove incomplete destination one */
+- if (!write_errno_nospace)
+- result = query_dialog (Q_ ("DialogTitle|Copy"),
+- _("Incomplete file was retrieved. Keep it?"),
+- D_ERROR, 2, _("&Delete"), _("&Keep"));
+- if (result == 0)
++ /* Query to remove short file */
++ if (query_dialog (Q_ ("DialogTitle|Copy"), _("Incomplete file was retrieved. Keep it?"),
++ D_ERROR, 2, _("&Delete"), _("&Keep")) == 0)
+ mc_unlink (dst_vpath);
+ }
+ else if (dst_status == DEST_FULL)
diff --git a/app-misc/mc/files/mc-4.8.13-tinfo.patch b/app-misc/mc/files/mc-4.8.13-tinfo.patch
new file mode 100644
index 000000000000..761c103df654
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.13-tinfo.patch
@@ -0,0 +1,39 @@
+Gentoo-bug: https://bugs.gentoo.org/527118
+--- a/m4.include/mc-with-screen-ncurses.m4
++++ b/m4.include/mc-with-screen-ncurses.m4
+@@ -101,6 +101,9 @@
+ LIBS=
+ AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"],
+ [AC_MSG_ERROR([Cannot find ncurses library])])
++ AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+
+ screen_type=ncurses
+ screen_msg="Ncurses library"
+@@ -111,10 +114,15 @@
+ AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
+ [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
+
++ AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+ if test x"$ncursesw_found" = "x"; then
+ LIBS=
+ AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
+ [AC_MSG_ERROR([Cannot find ncurses library])])
++ AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
+ fi
+
+ dnl Check the header
+@@ -166,6 +174,9 @@
+ LIBS=
+ AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
+ [AC_MSG_ERROR([Cannot find ncursesw library])])
++ AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
++ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
++
+
+ dnl Check the header
+ ncurses_h_found=