deps: Upgrade LuaRocks and remove patch

third-party/CMakeLists.txt

@@ -127,8 +127,8 @@ set(LUA_URL https://www.lua.org/ftp/lua-5.1.5.tar.gz)
 set(LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333)
 
 # NOTE: Version must match LUAROCKS_VERSION in third-party/cmake/BuildLuarocks.cmake
-set(LUAROCKS_URL https://github.com/luarocks/luarocks/archive/v2.4.3.tar.gz)
-set(LUAROCKS_SHA256 ea1881d6954f2a98c34f93674571c8f0cbdbc28dedb3fa3cb56b6a91886d1a99)
+set(LUAROCKS_URL https://github.com/luarocks/luarocks/archive/v2.4.4.tar.gz)
+set(LUAROCKS_SHA256 9eb3d0738fd02ad8bf39bcedccac4e83e9b5fff2bcca247c3584b925b2075d9c)
 
 set(UNIBILIUM_URL https://github.com/mauke/unibilium/archive/v2.0.0.tar.gz)
 set(UNIBILIUM_SHA256 78997d38d4c8177c60d3d0c1aa8c53fd0806eb21825b7b335b1768d7116bc1c1)

third-party/cmake/BuildLuarocks.cmake

@@ -12,7 +12,7 @@ function(BuildLuarocks)
   cmake_parse_arguments(_luarocks
     ""
     ""
-    "PATCH_COMMAND;CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
+    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
     ${ARGN})
 
   if(NOT _luarocks_CONFIGURE_COMMAND AND NOT _luarocks_BUILD_COMMAND
@@ -32,7 +32,6 @@ function(BuildLuarocks)
       -DTARGET=luarocks
       -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
-    PATCH_COMMAND "${_luarocks_PATCH_COMMAND}"
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND "${_luarocks_CONFIGURE_COMMAND}"
     BUILD_COMMAND "${_luarocks_BUILD_COMMAND}"
@@ -51,11 +50,6 @@ if(NOT MSVC)
   # version already knows, and passing them here breaks the build
   set(LUAROCKS_BUILDARGS CC=${HOSTDEPS_C_COMPILER} LD=${HOSTDEPS_C_COMPILER})
 endif()
-if(WIN32)
-  # Use our bundled curl.exe for downloading packages
-  set(LUAROCKS_BUILDARGS ${LUAROCKS_BUILDARGS} CURL=${DEPS_BIN_DIR}/curl.exe)
-endif()
-
 
 if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING))
 
@@ -82,12 +76,7 @@ elseif(MSVC OR MINGW)
   endif()
 
   # Ignore USE_BUNDLED_LUAJIT - always ON for native Win32
-  BuildLuarocks(
-    PATCH_COMMAND
-      ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/luarocks init
-      COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/luarocks apply --ignore-whitespace
-        ${CMAKE_CURRENT_SOURCE_DIR}/patches/luarocks-Change-default-downloader-to-curl.patch
-    INSTALL_COMMAND install.bat /FORCECONFIG /NOREG /NOADMIN /Q /F
+  BuildLuarocks(INSTALL_COMMAND install.bat /FORCECONFIG /NOREG /NOADMIN /Q /F
     /LUA ${DEPS_INSTALL_DIR}
     /LIB ${DEPS_LIB_DIR}
     /BIN ${DEPS_BIN_DIR}
@@ -99,8 +88,6 @@ elseif(MSVC OR MINGW)
     /LUAMOD ${DEPS_BIN_DIR}/lua)
 
   set(LUAROCKS_BINARY ${DEPS_INSTALL_DIR}/${LUAROCKS_VERSION}/luarocks.bat)
-  add_dependencies(luarocks wintools)
-
 else()
   message(FATAL_ERROR "Trying to build luarocks in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()

third-party/patches/luarocks-Change-default-downloader-to-curl.patch

@@ -1,24 +0,0 @@
-From 69313032fad04743c96bc8f2a029b691857488f9 Mon Sep 17 00:00:00 2001
-Date: Thu, 1 Mar 2018 21:41:29 -0600
-Subject: [PATCH] Change default downloader to curl
-
----
- install.bat | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/install.bat b/install.bat
-index 09cf9aa..76e4059 100644
---- a/install.bat
-+++ b/install.bat
-@@ -1037,7 +1037,7 @@ f:write(S[=[
- site_config.LUAROCKS_UNAME_M=[[$UNAME_M]]
- site_config.LUAROCKS_ROCKS_TREE=[[$TREE_ROOT]]
- site_config.LUAROCKS_PREFIX=[[$PREFIX]]
--site_config.LUAROCKS_DOWNLOADER=[[wget]]
-+site_config.LUAROCKS_DOWNLOADER=[[curl]]
- site_config.LUAROCKS_MD5CHECKER=[[md5sum]]
- ]=])
- if FORCE_CONFIG then
--- 
-2.16.1.windows.4
-