diff options
| author |   Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com> | 2017-01-26 20:28:16 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-13 18:43:23 +0100 |
| commit | e79566f51dde46145cfdc3732a6e1464ff27f4f3 (patch) | |
| tree | c587bd297ecfda42125d2637a9d9060b643276b6 /meta-oe | |
| parent | d307c4f59deb22cc8dfecb88720b5162f39d895c (diff) | |
| download | meta-openembedded-contrib-e79566f51dde46145cfdc3732a6e1464ff27f4f3.tar.gz | |
nano: upgrade to 2.7.4
Signed-off-by: Oleksandr Kravchuk <oleksandr.kravchuk@pelagicore.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/nano/nano-2.2.5/ncursesw.includedir.patch | 12 | ||||
| -rw-r--r-- | meta-oe/recipes-support/nano/nano.inc | 10 | ||||
| -rw-r--r-- | meta-oe/recipes-support/nano/nano_2.2.5.bb | 8 | ||||
| -rw-r--r-- | meta-oe/recipes-support/nano/nano_2.7.4.bb | 4 |
4 files changed, 8 insertions, 26 deletions
diff --git a/meta-oe/recipes-support/nano/nano-2.2.5/ncursesw.includedir.patch b/meta-oe/recipes-support/nano/nano-2.2.5/ncursesw.includedir.patch deleted file mode 100644 index 0f224be396..0000000000 --- a/meta-oe/recipes-support/nano/nano-2.2.5/ncursesw.includedir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr nano-2.2.5.orig//configure.ac nano-2.2.5/configure.ac ---- nano-2.2.5.orig//configure.ac 2010-08-06 03:00:51.000000000 +0200 -+++ nano-2.2.5/configure.ac 2010-08-10 14:11:52.000000000 +0200 -@@ -442,7 +442,7 @@ - AC_CHECK_HEADERS(ncurses.h) - - if test x$enable_utf8 != xno; then -- AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) -+ AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) - fi - - if eval "test x$CURSES_LIB_NAME = x"; then diff --git a/meta-oe/recipes-support/nano/nano.inc b/meta-oe/recipes-support/nano/nano.inc index 0f31c6c165..8a1d71f642 100644 --- a/meta-oe/recipes-support/nano/nano.inc +++ b/meta-oe/recipes-support/nano/nano.inc @@ -5,15 +5,13 @@ HOMEPAGE = "http://www.nano-editor.org/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" SECTION = "console/utils" -DEPENDS = "ncurses" +DEPENDS = "ncurses file" RDEPENDS_${PN} = "ncurses-terminfo" -INC_PR = "r3" - PV_MAJOR = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" -SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.gz" +SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -inherit autotools gettext +inherit autotools gettext pkgconfig -PACKAGECONFIG[tiny] = "--enable-tiny,--enable-all," +PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-oe/recipes-support/nano/nano_2.2.5.bb b/meta-oe/recipes-support/nano/nano_2.2.5.bb deleted file mode 100644 index e656f46dfa..0000000000 --- a/meta-oe/recipes-support/nano/nano_2.2.5.bb +++ /dev/null @@ -1,8 +0,0 @@ -include nano.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://ncursesw.includedir.patch" - -SRC_URI[md5sum] = "77a10a49589f975ce98350a4527a2ebf" -SRC_URI[sha256sum] = "9015945d1badabbada203b37c4779d3dd1066234235c714deb439989c5cd7d9e" diff --git a/meta-oe/recipes-support/nano/nano_2.7.4.bb b/meta-oe/recipes-support/nano/nano_2.7.4.bb new file mode 100644 index 0000000000..eaf393e180 --- /dev/null +++ b/meta-oe/recipes-support/nano/nano_2.7.4.bb @@ -0,0 +1,4 @@ +include nano.inc + +SRC_URI[md5sum] = "c011c7f9e47cb1da27d4e7cc8b56ec6a" +SRC_URI[sha256sum] = "752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9" |