diff --git a/lua-lua-ev.changes b/lua-lua-ev.changes index 9bb300f..2417037 100644 --- a/lua-lua-ev.changes +++ b/lua-lua-ev.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 9 14:17:16 UTC 2020 - Matej Cepl + +- Add lua54.patch to make package building with Lua 5.4 + (gh#brimworks/lua-ev#24). + ------------------------------------------------------------------- Mon Jul 6 19:05:03 UTC 2020 - Matej Cepl diff --git a/lua-lua-ev.spec b/lua-lua-ev.spec index 398d6a0..a5e365a 100644 --- a/lua-lua-ev.spec +++ b/lua-lua-ev.spec @@ -30,6 +30,9 @@ License: MIT Group: Development/Languages/Other URL: https://github.com/brimworks/lua-ev Source: https://github.com/brimworks/%{mod_name}/archive/v%{upversion}.tar.gz#/%{mod_name}-%{upversion}.tar.gz +# PATCH-FIX-UPSTREAM lua54.patch gh#brimworks/lua-ev#24 mcepl@suse.com +# Resolve FTBFS with Lua 5.4. +Patch0: lua54.patch BuildRequires: %{flavor}-devel BuildRequires: cmake BuildRequires: libev-devel @@ -74,6 +77,7 @@ project. %prep %setup -q -n %{mod_name}-%{upversion} +%autopatch -p1 # Remove bundled dependencies rm -rf deps diff --git a/lua54.patch b/lua54.patch new file mode 100644 index 0000000..7fed174 --- /dev/null +++ b/lua54.patch @@ -0,0 +1,20 @@ +--- a/cmake/Modules/FindLua5X.cmake ++++ b/cmake/Modules/FindLua5X.cmake +@@ -2,7 +2,7 @@ + find_path(LUA_INCLUDE_DIR lua.h + HINTS + $ENV{LUA_DIR} +- PATH_SUFFIXES include include/lua include/lua53 include/lua5.3 include/lua52 include/lua5.2 include/lua51 include/lua5.1 ++ PATH_SUFFIXES include include/lua include/lua54 include/lua5.4 include/lua53 include/lua5.3 include/lua52 include/lua5.2 include/lua51 include/lua5.1 + PATHS + ~/Library/Frameworks + /Library/Frameworks +@@ -15,7 +15,7 @@ find_path(LUA_INCLUDE_DIR lua.h + ) + + find_library(LUA_LIBRARY +- NAMES lua lua53 lua5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 luajit-5.1 luajit51 luajit5.1 ++ NAMES lua lua54 lua5.4 lua53 lua5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 luajit-5.1 luajit51 luajit5.1 + HINTS + $ENV{LUA_DIR} + PATH_SUFFIXES lib64 lib