Skip to contentSkip to conversation

lua: rename patches to the new convention

PATCH New Francois Perrad 2 participants 8 messages Dec 24, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/7 lua: rename patches to the new convention

---
 package/lua/5.1.5/{lua-01-root-path.patch => 0001-root-path.patch}        | 0
 .../{lua-02-shared-libs-for-lua.patch => 0002-shared-libs-for-lua.patch}  | 0
 package/lua/5.1.5/{lua-11-linenoise.patch => 0011-linenoise.patch}        | 0
 .../{lua-12-fix-reader-at-eoz.patch => 0012-fix-reader-at-eoz.patch}      | 0
 package/lua/5.2.3/{lua-01-root-path.patch => 0001-root-path.patch}        | 0
 .../{lua-02-shared-libs-for-lua.patch => 0002-shared-libs-for-lua.patch}  | 0
 package/lua/5.2.3/{lua-04-lua-pc.patch => 0004-lua-pc.patch}              | 0
 package/lua/5.2.3/{lua-11-linenoise.patch => 0011-linenoise.patch}        | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename package/lua/5.1.5/{lua-01-root-path.patch => 0001-root-path.patch} (100%)
 rename package/lua/5.1.5/{lua-02-shared-libs-for-lua.patch => 0002-shared-libs-for-lua.patch} (100%)
 rename package/lua/5.1.5/{lua-11-linenoise.patch => 0011-linenoise.patch} (100%)
 rename package/lua/5.1.5/{lua-12-fix-reader-at-eoz.patch => 0012-fix-reader-at-eoz.patch} (100%)
 rename package/lua/5.2.3/{lua-01-root-path.patch => 0001-root-path.patch} (100%)
 rename package/lua/5.2.3/{lua-02-shared-libs-for-lua.patch => 0002-shared-libs-for-lua.patch} (100%)
 rename package/lua/5.2.3/{lua-04-lua-pc.patch => 0004-lua-pc.patch} (100%)
 rename package/lua/5.2.3/{lua-11-linenoise.patch => 0011-linenoise.patch} (100%)
package/lua/5.1.5/0001-root-path.patch renamed from package/lua/5.1.5/lua-01-root-path.patch +0 -0
similarity index 100%
rename from package/lua/5.1.5/lua-01-root-path.patch
rename to package/lua/5.1.5/0001-root-path.patch
package/lua/5.1.5/0002-shared-libs-for-lua.patch renamed from package/lua/5.1.5/lua-02-shared-libs-for-lua.patch +0 -0
similarity index 100%
rename from package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
rename to package/lua/5.1.5/0002-shared-libs-for-lua.patch
package/lua/5.1.5/0011-linenoise.patch renamed from package/lua/5.1.5/lua-11-linenoise.patch +0 -0
similarity index 100%
rename from package/lua/5.1.5/lua-11-linenoise.patch
rename to package/lua/5.1.5/0011-linenoise.patch
package/lua/5.1.5/0012-fix-reader-at-eoz.patch renamed from package/lua/5.1.5/lua-12-fix-reader-at-eoz.patch +0 -0
similarity index 100%
rename from package/lua/5.1.5/lua-12-fix-reader-at-eoz.patch
rename to package/lua/5.1.5/0012-fix-reader-at-eoz.patch
package/lua/5.2.3/0001-root-path.patch renamed from package/lua/5.2.3/lua-01-root-path.patch +0 -0
similarity index 100%
rename from package/lua/5.2.3/lua-01-root-path.patch
rename to package/lua/5.2.3/0001-root-path.patch
package/lua/5.2.3/0002-shared-libs-for-lua.patch renamed from package/lua/5.2.3/lua-02-shared-libs-for-lua.patch +0 -0
similarity index 100%
rename from package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
rename to package/lua/5.2.3/0002-shared-libs-for-lua.patch
package/lua/5.2.3/0004-lua-pc.patch renamed from package/lua/5.2.3/lua-04-lua-pc.patch +0 -0
similarity index 100%
rename from package/lua/5.2.3/lua-04-lua-pc.patch
rename to package/lua/5.2.3/0004-lua-pc.patch
package/lua/5.2.3/0011-linenoise.patch renamed from package/lua/5.2.3/lua-11-linenoise.patch +0 -0
similarity index 100%
rename from package/lua/5.2.3/lua-11-linenoise.patch
rename to package/lua/5.2.3/0011-linenoise.patch
Signature · 1 line
2.1.0
#1 lore raw

PATCH 2/7 luafilesystem: rename patch to the new convention

---
 ...afilesystem-without_large_file.patch => 0001-without_large_file.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/luafilesystem/{luafilesystem-without_large_file.patch => 0001-without_large_file.patch} (100%)
package/luafilesystem/0001-without_large_file.patch renamed from package/luafilesystem/luafilesystem-without_large_file.patch +0 -0
similarity index 100%
rename from package/luafilesystem/luafilesystem-without_large_file.patch
rename to package/luafilesystem/0001-without_large_file.patch
Signature · 1 line
2.1.0
#2 lore raw

PATCH 3/7 lpeg: bump to version 0.12.1

In reply to Francois Perrad
---
 package/lpeg/lpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lpeg/lpeg.mk +1 -1
index a9759e5..52fb7b7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LPEG_VERSION = 0.12-1
+LPEG_VERSION = 0.12.1-1
 LPEG_LICENSE = MIT
 
 $(eval $(luarocks-package))
Signature · 1 line
2.1.0
#3 lore raw

PATCH 4/7 lua-csnappy: bump to version 0.1.2

In reply to Francois Perrad
---
 package/lua-csnappy/lua-csnappy.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lua-csnappy/lua-csnappy.mk +1 -1
index b956c38..b739abc 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.1
+LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.2
 LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1
 LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
 LUA_CSNAPPY_LICENSE = BSD-3c
Signature · 1 line
2.1.0
#4 lore raw

PATCH 5/7 lua-coat: bump to version 0.9.1

In reply to Francois Perrad
---
 package/lua-coat/lua-coat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lua-coat/lua-coat.mk +1 -1
index e5a09b0..205995e 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_COAT_VERSION_UPSTREAM = 0.9.0
+LUA_COAT_VERSION_UPSTREAM = 0.9.1
 LUA_COAT_VERSION = $(LUA_COAT_VERSION_UPSTREAM)-1
 LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
 LUA_COAT_LICENSE = MIT
Signature · 1 line
2.1.0
#5 lore raw

PATCH 6/7 lua-coatpersistent: bump to version 0.2.1

In reply to Francois Perrad
---
 package/lua-coatpersistent/Config.in             | 4 ++++
 package/lua-coatpersistent/lua-coatpersistent.mk | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
package/lua-coatpersistent/Config.in +4 -0
index 86cddda..a0f5bdc 100644
@@ -3,7 +3,11 @@ config BR2_PACKAGE_LUA_COATPERSISTENT
 	# run-time dependencies
 	select BR2_PACKAGE_DADO
 	select BR2_PACKAGE_LUA_COAT
+	depends on BR2_PACKAGE_LSQLITE3 || BR2_PACKAGE_LUASQL_SQLITE3
 	help
 	  An ORM for lua-Coat.
 
 	  http://fperrad.github.io/lua-CoatPersistent/
+
+comment "lua-coatpersistent needs lsqlite3 or luasql-sqlite3"
+	depends on !BR2_PACKAGE_LSQLITE3 && !BR2_PACKAGE_LUASQL_SQLITE3
package/lua-coatpersistent/lua-coatpersistent.mk +6 -2
index 35035e9..be8a4da 100644
@@ -4,8 +4,12 @@
 #
 ################################################################################
 
-LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.0
-LUA_COATPERSISTENT_VERSION = $(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1
+LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.1
+ifeq ($(BR2_PACKAGE_LSQLITE3),y)
+LUA_COATPERSISTENT_VERSION = lsqlite3-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1
+else
+LUA_COATPERSISTENT_VERSION = luasql-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1
+endif
 LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)
 LUA_COATPERSISTENT_LICENSE = MIT
 LUA_COATPERSISTENT_LICENSE_FILES = $(LUA_COATPERSISTENT_SUBDIR)/COPYRIGHT
Signature · 1 line
2.1.0
#6 lore raw

PATCH 7/7 luaposix: bump to version 33.0.0

In reply to Francois Perrad

ncurses becomes a mandatory dependency

---
 package/luaposix/Config.in   | 1 +
 package/luaposix/luaposix.mk | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)
package/luaposix/Config.in +1 -0
index 04269fb..a40c3f9 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LUAPOSIX
 	bool "luaposix"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
+	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
 	# LuaBitOp is already included in LuaJIT
 	help
package/luaposix/luaposix.mk +2 -6
index a723a50..5d41472 100644
@@ -4,15 +4,11 @@
 #
 ################################################################################
 
-LUAPOSIX_VERSION = 32
+LUAPOSIX_VERSION = 33.0.0
 LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION))
 LUAPOSIX_LICENSE = MIT
 LUAPOSIX_LICENSE_FILES = COPYING
-LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
+LUAPOSIX_DEPENDENCIES = luainterpreter host-lua ncurses
 LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
 
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-LUAPOSIX_DEPENDENCIES += ncurses
-endif
-
 $(eval $(autotools-package))
Signature · 1 line
2.1.0