[oe] [meta-oe][PATCH] nano: upgrade to 2.7.4

Martin Jansa martin.jansa at gmail.com
Wed Jan 25 14:54:22 UTC 2017


On Wed, Jan 11, 2017 at 12:36:28PM +0100, Oleksandr Kravchuk wrote:
> Signed-off-by: Oleksandr Kravchuk <oleksandr.kravchuk at pelagicore.com>

nano-2.7.4: nano rdepends on file, but it isn't a build dependency,
missing file in DEPENDS or PACKAGECONFIG? [build-deps]

> ---
>  .../nano/nano-2.2.5/ncursesw.includedir.patch                | 12 ------------
>  meta-oe/recipes-support/nano/nano.inc                        |  6 +++---
>  meta-oe/recipes-support/nano/nano_2.2.5.bb                   |  8 --------
>  meta-oe/recipes-support/nano/nano_2.7.4.bb                   |  6 ++++++
>  4 files changed, 9 insertions(+), 23 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/nano/nano-2.2.5/ncursesw.includedir.patch
>  delete mode 100644 meta-oe/recipes-support/nano/nano_2.2.5.bb
>  create mode 100644 meta-oe/recipes-support/nano/nano_2.7.4.bb
> 
> 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 0f224be..0000000
> --- 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 0f31c6c..8a9f1e8 100644
> --- a/meta-oe/recipes-support/nano/nano.inc
> +++ b/meta-oe/recipes-support/nano/nano.inc
> @@ -12,8 +12,8 @@ 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 e656f46..0000000
> --- 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 0000000..5016f2e
> --- /dev/null
> +++ b/meta-oe/recipes-support/nano/nano_2.7.4.bb
> @@ -0,0 +1,6 @@
> +include nano.inc
> +
> +PR = "${INC_PR}.0"
> +
> +SRC_URI[md5sum] = "c011c7f9e47cb1da27d4e7cc8b56ec6a"
> +SRC_URI[sha256sum] = "752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9"
> -- 
> 2.7.4
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20170125/e8a018fa/attachment-0002.sig>


More information about the Openembedded-devel mailing list