summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-02-10 10:56:15 +0000
committerAlex Alexander <wired@gentoo.org>2010-02-10 10:56:15 +0000
commit5432f8d3ade6fd8dfac5937ecf68444e1b484bdd (patch)
treec08c432c0c9922b33e9d252fba07b2713edbc67d /app-misc/mc/files
parentAdded session handling, bug #303661. (diff)
downloadgentoo-2-5432f8d3ade6fd8dfac5937ecf68444e1b484bdd.tar.gz
gentoo-2-5432f8d3ade6fd8dfac5937ecf68444e1b484bdd.tar.bz2
gentoo-2-5432f8d3ade6fd8dfac5937ecf68444e1b484bdd.zip
[app-misc/mc-4.7.0.2-r1] added patches that fix bugs #298997 and #300913
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/mc/files')
-rw-r--r--app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch33
-rw-r--r--app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch8
2 files changed, 41 insertions, 0 deletions
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
new file mode 100644
index 000000000000..25bf16110ff5
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0.2_hotlist_fix.patch
@@ -0,0 +1,33 @@
+--- 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
new file mode 100644
index 000000000000..e62faca66c67
--- /dev/null
+++ b/app-misc/mc/files/mc-4.7.0.2_syntax_fix.patch
@@ -0,0 +1,8 @@
+--- 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