forked from pool/lua-lgi
Accepting request 819733 from devel:languages:lua
OBS-URL: https://build.opensuse.org/request/show/819733 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lua-lgi?expand=0&rev=8
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
<multibuild>
|
<multibuild>
|
||||||
<package>lua51</package>
|
<package>lua51</package>
|
||||||
<package>lua53</package>
|
<package>lua53</package>
|
||||||
|
<package>lua54</package>
|
||||||
</multibuild>
|
</multibuild>
|
||||||
|
@@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 9 13:23:34 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
|
||||||
|
|
||||||
|
- Added lua54.patch to fix building with Lua 5.4
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 6 19:04:01 UTC 2020 - Matej Cepl <mcepl@suse.com>
|
||||||
|
|
||||||
|
- Add lua54 as new build target
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 4 12:06:12 UTC 2018 - sor.alexei@meowr.ru
|
Wed Apr 4 12:06:12 UTC 2018 - sor.alexei@meowr.ru
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package lua-lgi
|
# spec file for package lua-lgi
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2020 SUSE LLC
|
||||||
# Copyright (c) 2012 Adam Mizerski <adam@mizerski.pl>
|
# Copyright (c) 2012 Adam Mizerski <adam@mizerski.pl>
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
# published by the Open Source Initiative.
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
@@ -26,6 +26,7 @@ License: MIT
|
|||||||
Group: Development/Languages/Other
|
Group: Development/Languages/Other
|
||||||
URL: https://github.com/pavouk/lgi
|
URL: https://github.com/pavouk/lgi
|
||||||
Source0: https://github.com/pavouk/%{mod_name}/archive/%{version}.tar.gz#/%{mod_name}-%{version}.tar.gz
|
Source0: https://github.com/pavouk/%{mod_name}/archive/%{version}.tar.gz#/%{mod_name}-%{version}.tar.gz
|
||||||
|
Patch: lua54.patch
|
||||||
BuildRequires: %{flavor}-devel
|
BuildRequires: %{flavor}-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(gmodule-2.0)
|
BuildRequires: pkgconfig(gmodule-2.0)
|
||||||
@@ -58,7 +59,7 @@ using gobject-introspection. Allows using GObject-based libraries
|
|||||||
directly from Lua.
|
directly from Lua.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{mod_name}-%{version}
|
%autosetup -n %{mod_name}-%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make %{?_smp_mflags} V=1 \
|
make %{?_smp_mflags} V=1 \
|
||||||
|
16
lua54.patch
Normal file
16
lua54.patch
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
diff --git a/lgi/callable.c b/lgi/callable.c
|
||||||
|
index e96d3af..3234b64 100644
|
||||||
|
--- a/lgi/callable.c
|
||||||
|
+++ b/lgi/callable.c
|
||||||
|
@@ -1355,7 +1355,10 @@ closure_callback (ffi_cif *cif, void *ret, void **args, void *closure_arg)
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
-#if LUA_VERSION_NUM >= 502
|
||||||
|
+#if LUA_VERSION_NUM >= 504
|
||||||
|
+ int nresults;
|
||||||
|
+ res = lua_resume (L, NULL, npos, &nresults);
|
||||||
|
+#elif LUA_VERSION_NUM >= 502
|
||||||
|
res = lua_resume (L, NULL, npos);
|
||||||
|
#else
|
||||||
|
res = lua_resume (L, npos);
|
Reference in New Issue
Block a user