diff --git a/.gitignore b/.gitignore index c737498..04855db 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /vis-0.6.tar.gz /vis-ee46156.tar.gz /vis-0.7.tar.gz +/v0.9.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..17f5697 --- /dev/null +++ b/changelog @@ -0,0 +1,54 @@ +* Wed Sep 04 2024 Miroslav Suchý - 0.7-10 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 0.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Dec 31 2020 Jani Juhani Sinervo - 0.7-1 +- Update to 0.7 + +* Thu Oct 01 2020 Jani Juhani Sinervo - 0.6-4.20201001gitee46156 +- Fix FSFTB rhbz#186506 + +* Sat Aug 01 2020 Fedora Release Engineering - 0.6-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 15 2020 Jani Juhani Sinervo - 0.6-1 +- Update to 0.6 + +* Fri Jan 31 2020 Fedora Release Engineering - 0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 07 2018 Jani Juhani Sinervo - 0.5-1 +- Initial attempt at official inclusion diff --git a/sources b/sources index 43905a1..ce0f702 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vis-0.7.tar.gz) = ccc6a054fea6917e7751882468a74c30c712f7ec400a913c95c0084691f706e2bee54efb86b75be8b121c9a209c7e587e72e5474c55271d9943e91fc8aaf9bac +SHA512 (v0.9.tar.gz) = 0ffa971063df2e1bd9761305fb23b17a11376ef63e0ce9d880053580799cad5defd771c2cdd54d142c44fcfce718685a2d81a1c840ecc886f08671310c6e6f19 diff --git a/vis-0.9-lua-5.5.patch b/vis-0.9-lua-5.5.patch new file mode 100644 index 0000000..155a945 --- /dev/null +++ b/vis-0.9-lua-5.5.patch @@ -0,0 +1,38 @@ +diff -up vis-v0.9/vis-lua.c.lua55 vis-v0.9/vis-lua.c +--- vis-v0.9/vis-lua.c.lua55 2026-03-16 16:23:43.668922812 -0400 ++++ vis-v0.9/vis-lua.c 2026-03-16 16:25:41.892362312 -0400 +@@ -3208,7 +3208,11 @@ static void *alloc_lua(void *ud, void *p + * @function init + */ + void vis_lua_init(Vis *vis) { ++#if LUA_VERSION_NUM >= 505 ++ lua_State *L = lua_newstate(alloc_lua, vis, luaL_makeseed(0)); ++#else + lua_State *L = lua_newstate(alloc_lua, vis); ++#endif + if (!L) + return; + vis->lua = L; +diff -up vis-v0.9/vis-lua.h.lua55 vis-v0.9/vis-lua.h +--- vis-v0.9/vis-lua.h.lua55 2026-03-16 16:13:13.657846463 -0400 ++++ vis-v0.9/vis-lua.h 2026-03-16 16:15:26.159364325 -0400 +@@ -14,6 +14,19 @@ typedef void* lua_CFunction; + #include "vis.h" + #include "vis-subprocess.h" + ++#if LUA_VERSION_NUM >= 505 ++ ++#define lua_pushunsigned(L,n) lua_pushinteger(L, (lua_Integer)(n)) ++#define lua_tounsignedx(L,i,is) ((lua_Unsigned)lua_tointegerx(L,i,is)) ++#define lua_tounsigned(L,i) lua_tounsignedx(L,(i),NULL) ++#define luaL_checkunsigned(L,a) ((lua_Unsigned)luaL_checkinteger(L,a)) ++#define luaL_optunsigned(L,a,d) \ ++ ((lua_Unsigned)luaL_optinteger(L,a,(lua_Integer)(d))) ++#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n))) ++ ++#endif ++ ++ + /* add a directory to consider when loading lua files */ + bool vis_lua_path_add(Vis*, const char *path); + /* get semicolon separated list of paths to load lua files diff --git a/vis.spec b/vis.spec index 5a6ddbe..0bde034 100644 --- a/vis.spec +++ b/vis.spec @@ -1,6 +1,6 @@ Name: vis -Version: 0.7 -Release: 1%{?dist} +Version: 0.9 +Release: %autorelease Summary: A vim-like editor with structural regex from plan9 # The entire source code is ISC except for the following exceptions, @@ -10,10 +10,12 @@ Summary: A vim-like editor with structural regex from plan9 # libutf.c and libutf.h are MIT licensed # sam.c and sam.h are under a ISC-like license # All files under lua/lexers/ are MIT licensed -License: ISC and MIT and CC0 -URL: https://github.com/martanne/%{name}/ -Source0: https://github.com/martanne/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +License: ISC AND MIT AND CC0-1.0 +URL: https://git.sr.ht/~martanne/%{name} +Source0: https://git.sr.ht/~martanne/%{name}/archive/v%{version}.tar.gz +Patch0: vis-0.9-lua-5.5.patch +BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(termkey) BuildRequires: pkgconfig(ncursesw) @@ -21,6 +23,7 @@ BuildRequires: pkgconfig(tre) BuildRequires: pkgconfig(lua) >= 5.2 BuildRequires: libacl-devel BuildRequires: pkgconfig(libselinux) +BuildRequires: lua-penlight Requires: lua-lpeg >= 0.12 Requires: xsel @@ -38,7 +41,7 @@ BuildArch: noarch %{summary} %prep -%autosetup -n vis-%{version} +%autosetup -n vis-v%{version} -p1 %build %configure @@ -67,30 +70,4 @@ BuildArch: noarch %doc lua/doc/index.html lua/doc/ldoc_fixed.css %changelog -* Thu Dec 31 2020 Jani Juhani Sinervo - 0.7-1 -- Update to 0.7 - -* Thu Oct 01 2020 Jani Juhani Sinervo - 0.6-4.20201001gitee46156 -- Fix FSFTB rhbz#186506 - -* Sat Aug 01 2020 Fedora Release Engineering - 0.6-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 15 2020 Jani Juhani Sinervo - 0.6-1 -- Update to 0.6 - -* Fri Jan 31 2020 Fedora Release Engineering - 0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 07 2018 Jani Juhani Sinervo - 0.5-1 -- Initial attempt at official inclusion +%autochangelog