Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8f8e4fb237021ba94eb1a406a3fa9397fc69e8a5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8f8e4fb237021ba94eb1a406a3fa9397fc69e8a5)
  • Date: Sat, 25 Jan 2014 14:29:59 -0600

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

shell-term-fm/mc/HISTORY | 4 ++
shell-term-fm/mc/PRE_BUILD | 3 +
shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch | 38
+++++++++++++++++++++
3 files changed, 45 insertions(+)

New commits:
commit 8f8e4fb237021ba94eb1a406a3fa9397fc69e8a5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

shell-term-fm/mc: fix incompatibility with ncurses

diff --git a/shell-term-fm/mc/HISTORY b/shell-term-fm/mc/HISTORY
index 787ac5a..08bce47 100644
--- a/shell-term-fm/mc/HISTORY
+++ b/shell-term-fm/mc/HISTORY
@@ -1,3 +1,7 @@
+2014-01-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, mc-4.8.11-ncurses_build_fix.patch: fix incompatibility
+ with ncurses, patch from gentoo
+
2013-12-02 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.8.11

diff --git a/shell-term-fm/mc/PRE_BUILD b/shell-term-fm/mc/PRE_BUILD
new file mode 100755
index 0000000..ef5ca1a
--- /dev/null
+++ b/shell-term-fm/mc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/mc-4.8.11-ncurses_build_fix.patch
diff --git a/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
b/shell-term-fm/mc/mc-4.8.11-ncurses_build_fix.patch
new file mode 100644
index 0000000..0d986eb
--- /dev/null
+++ b/shell-term-fm/mc/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;
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8f8e4fb237021ba94eb1a406a3fa9397fc69e8a5), Florian Franzmann, 01/25/2014

Archive powered by MHonArc 2.6.24.

Top of Page