haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

mc: added a recipe for version 4.8.13

Browse Source 
* removed previous version and patch
This commit is contained in:
Sergei Reznikov
2014-09-06 20:11:27 +04:00
parent b39ef99f69
commit 3fc8a7af2a
3 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app-misc/mc/mc-4.8.12.recipe → app-misc/mc/mc-4.8.13.recipe
View File

@@ -10,7 +10,7 @@ HOMEPAGE="http://www.midnight-commander.org"
COPYRIGHT="2007 MC Team"
LICENSE="GNU GPL v2"
CHECKSUM_SHA256="5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe"
CHECKSUM_SHA256="36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657"
SRC_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz"
@@ -19,7 +19,7 @@ REVISION="1"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PATCHES="mc-4.8.12.patch"
PATCHES="mc-4.8.13.patch"
GLOBAL_WRITABLE_FILES="settings/mc directory keep-old"

43
app-misc/mc/patches/mc-4.8.12.patch
View File

@@ -1,43 +0,0 @@
diff --git mc-4.8.12/lib/tty/tty-ncurses.c mc-4.8.12-haiku/lib/tty/tty-ncurses.c
--- mc-4.8.12/lib/tty/tty-ncurses.c
+++ mc-4.8.12-haiku/lib/tty/tty-ncurses.c
@@ -66,7 +66,7 @@
/*** file scope macro definitions ****************************************************************/
-#if defined(_AIX) && !defined(CTRL)
+#if !defined(CTRL)
#define CTRL(x) ((x) & 0x1f)
#endif
diff --git mc-4.8.12/lib/mcconfig/paths.c mc-4.8.12-haiku/lib/mcconfig/paths.c
--- mc-4.8.12/lib/mcconfig/paths.c
+++ mc-4.8.12-haiku/lib/mcconfig/paths.c
@@ -289,6 +289,7 @@
mc_config_init_config_paths (GError ** error)
{
char *dir;
+ char *defined_userconf_dir;
if (xdg_vars_initialized)
return;
@@ -346,7 +347,6 @@
mc_config_fix_migrated_rules ();
#else /* MC_HOMEDIR_XDG */
- char *defined_userconf_dir;
defined_userconf_dir = tilde_expand (MC_USERCONF_DIR);
if (g_path_is_absolute (defined_userconf_dir))
diff --git mc-4.8.12/lib/tty/tty-slang.h mc-4.8.12-haiku/lib/tty/tty-slang.h
--- mc-4.8.12/lib/tty/tty-slang.h
+++ mc-4.8.12-haiku/lib/tty/tty-slang.h
@@ -1,6 +1,7 @@
#ifndef MC__TTY_SLANG_H
#define MC__TTY_SLANG_H
+#define REAL_UNIX_SYSTEM
#ifdef HAVE_SLANG_SLANG_H
#include <slang/slang.h>

53
app-misc/mc/patches/mc-4.8.13.patch Normal file
View File

@@ -0,0 +1,53 @@
diff --git mc-4.8.13/lib/tty/tty-ncurses.c mc-4.8.13-haiku/lib/tty/tty-ncurses.c
--- mc-4.8.13/lib/tty/tty-ncurses.c
+++ mc-4.8.13-haiku/lib/tty/tty-ncurses.c
@@ -66,7 +66,7 @@
/*** file scope macro definitions ****************************************************************/
-#if defined(_AIX) && !defined(CTRL)
+#if !defined(CTRL)
#define CTRL(x) ((x) & 0x1f)
#endif
diff --git mc-4.8.13/lib/tty/tty-slang.h mc-4.8.13-haiku/lib/tty/tty-slang.h
--- mc-4.8.13/lib/tty/tty-slang.h
+++ mc-4.8.13-haiku/lib/tty/tty-slang.h
@@ -1,6 +1,7 @@
#ifndef MC__TTY_SLANG_H
#define MC__TTY_SLANG_H
+#define REAL_UNIX_SYSTEM
#ifdef HAVE_SLANG_SLANG_H
#include <slang/slang.h>
--- mc-4.8.13/lib/mcconfig/paths.c 2014-09-06 19:04:12.000000000 +0400
+++ mc-4.8.13-haiku/lib/mcconfig/paths.c 2014-09-06 19:07:53.861143040 +0400
@@ -286,7 +286,8 @@
mc_config_init_config_paths (GError ** mcerror)
{
char *dir;
-
+ char *defined_userconf_dir;
+
mc_return_if_error (mcerror);
if (xdg_vars_initialized)
@@ -345,7 +346,6 @@
mc_config_fix_migrated_rules ();
#else /* MC_HOMEDIR_XDG */
- char *defined_userconf_dir;
defined_userconf_dir = tilde_expand (MC_USERCONF_DIR);
if (g_path_is_absolute (defined_userconf_dir))
--- mc-4.8.13/src/filemanager/ext.c.dist 2014-09-06 19:15:37.899940352 +0400
+++ mc-4.8.13-haiku/src/filemanager/ext.c 2014-09-06 19:14:42.802422784 +0400
@@ -36,6 +36,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <unistd.h>
#include "lib/global.h"