From 74efd581ab68ac9491bd4c3bf856095aa2010b64a6ba35590ab6f44cbeac2f08 Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Fri, 10 Jul 2020 13:01:28 +0000 Subject: [PATCH] Accepting request 819696 from home:mcepl:branches:devel:tools:building - Add lua54.patch which adds 5.4 among allowed versions of Lua interpreter. (https://gitlab.kitware.com/cmake/cmake/-/issues/20933) OBS-URL: https://build.opensuse.org/request/show/819696 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=418 --- cmake.changes | 7 +++++++ cmake.spec | 3 +++ lua54.patch | 11 +++++++++++ 3 files changed, 21 insertions(+) create mode 100644 lua54.patch diff --git a/cmake.changes b/cmake.changes index ce4536e..957738b 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 8 20:06:07 UTC 2020 - Matej Cepl + +- Add lua54.patch which adds 5.4 among allowed versions of + Lua interpreter. + (https://gitlab.kitware.com/cmake/cmake/-/issues/20933) + ------------------------------------------------------------------- Fri Jun 19 08:08:08 UTC 2020 - olaf@aepfle.de diff --git a/cmake.spec b/cmake.spec index 9a618ca..00560da 100644 --- a/cmake.spec +++ b/cmake.spec @@ -55,6 +55,9 @@ Patch0: cmake-fix-ruby-test.patch # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch Patch2: cmake-fix-png-include-dir.patch +# PATCH-FIX-UPSTREAM lua54.patch https://gitlab.kitware.com/cmake/cmake/-/issues/20933 mcepl@suse.com +# Add Lua 5.4 among allowed versions of the Lua interpreter. +Patch3: lua54.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig diff --git a/lua54.patch b/lua54.patch new file mode 100644 index 0000000..a6d50a1 --- /dev/null +++ b/lua54.patch @@ -0,0 +1,11 @@ +--- a/Modules/FindLua.cmake ++++ b/Modules/FindLua.cmake +@@ -48,7 +48,7 @@ unset(_lua_append_versions) + + # this is a function only to have all the variables inside go away automatically + function(_lua_get_versions) +- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0) ++ set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0) + + if (Lua_FIND_VERSION_EXACT) + if (Lua_FIND_VERSION_COUNT GREATER 1)