ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mc: Update to 4.8.16.

Browse source 
* gnu/packages/mc.scm (mc): Update to 4.8.16.
[source]: Remove patch.
* gnu/packages/patches/mc-fix-ncurses-build.patch: Remove.
* gnu-system.am (dist_patch_DATA): Remove it.
This commit is contained in:
Efraim Flashner 2016-04-02 23:39:32 +03:00
parent 57818b6e3c
commit 451c1436a3
3 changed files with 4 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu-system.am
View file

@ -623,7 +623,6 @@ dist_patch_DATA = \
gnu/packages/patches/mars-sfml-2.3.patch \ gnu/packages/patches/mars-sfml-2.3.patch \
gnu/packages/patches/matplotlib-setupext-tk.patch \ gnu/packages/patches/matplotlib-setupext-tk.patch \
gnu/packages/patches/maxima-defsystem-mkdir.patch \ gnu/packages/patches/maxima-defsystem-mkdir.patch \
gnu/packages/patches/mc-fix-ncurses-build.patch \
gnu/packages/patches/mcron-install.patch \ gnu/packages/patches/mcron-install.patch \
gnu/packages/patches/mdadm-gcc-4.9-fix.patch \ gnu/packages/patches/mdadm-gcc-4.9-fix.patch \
gnu/packages/patches/mhash-keygen-test-segfault.patch \ gnu/packages/patches/mhash-keygen-test-segfault.patch \

8
gnu/packages/mc.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -33,7 +34,7 @@ (define-module (gnu packages mc)
(define-public mc (define-public mc
(package (package
(name "mc") (name "mc")
(version "4.8.11") (version "4.8.16")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -41,8 +42,7 @@ (define-public mc
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0flrw5pq2mg2d39bh6dllndhpcfppjza6g70p4ry2wcx9y2flxqq")) "083h5gwc0nny9b557way5dsmj71g2bzkiai4bn30y5nkjwqbxg5v"))))
(patches (list (search-patch "mc-fix-ncurses-build.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
("perl" ,perl))) ("perl" ,perl)))
@ -63,4 +63,4 @@ (define-public mc
RPM package files and other archives and managing files on other computers via RPM package files and other archives and managing files on other computers via
FTP or FISH. It also includes a powerful text editor for opening text FTP or FISH. It also includes a powerful text editor for opening text
files.") files.")
(license gpl2))) (license gpl3+)))

37
gnu/packages/patches/mc-fix-ncurses-build.patch
View file

@ -1,37 +0,0 @@
Patch cherry-picked from resolution of
http://www.midnight-commander.org/ticket/3114
--- a/lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
+++ b/lib/tty/key.c (revision d870aedad1907773f8586fe818a89e6b5178b849)
@@ -1947,4 +1947,5 @@
{
int c;
+ 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;
--- a/lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
+++ b/lib/tty/tty-ncurses.c (revision d870aedad1907773f8586fe818a89e6b5178b849)
@@ -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;