Compare commits

7 Commits

Author SHA256 Message Date
d00418fb7d Mention removing remove-bogus-luajit.patch to changelog. 2026-01-29 11:29:35 +01:00
b79b582233 Add plain tar and *.changes handlers to .gitattributes 2026-01-28 11:57:18 +01:00
c243ce960b Update to version 0.2.3+git.1769216057.4c6197f 2026-01-28 11:44:12 +01:00
a320e62d73 Add lua55-build.patch fixing the implementation of __close 2026-01-24 14:01:13 +01:00
486f2c0f4c Update to version 0.2.3+git.1760984966.1a8c220
* tests: remove bogus code making tests fail under luajit

- Remove the upstreamed remove-bogus-luajit.patch
2026-01-24 14:00:39 +01:00
d4052543aa Enable lua55 build. 2026-01-23 22:40:40 +01:00
995f400e4f Enable lua55 build 2026-01-21 21:41:58 +01:00
9 changed files with 46 additions and 41 deletions

3
.gitattributes vendored
View File

@@ -1,4 +1,4 @@
## Default LFS
*.changes merge=merge-changes
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
@@ -12,6 +12,7 @@
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tar filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text

2
.gitignore vendored
View File

@@ -3,5 +3,5 @@ _scmsync.obsinfo
.assets/
_buildconfig-*
_buildinfo-*.xml
lua-cffi-*-build/
lua*-cffi-lua-*-build/
cffi-lua/

View File

@@ -1,4 +1,5 @@
<multibuild>
<package>lua53</package>
<package>lua54</package>
<package>lua55</package>
</multibuild>

View File

@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/q66/cffi-lua.git</param>
<param name="changesrevision">9f2acc9a2a0c8e59dda35c0e11333d1b66296667</param></service></servicedata>
<param name="changesrevision">4c6197fe40ce6fbd7ba0b7aadd2a9e9de824ef8e</param></service></servicedata>

Binary file not shown.

View File

@@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Jan 24 12:41:30 UTC 2026 - Matej Cepl <mcepl@cepl.eu>
- Update to version 0.2.3+git.1769216057.4c6197f:
* add 5.5 support
- Remove lua55-build.patch, which is now superflouous.
- Remove, now upstreamed, remove-bogus-luajit.patch.
-------------------------------------------------------------------
Fri Jan 23 22:14:09 UTC 2026 - Matej Cepl <mcepl@cepl.eu>
- Update to version 0.2.3+git.1760984966.1a8c220:
* tests: remove bogus code making tests fail under luajit
- Add lua55-build.patch fixing the implementation of __close
function (gh#q66/cffi-lua!64).
-------------------------------------------------------------------
Fri Jan 23 21:40:40 UTC 2026 - Matej Cepl <mcepl@cepl.eu>
- Enable lua55 build.
-------------------------------------------------------------------
Fri Oct 24 14:47:14 UTC 2025 - Matej Cepl <mcepl@cepl.eu>

View File

@@ -18,7 +18,20 @@
%define flavor @BUILD_FLAVOR@
%define mod_name cffi-lua
Version: 0.2.3+git.1748465608.9f2acc9
%bcond_with compat53
%if "%{flavor}" == "lua53"
%bcond_without compat53
%endif
%if "%{flavor}" == "lua54"
%bcond_without compat53
%endif
%if "%{flavor}" == "lua55"
%bcond_without compat53
%endif
%if "%{flavor}" == "luajit"
%bcond_without compat53
%endif
Version: 0.2.3+git.1769216057.4c6197f
Release: 0
Summary: A portable C FFI for Lua 5.1+
License: MIT
@@ -31,18 +44,17 @@ Patch0: 0001-Corrects-1st-example-in-introduction.md.patch
# PATCH-FIX-UPSTREAM 0002-docs-fixed-the-second-example-in-introduction.md.patch mcepl@suse.com
# fix second typo in introduction.md
Patch1: 0002-docs-fixed-the-second-example-in-introduction.md.patch
# PATCH-FIX-UPSTREAM remove-bogus-luajit.patch gh#q66/cffi-lua#63 mcepl@suse.com
# fix tests for LuaJIT
Patch2: remove-bogus-luajit.patch
BuildRequires: %{flavor}-devel
BuildRequires: %{flavor}-compat-5.3
BuildRequires: lua-macros
BuildRequires: meson
BuildRequires: c++_compiler
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libffi)
Requires: %{flavor}
%if %{with compat53}
BuildRequires: %{flavor}-compat-5.3
Requires: %{flavor}-compat-5.3
%endif
# gh#q66/cffi-lua#59
ExcludeArch: %{ix86} armv6l armv6hl armv7l armv7hl
%lua_provides

View File

@@ -1,30 +0,0 @@
From 1a8c2207f4689ee746b1df4a390d1b5843ed1161 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 20 Oct 2025 20:29:26 +0200
Subject: [PATCH] tests: remove bogus code making tests fail under luajit
This would replace cffi with regular ffi under luajit for tests,
we don't actually want that.
Fixes https://github.com/q66/cffi-lua/issues/63
---
tests/runner.lua | 6 ------
1 file changed, 6 deletions(-)
diff --git a/tests/runner.lua b/tests/runner.lua
index d08b249..0b2b679 100644
--- a/tests/runner.lua
+++ b/tests/runner.lua
@@ -48,12 +48,6 @@ if tl_path and (#tl_path > 0) then
end
end
--- set up luajit compatibility
-
-if jit then
- package.preload["cffi"] = package.preload["ffi"]
-end
-
-- test lib
skip_test = function()