Message ID | 1448912908-6459-1-git-send-email-francois.perrad@gadz.org |
---|---|
State | Superseded |
Headers | show |
François, On Mon, 30 Nov 2015 20:48:28 +0100, Francois Perrad wrote: > Signed-off-by: Francois Perrad <francois.perrad@gadz.org> > --- > package/lua/{5.3.1 => 5.3.2}/0001-root-path.patch | 0 > package/lua/{5.3.1 => 5.3.2}/0002-shared-libs-for-lua.patch | 0 > package/lua/{5.3.1 => 5.3.2}/0004-lua-pc.patch | 2 +- > package/lua/{5.3.1 => 5.3.2}/0011-linenoise.patch | 6 ++---- > package/lua/lua.hash | 4 ++-- > package/lua/lua.mk | 2 +- > 6 files changed, 7 insertions(+), 9 deletions(-) > rename package/lua/{5.3.1 => 5.3.2}/0001-root-path.patch (100%) > rename package/lua/{5.3.1 => 5.3.2}/0002-shared-libs-for-lua.patch (100%) > rename package/lua/{5.3.1 => 5.3.2}/0004-lua-pc.patch (97%) > rename package/lua/{5.3.1 => 5.3.2}/0011-linenoise.patch (78%) I didn't look at the details, but this patch doesn't apply here (on either next or master) : thomas@skate:~/projets/buildroot (next)$ git pwam 550316 Applying patch #550316 using 'git am -s -3' Description: lua: bump to version 5.3.2 Applying: lua: bump to version 5.3.2 Using index info to reconstruct a base tree... error: patch failed: package/lua/5.3.1/0011-linenoise.patch:8 error: package/lua/5.3.1/0011-linenoise.patch: patch does not apply error: Did you hand edit your patch? It does not apply to blobs recorded in its index. Patch failed at 0001 lua: bump to version 5.3.2 The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Thomas
diff --git a/package/lua/5.3.1/0001-root-path.patch b/package/lua/5.3.2/0001-root-path.patch similarity index 100% rename from package/lua/5.3.1/0001-root-path.patch rename to package/lua/5.3.2/0001-root-path.patch diff --git a/package/lua/5.3.1/0002-shared-libs-for-lua.patch b/package/lua/5.3.2/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.3.1/0002-shared-libs-for-lua.patch rename to package/lua/5.3.2/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.3.1/0004-lua-pc.patch b/package/lua/5.3.2/0004-lua-pc.patch similarity index 97% rename from package/lua/5.3.1/0004-lua-pc.patch rename to package/lua/5.3.2/0004-lua-pc.patch index d3129d7..8d6cf0e 100644 --- a/package/lua/5.3.1/0004-lua-pc.patch +++ b/package/lua/5.3.2/0004-lua-pc.patch @@ -14,7 +14,7 @@ Index: b/etc/lua.pc +# grep '^V=' ../Makefile +V= 5.3 +# grep '^R=' ../Makefile -+R= 5.3.0 ++R= 5.3.2 + +# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' +prefix= /usr diff --git a/package/lua/5.3.1/0011-linenoise.patch b/package/lua/5.3.2/0011-linenoise.patch similarity index 78% rename from package/lua/5.3.1/0011-linenoise.patch rename to package/lua/5.3.2/0011-linenoise.patch index ccdd3fd..f3ced2b 100644 --- a/package/lua/5.3.1/0011-linenoise.patch +++ b/package/lua/5.3.2/0011-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -83,6 +83,15 @@ +@@ -83,6 +83,13 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) @@ -16,9 +16,7 @@ Index: b/src/lua.c + +#include <linenoise.h> +#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL) -+#define lua_saveline(L,idx) \ -+ if (lua_rawlen(L,idx) > 0) /* non-empty line? */ \ -+ linenoiseHistoryAdd(lua_tostring(L, idx)); /* add it to history */ ++#define lua_saveline(L,line) ((void)L, linenoiseHistoryAdd(line)) +#define lua_freeline(L,b) ((void)L, free(b)) + #else /* }{ */ diff --git a/package/lua/lua.hash b/package/lua/lua.hash index f0fa87d..8f0242e 100644 --- a/package/lua/lua.hash +++ b/package/lua/lua.hash @@ -1,6 +1,6 @@ # Hashes from: http://www.lua.org/ftp/ -md5 797adacada8d85761c079390ff1d9961 lua-5.3.1.tar.gz -sha1 1676c6a041d90b6982db8cef1e5fb26000ab6dee lua-5.3.1.tar.gz +md5 33278c2ab5ee3c1a875be8d55c1ca2a1 lua-5.3.2.tar.gz +sha1 7a47adef554fdca7d0c5536148de34579134a973 lua-5.3.2.tar.gz md5 913fdb32207046b273fdb17aad70be13 lua-5.2.4.tar.gz sha1 ef15259421197e3d85b7d6e4871b8c26fd82c1cf lua-5.2.4.tar.gz diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 1279b76..37992f2 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUA_VERSION = 5.3.1 +LUA_VERSION = 5.3.2 else ifeq ($(BR2_PACKAGE_LUA_5_2),y) LUA_VERSION = 5.2.4
Signed-off-by: Francois Perrad <francois.perrad@gadz.org> --- package/lua/{5.3.1 => 5.3.2}/0001-root-path.patch | 0 package/lua/{5.3.1 => 5.3.2}/0002-shared-libs-for-lua.patch | 0 package/lua/{5.3.1 => 5.3.2}/0004-lua-pc.patch | 2 +- package/lua/{5.3.1 => 5.3.2}/0011-linenoise.patch | 6 ++---- package/lua/lua.hash | 4 ++-- package/lua/lua.mk | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) rename package/lua/{5.3.1 => 5.3.2}/0001-root-path.patch (100%) rename package/lua/{5.3.1 => 5.3.2}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.3.1 => 5.3.2}/0004-lua-pc.patch (97%) rename package/lua/{5.3.1 => 5.3.2}/0011-linenoise.patch (78%) -- 2.5.0