diff options
| author |   Max Krummenacher <max.oss.09@gmail.com> | 2019-07-01 15:29:11 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-07-10 09:24:32 -0700 |
| commit | c7dd039484c1449a375ac947d2b155d1f7530943 (patch) | |
| tree | 271a9cd2001b43357a394030d2051912bfd25447 /meta-oe/recipes-support/joe | |
| parent | f51548eff62492bbaf69fe522bea928f7459a217 (diff) | |
| download | meta-openembedded-c7dd039484c1449a375ac947d2b155d1f7530943.tar.gz | |
joe: update to 4.6
The licence changed to GPLv2.
The fix from 0001-adjust-signature-of-main.patch is applied upstream.
joe 3.1 segfaults on aarch64, the update fixes this.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/joe')
| -rw-r--r-- | meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-support/joe/joe_3.1.bb | 17 | ||||
| -rw-r--r-- | meta-oe/recipes-support/joe/joe_4.6.bb | 15 |
3 files changed, 15 insertions, 47 deletions
diff --git a/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch b/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch deleted file mode 100644 index 00f48e8a29..0000000000 --- a/meta-oe/recipes-support/joe/joe/0001-adjust-signature-of-main.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 27e4639254f2b2eb7d04790bd8cf16ecfcbac1c2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 19 Oct 2016 01:07:16 +0000 -Subject: [PATCH] adjust signature of main() - -clang complains about the types of main() function - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main.c b/main.c -index 81ba543..ee7506c 100644 ---- a/main.c -+++ b/main.c -@@ -159,7 +159,7 @@ extern int breakflg; - - unsigned char **mainenv; - --int main(int argc, unsigned char **argv, unsigned char **envv) -+int main(int argc, char **argv, char **envv) - { - CAP *cap; - unsigned char *s; --- -1.9.1 - diff --git a/meta-oe/recipes-support/joe/joe_3.1.bb b/meta-oe/recipes-support/joe/joe_3.1.bb deleted file mode 100644 index 1ad355b5ae..0000000000 --- a/meta-oe/recipes-support/joe/joe_3.1.bb +++ /dev/null @@ -1,17 +0,0 @@ -SECTION = "console/utils" -SUMMARY = "Console text editor with good functionality, good choice for vi-haters" -HOMEPAGE = "http://joe-editor.sourceforge.net/" -LICENSE = "GPLv1" -LIC_FILES_CHKSUM = "file://COPYING;md5=da10ed7cf8038981c580e11c1d3e8fb6" - -SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz \ - file://0001-adjust-signature-of-main.patch \ - " - -PACKAGECONFIG ??= "curses" -PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" - -inherit autotools - -SRC_URI[md5sum] = "2a6ef018870fca9b7df85401994fb0e0" -SRC_URI[sha256sum] = "252390e4bc687957f09f334095904c8cc53b39c7b663ed47861ae1d11aef5946" diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb new file mode 100644 index 0000000000..b79e028f30 --- /dev/null +++ b/meta-oe/recipes-support/joe/joe_4.6.bb @@ -0,0 +1,15 @@ +SECTION = "console/utils" +SUMMARY = "Console text editor with good functionality, good choice for vi-haters" +HOMEPAGE = "http://joe-editor.sourceforge.net/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz" + +PACKAGECONFIG ??= "curses" +PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-terminfo" + +inherit autotools-brokensep + +SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43" +SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de" |