diff options
author | Juergen Daubert <jue@jue.li> | 2012-09-14 15:24:47 +0200 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2012-09-14 15:24:47 +0200 |
commit | 4ddaafd1f576738d66a3ea035328eb3e2810b8dc (patch) | |
tree | ddcb344c927e6ddb1363681175dc1663c72ed53b /mc | |
parent | 1673baa2674aa899996c21a39ee34e1eda38ca79 (diff) | |
download | opt-4ddaafd1f576738d66a3ea035328eb3e2810b8dc.tar.gz opt-4ddaafd1f576738d66a3ea035328eb3e2810b8dc.tar.xz |
mc: update to 4.8.6
Diffstat (limited to 'mc')
-rw-r--r-- | mc/.md5sum | 3 | ||||
-rw-r--r-- | mc/Pkgfile | 9 | ||||
-rw-r--r-- | mc/mcedit.diff | 26 |
3 files changed, 4 insertions, 34 deletions
diff --git a/mc/.md5sum b/mc/.md5sum index b7ccdec02..cfe813003 100644 --- a/mc/.md5sum +++ b/mc/.md5sum @@ -1,2 +1 @@ -f1e282124ee27fda4785364d47918fb2 mc-4.8.5.tar.xz -b7b2c35371a6c963fe2e59f9b71d3161 mcedit.diff +9e50fac70c472dfa108e07152f88bdae mc-4.8.6.tar.xz diff --git a/mc/Pkgfile b/mc/Pkgfile index a1114d911..da0777f58 100644 --- a/mc/Pkgfile +++ b/mc/Pkgfile @@ -4,16 +4,13 @@ # Depends on: ncurses glib name=mc -version=4.8.5 -release=2 -source=(http://www.midnight-commander.org/downloads/$name-$version.tar.xz - mcedit.diff) +version=4.8.6 +release=1 +source=(http://www.midnight-commander.org/downloads/$name-$version.tar.xz) build () { cd $name-$version - patch -p0 -i $SRC/mcedit.diff - ./configure --prefix=/usr \ --mandir=/usr/man \ --libexecdir=/usr/lib \ diff --git a/mc/mcedit.diff b/mc/mcedit.diff deleted file mode 100644 index ea8925f59..000000000 --- a/mc/mcedit.diff +++ /dev/null @@ -1,26 +0,0 @@ -# https://www.midnight-commander.org/changeset/28cd54da5a73e6d722bd0534e3f43baedb398cea#file0 - -Index: src/editor/edit.c
-===================================================================
---- src/editor/edit.c (revision b4a10d82cc50bd55f91d98b31497df7021e731f3)
-+++ src/editor/edit.c (revision 28cd54da5a73e6d722bd0534e3f43baedb398cea)
-@@ -3074,14 +3074,13 @@
- #endif
-
-+ if (c == '\n')
-+ return (upto != 0 ? (off_t) col : p);
- if (c == '\t')
- col += TAB_SIZE - col % TAB_SIZE;
-- else if (c == '\n')
-- return (upto != 0 ? (off_t) col : p);
--
-- if ((c < 32 || c == 127) && (orig_c == c
-+ else if ((c < 32 || c == 127) && (orig_c == c
- #ifdef HAVE_CHARSET
-- || (!mc_global.utf8_display && !edit->utf8)
-+ || (!mc_global.utf8_display && !edit->utf8)
- #endif
-- ))
-+ ))
- /* '\r' is shown as ^M, so we must advance 2 characters */
- /* Caret notation for control characters */
|