Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/nano/files/, app-editors/nano/
Date: Thu, 29 Dec 2016 18:47:34
Message-Id: 1483037234.9aad551a8ad2a1f1a1328df225fca8df7e9930f9.vapier@gentoo
1 commit: 9aad551a8ad2a1f1a1328df225fca8df7e9930f9
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 29 18:44:53 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 29 18:47:14 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aad551a
7
8 app-editors/nano: add upstream fix for USE=minimal builds #604000
9
10 app-editors/nano/files/nano-2.7.3-tiny.patch | 29 ++++++++++++++++++++++++++++
11 app-editors/nano/nano-2.7.3.ebuild | 1 +
12 2 files changed, 30 insertions(+)
13
14 diff --git a/app-editors/nano/files/nano-2.7.3-tiny.patch b/app-editors/nano/files/nano-2.7.3-tiny.patch
15 new file mode 100644
16 index 00000000..148716d
17 --- /dev/null
18 +++ b/app-editors/nano/files/nano-2.7.3-tiny.patch
19 @@ -0,0 +1,29 @@
20 +From fc89ac11d25a5d052a63c01006c1fd767d9f5879 Mon Sep 17 00:00:00 2001
21 +From: Felix Janda <felix.janda@××××××.de>
22 +Date: Thu, 29 Dec 2016 13:43:06 -0500
23 +Subject: [PATCH] speller: fix build when tiny build is enabled
24 +
25 +URL: https://bugs.gentoo.org/604000
26 +---
27 + src/text.c | 2 ++
28 + 1 file changed, 2 insertions(+)
29 +
30 +diff --git a/src/text.c b/src/text.c
31 +index bd1737687e65..a8b34f2f6bba 100644
32 +--- a/src/text.c
33 ++++ b/src/text.c
34 +@@ -3079,9 +3079,11 @@ const char *do_alt_speller(char *tempfile_name)
35 + stat(tempfile_name, &spellfileinfo);
36 + if (spellfileinfo.st_mtime != timestamp) {
37 + set_modified();
38 ++#ifndef NANO_TINY
39 + /* Flush the undo stack, to avoid making a mess when the user
40 + * tries to undo things in spell-corrected lines. */
41 + discard_until(NULL, openfile);
42 ++#endif
43 + }
44 + #ifndef NANO_TINY
45 + /* Unblock SIGWINCHes again. */
46 +--
47 +2.11.0
48 +
49
50 diff --git a/app-editors/nano/nano-2.7.3.ebuild b/app-editors/nano/nano-2.7.3.ebuild
51 index ea75851b..26259bc 100644
52 --- a/app-editors/nano/nano-2.7.3.ebuild
53 +++ b/app-editors/nano/nano-2.7.3.ebuild
54 @@ -35,6 +35,7 @@ src_prepare() {
55 if [[ ${PV} == "9999" ]] ; then
56 eautoreconf
57 fi
58 + epatch "${FILESDIR}"/${P}-tiny.patch #604000
59 epatch_user
60 }