From b5af31b048e3d78343d82bd713946caa5fac6690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Janouch?= <p@janouch.name>
Date: Mon, 25 Jun 2018 00:02:11 +0200
Subject: Fix Lua cross-build, bump the Win32 version

Something has changed and it could no longer find the include files.
---
 CMakeLists.txt     | 13 +------------
 Win32Depends.cmake | 13 ++++++++-----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06af0be..206c93c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,18 +80,7 @@ endif (CONVERT_EXECUTABLE AND NOT WIN32)
 # Dependencies
 find_package (PkgConfig REQUIRED)
 pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0)
-
-if (NOT WIN32)
-	pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2)
-else (NOT WIN32)
-	# XXX: this seems to require CMake 3.0 ... include it in the project?
-	find_package (Lua REQUIRED)
-	if (NOT LUA_FOUND OR LUA_VERSION_STRING VERSION_LESS "5.2")
-		message (FATAL_ERROR "Lua 5.2 not found")
-	endif (NOT LUA_FOUND OR LUA_VERSION_STRING VERSION_LESS "5.2")
-	set (Lua_LIBRARIES ${LUA_LIBRARIES})
-	set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
-endif (NOT WIN32)
+pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2)
 
 # This actually fucks up MinGW cross-compilation if omitted
 link_directories (${GTK3_LIBRARY_DIRS})
diff --git a/Win32Depends.cmake b/Win32Depends.cmake
index 61347da..4a9c320 100644
--- a/Win32Depends.cmake
+++ b/Win32Depends.cmake
@@ -46,13 +46,16 @@ set (pkg_winlibs_root "http://sourceforge.net/projects/winlibs/files")
 set (pkg_winlibs_urls "${pkg_winlibs_root}/GTK+/libjson-glib-1.0-1-mingw32.7z")
 set (pkg_winlibs_md5 "f06e42c5998dae5fb6245fecc96a403e")
 
-set (pkg_mingw_lua_root "http://sourceforge.net/projects/mingw/files/MinGW/Extension")
+set (pkg_mingw_lua_root "http://repo.msys2.org/mingw/i686")
 set (pkg_mingw_lua_urls
-	"${pkg_mingw_lua_root}/lua/lua-5.2.0-1/lua-5.2.0-1-mingw32-dll-52.tar.xz"
-	"${pkg_mingw_lua_root}/lua/lua-5.2.0-1/lua-5.2.0-1-mingw32-dev.tar.xz")
+	"${pkg_mingw_lua_root}/mingw-w64-i686-lua-5.3.4-1-any.pkg.tar.xz"
+	"${pkg_mingw_lua_root}/mingw-w64-i686-gcc-libs-7.3.0-2-any.pkg.tar.xz"
+	"${pkg_mingw_lua_root}/mingw-w64-i686-libwinpthread-git-6.0.0.5134.2416de71-1-any.pkg.tar.xz")
+set (pkg_mingw_lua_strip "mingw32")
 set (pkg_mingw_lua_md5
-	"150b27cab05b78ba40bbd7225630c00d"
-	"6abe77c1e1a783075fe73c53b7c235fb")
+	"b75af38372cddde0b0ff997cf4fdb038"
+	"9507a011e7ab3c7fadf01b24590b8713"
+	"ecf4d62961c5f4b33841a4d22a0eda80")
 
 # Stage 1: fetch missing packages
 foreach (pkg_set ${pkg_list})
-- 
cgit v1.2.3