Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lua-toluapp for openSUSE:Factory checked in at 2025-10-30 17:10:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lua-toluapp (Old) and /work/SRC/openSUSE:Factory/.lua-toluapp.new.1980 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-toluapp" Thu Oct 30 17:10:53 2025 rev:12 rq:1313583 version:1.0.93 Changes: -------- --- /work/SRC/openSUSE:Factory/lua-toluapp/lua-toluapp.changes 2024-02-22 21:00:59.148581172 +0100 +++ /work/SRC/openSUSE:Factory/.lua-toluapp.new.1980/lua-toluapp.changes 2025-10-30 17:11:44.199487823 +0100 @@ -1,0 +2,13 @@ +Fri Oct 24 14:51:12 UTC 2025 - Matej Cepl <[email protected]> + +- Switch off building lua51 build of the package. + +------------------------------------------------------------------- +Mon Oct 13 14:10:09 UTC 2025 - Matej Cepl <[email protected]> + +- Make the package buildable with LuaJIT. +- Add lua-compatibility.patch to cover for the incompatibilities. +- Remove tolua++-1.0.93-lua52.patch which has been folded into + the previous patch. + +------------------------------------------------------------------- Old: ---- tolua++-1.0.93-lua52.patch New: ---- _scmsync.obsinfo build.specials.obscpio lua-compatibility.patch ----------(Old B)---------- Old:- Add lua-compatibility.patch to cover for the incompatibilities. - Remove tolua++-1.0.93-lua52.patch which has been folded into the previous patch. ----------(Old E)---------- ----------(New B)---------- New:- Make the package buildable with LuaJIT. - Add lua-compatibility.patch to cover for the incompatibilities. - Remove tolua++-1.0.93-lua52.patch which has been folded into ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-toluapp.spec ++++++ --- /var/tmp/diff_new_pack.6F6KyL/_old 2025-10-30 17:11:46.603589110 +0100 +++ /var/tmp/diff_new_pack.6F6KyL/_new 2025-10-30 17:11:46.615589616 +0100 @@ -19,12 +19,13 @@ %define flavor @BUILD_FLAVOR@ %define mod_name toluapp %define lua_suffix %(lua -e 'print(_VERSION)' | cut -d ' ' -f 2 |sed -e 's:\.:_:') +%if "%{flavor}" == "luajit" +%define lua_value 52 +%else %define lua_value %(echo "%{flavor}" |sed -e 's:lua::') -%if "%{flavor}" == "lua51" -%define lua_suffix 5_1 %endif -%if "%{flavor}" == "lua52" -%define lua_suffix 5_2 +%if "%{flavor}" == "luajit" +%define lua_suffix 5_1 %endif %if "%{flavor}" == "lua53" %define lua_suffix 5_3 @@ -40,14 +41,16 @@ URL: https://github.com/LuaDist/toluapp Source: https://github.com/LuaDist/toluapp/archive/%{version}/toluapp-%{version}.tar.gz Patch0: toluapp-libdir.patch -Patch1: toluapp-versioned-shared-lib.patch -Patch2: toluapp-build-compare.patch -Patch3: tolua++-1.0.93-lua52.patch -Patch4: toluapp-scons-py3.patch +Patch1: toluapp-scons-py3.patch +Patch2: toluapp-versioned-shared-lib.patch +Patch3: toluapp-build-compare.patch +#PATCH-FIX-OPENSUSE [email protected] - scons env.Copy() has been deprecated, use env.Clone() instead if needed +Patch4: toluapp-fix-deprecared-env-copy.patch #PATCH-FIX-UPSTREAM [email protected] - scons Options() is deprecated in 0.98.1, use Variables() instead Patch5: scons-0.98.1-Options-deprecated.patch -#PATCH-FIX-OPENSUSE [email protected] - scons env.Copy() has been deprecated, use env.Clone() instead if needed -Patch6: toluapp-fix-deprecared-env-copy.patch +# PATCH-FIX-UPSTREAM lua-compatibility.patch bsc#[0-9]+ [email protected] +# make the code compatible with all Lua APIs >= 5.1 +Patch6: lua-compatibility.patch BuildRequires: %{flavor}-devel BuildRequires: gcc-c++ BuildRequires: lua-macros @@ -92,7 +95,7 @@ Summary: Development headers for tolua++ Group: Development/Libraries/C and C++ Requires: toluapp-%{lua_version} -Conflicts: otherproviders(toluapp-devel) +Conflicts: toluapp-devel Provides: toluapp-devel = %{version} %description -n libtolua++-%{lua_suffix}-devel @@ -100,15 +103,9 @@ %prep %setup -q -n toluapp-%{version} -%patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 4 -p1 -%patch -P 5 -p1 -%patch -P 6 -p1 -%if "%{flavor}" != "lua51" -%patch -P 3 -p1 -%endif +find . -name \*.lua -exec sed -i 's/\r/\n/g; s/\n$//' '{}' + +%autopatch -p1 + sed -i "s/@SUFFIX@/%{lua_version}/" SConstruct %build ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.6F6KyL/_old 2025-10-30 17:11:46.971604615 +0100 +++ /var/tmp/diff_new_pack.6F6KyL/_new 2025-10-30 17:11:46.991605458 +0100 @@ -1,5 +1,5 @@ <multibuild> -<package>lua51</package> +<package>luajit</package> <package>lua53</package> <package>lua54</package> </multibuild> ++++++ _scmsync.obsinfo ++++++ mtime: 1761319290 commit: a7ade9e447f45cb640beea550f7da33d243702fbda3f16a79a891cbe45808665 url: https://src.opensuse.org/lua/lua-toluapp.git revision: a7ade9e447f45cb640beea550f7da33d243702fbda3f16a79a891cbe45808665 projectscmsync: https://src.opensuse.org/lua/_ObsPrj.git ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2025-10-24 17:21:43.000000000 +0200 @@ -0,0 +1,6 @@ +.osc +*.obscpio +*.osc +_build.* +.pbuild +lua*-toluapp-*-build/ ++++++ lua-compatibility.patch ++++++ ++++ 731 lines (skipped) ++++++ scons-0.98.1-Options-deprecated.patch ++++++ --- /var/tmp/diff_new_pack.6F6KyL/_old 2025-10-30 17:11:47.483626187 +0100 +++ /var/tmp/diff_new_pack.6F6KyL/_new 2025-10-30 17:11:47.487626355 +0100 @@ -1,8 +1,12 @@ +--- + SConstruct | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + Index: toluapp-1.0.93/SConstruct =================================================================== ---- toluapp-1.0.93.orig/SConstruct -+++ toluapp-1.0.93/SConstruct -@@ -16,7 +16,11 @@ elif 'msvc' in env['TOOLS']: +--- toluapp-1.0.93.orig/SConstruct 2025-10-13 16:32:08.143176758 +0200 ++++ toluapp-1.0.93/SConstruct 2025-10-13 16:32:58.631888989 +0200 +@@ -18,7 +18,11 @@ else: options_file = "posix" @@ -15,4 +19,13 @@ opts.Add('CC', 'The C compiler.') opts.Add('CXX', 'The C++ compiler (for the tests)') opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall']) +@@ -69,7 +73,7 @@ + pkg = open(source, "rt") + + for linea in pkg: +- dep = re.search("^[\t\w]*\$[cphl]file\s*\"([^\"]+)\"", linea) ++ dep = re.search(r"^[\t\w]*\$[cphl]file\s*\"([^\"]+)\"", linea) + if dep: + self.Depends(target, '#' + dep.groups()[0]); + ++++++ toluapp-scons-py3.patch ++++++ --- /var/tmp/diff_new_pack.6F6KyL/_old 2025-10-30 17:11:47.535628378 +0100 +++ /var/tmp/diff_new_pack.6F6KyL/_new 2025-10-30 17:11:47.543628715 +0100 @@ -1,8 +1,12 @@ +--- + SConstruct | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + Index: toluapp-1.0.93/SConstruct =================================================================== ---- toluapp-1.0.93.orig/SConstruct -+++ toluapp-1.0.93/SConstruct -@@ -52,9 +52,9 @@ env['TOLUAPP_BOOTSTRAP'] = env['tolua_bi +--- toluapp-1.0.93.orig/SConstruct 2025-10-13 18:29:14.209840999 +0200 ++++ toluapp-1.0.93/SConstruct 2025-10-13 18:29:15.010128928 +0200 +@@ -50,9 +50,9 @@ env['build_dev'] = int(env['build_dev']) ## detecting the install directory on win32 @@ -14,7 +18,7 @@ env['prefix'] = env['MSVS']['PLATFORMSDKDIR'] -@@ -68,7 +68,7 @@ def pkg_scan_dep(self, target, source): +@@ -66,7 +66,7 @@ ## TODO: detectar si el archivo existe antes de abrirlo asi nomas pkg = open(source, "rt") @@ -23,7 +27,7 @@ dep = re.search("^[\t\w]*\$[cphl]file\s*\"([^\"]+)\"", linea) if dep: self.Depends(target, '#' + dep.groups()[0]); -@@ -91,7 +91,7 @@ def make_tolua_code(self, target, source +@@ -89,7 +89,7 @@ tolua = 'bin\\'+self['TOLUAPP_BOOTSTRAP'] else: tolua = 'bin/'+self['TOLUAPP_BOOTSTRAP']
