diff options
| -rw-r--r-- | patches/nano-1.3.12/0001-Fix-building-with-ncurses-5.9.patch | 35 | ||||
| -rw-r--r-- | patches/nano-1.3.12/series | 3 | ||||
| -rw-r--r-- | rules/nano.make | 32 |
3 files changed, 25 insertions, 45 deletions
diff --git a/patches/nano-1.3.12/0001-Fix-building-with-ncurses-5.9.patch b/patches/nano-1.3.12/0001-Fix-building-with-ncurses-5.9.patch deleted file mode 100644 index 44328f650..000000000 --- a/patches/nano-1.3.12/0001-Fix-building-with-ncurses-5.9.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Wed, 22 Jun 2011 14:35:50 +0200 -Subject: [PATCH] Fix building with ncurses-5.9 - -It fails with: -nano.c: In function 'handle_sigwinch': -nano.c:1085:5: error: lvalue required as left operand of assignment -nano.c:1086:5: error: lvalue required as left operand of assignment - -There is an upstream bugreport with a proposed fix[1], similar to this -one. As of today, there is no new release. - -[1] http://lists.gnu.org/archive/html/help-nano/2010-02/msg00005.html - -Bug: http://savannah.gnu.org/bugs/?28984 -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> ---- - src/nano.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/nano.c b/src/nano.c -index 6c78770..3a990d2 100644 ---- a/src/nano.c -+++ b/src/nano.c -@@ -1082,8 +1082,10 @@ RETSIGTYPE handle_sigwinch(int signal) - * otherwise. However, COLS and LINES are curses global variables, - * and in some cases curses has already updated them. But not in - * all cases. Argh. */ -+/* - COLS = win.ws_col; - LINES = win.ws_row; -+*/ - - /* If we've partitioned the filestruct, unpartition it now. */ - if (filepart != NULL) diff --git a/patches/nano-1.3.12/series b/patches/nano-1.3.12/series deleted file mode 100644 index 210526952..000000000 --- a/patches/nano-1.3.12/series +++ /dev/null @@ -1,3 +0,0 @@ -# generated by git-ptx-patches -0001-Fix-building-with-ncurses-5.9.patch -# 3f4265f062fdfd9c97f495cfd5075fde - git-ptx-patches magic diff --git a/rules/nano.make b/rules/nano.make index 2106612fc..4dc25519d 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NANO) += nano # # Paths and names # -NANO_VERSION := 1.3.12 -NANO_MD5 := 1450892aac7ae31d00817d42636d9a0d +NANO_VERSION := 2.3.1 +NANO_MD5 := af09f8828744b0ea0808d6c19a2b4bfd NANO := nano-$(NANO_VERSION) NANO_SUFFIX := tar.gz -NANO_URL := http://www.nano-editor.org/dist/v1.3/$(NANO).$(NANO_SUFFIX) +NANO_URL := http://www.nano-editor.org/dist/v2.3/$(NANO).$(NANO_SUFFIX) NANO_SOURCE := $(SRCDIR)/$(NANO).$(NANO_SUFFIX) NANO_DIR := $(BUILDDIR)/$(NANO) @@ -29,13 +29,31 @@ NANO_DIR := $(BUILDDIR)/$(NANO) # Prepare # ---------------------------------------------------------------------------- -NANO_PATH := PATH=$(CROSS_PATH) -NANO_ENV := $(CROSS_ENV) - # # autoconf # -NANO_AUTOCONF := $(CROSS_AUTOCONF_USR) +NAN_CONF_TOOL := autoconf +NANO_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --disable-rpath \ + --disable-nls \ + --disable-debug \ + --disable-tiny \ + --disable-extra \ + --disable-browser \ + --disable-help \ + --enable-justify \ + --disable-mouse \ + --disable-operatingdir \ + --disable-speller \ + --enable-tabcomp \ + --enable-wrapping \ + --enable-color \ + --enable-multibuffer \ + --disable-nanorc \ + --disable-utf8 \ + --disable-glibtest # ---------------------------------------------------------------------------- # Target-Install |