6
0
forked from pool/lua-luasystem

Compare commits

1 Commits

Author SHA256 Message Date
8f6c055de9 chore: move all efforts to specific branch
When we have git, we should use it, instead of commenting out
unfinished code.
2025-11-03 13:27:00 +01:00
4 changed files with 2 additions and 59 deletions

View File

@@ -1,50 +0,0 @@
---
spec/04-term_spec.lua | 3 +--
system/init.lua | 9 +++++++--
2 files changed, 8 insertions(+), 4 deletions(-)
Index: luasystem-0.6.3/spec/04-term_spec.lua
===================================================================
--- luasystem-0.6.3.orig/spec/04-term_spec.lua 2025-07-11 22:59:19.000000000 +0200
+++ luasystem-0.6.3/spec/04-term_spec.lua 2025-10-28 14:57:04.454973176 +0100
@@ -52,6 +52,7 @@
return assert(require("pl.compat").load("return " .. result))()
end
+ end)
@@ -993,5 +994,3 @@
end)
end)
-
-end)
Index: luasystem-0.6.3/system/init.lua
===================================================================
--- luasystem-0.6.3.orig/system/init.lua 2025-07-11 22:59:19.000000000 +0200
+++ luasystem-0.6.3/system/init.lua 2025-10-28 14:56:17.538621949 +0100
@@ -11,6 +11,11 @@
-- To be used with `system.setconsoleoutputcp` and `system.setconsolecp`.
-- @field CODEPAGE_UTF8 The Windows CodePage for UTF8.
-- @within Terminal_UTF-8
+--
+-- NOTE: In some environments (e.g., busted tests), `require 'system'` might not
+-- correctly load this `init.lua` file, leading to `system.CODEPAGE_UTF8` being nil.
+-- If this occurs, explicitly use `require 'system.init'` or ensure the Lua
+-- package path is configured to prioritize `system/init.lua` over `system.core`.
system.CODEPAGE_UTF8 = 65001
do
@@ -122,8 +127,8 @@
end
-- export a reset function only upon testing
- if _G._TEST then
- function system._reset_global_backup()
+ function system._reset_global_backup()
+ if _G._TEST then
global_backup = nil
end
end

View File

@@ -1,12 +1,11 @@
-------------------------------------------------------------------
Wed Oct 29 17:46:02 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
Mon Nov 3 12:26:26 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
- My effort to fix the test suite were unsuccesful, so lets just
switch of the tests for now.
- Split test phase as a special step to break luasystem-busted
dependency cycle.
- Current effort is included as:
- failing-test-04-term-setup.patch
- Add unused_variable.patch to squelch two unused-variable warnings
-------------------------------------------------------------------
Fri Oct 24 14:49:57 UTC 2025 - Matej Cepl <mcepl@cepl.eu>

View File

@@ -33,12 +33,6 @@ Source: https://github.com/lunarmodules/luasystem/archive/v%{version}.ta
# PATCH-FIX-UPSTREAM unused_variable.patch gh#lunarmodules/luasystem!78 mcepl@suse.com
# remove two unused-variable warnings
Patch0: unused_variable.patch
# # PATCH-FIX-UPSTREAM failing-test-04-term-setup.patch bsc#[0-9]+ mcepl@suse.com
# # fix failing test '04-term_spec.lua Term init'
# Patch1: failing-test-04-term-setup.patch
# # PATCH-{FIX|FEATURE}-{OPENSUSE|SLE|UPSTREAM} name-of-file.patch bsc#[0-9]+ mcepl@suse.com
# # this patch makes things totally awesome
# Patch2: other-failing-tests.patch
BuildRequires: %{flavor}-devel
BuildRequires: %{flavor}-luarocks
BuildRequires: lua-macros