Hello community, here is the log from the commit of package lua-toluapp for openSUSE:Leap:15.2 checked in at 2020-06-04 16:03:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/lua-toluapp (Old) and /work/SRC/openSUSE:Leap:15.2/.lua-toluapp.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lua-toluapp" Thu Jun 4 16:03:04 2020 rev:11 rq:811242 version:1.0.93 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/lua-toluapp/lua-toluapp.changes 2020-01-15 15:27:43.670653883 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.lua-toluapp.new.3606/lua-toluapp.changes 2020-06-04 16:04:03.215596572 +0200 @@ -1,0 +2,14 @@ +Tue Jun 2 21:23:34 UTC 2020 - Max Lin <[email protected]> + +- Fix build with scons 3.1.2 - env.Copy() has been depreacated + * add toluapp-fix-deprecared-env-copy.patch + +------------------------------------------------------------------- +Tue Feb 26 03:51:05 UTC 2019 - Marguerite Su <[email protected]> + +- fix tumbleweed build +- add scons-0.98.1-Options-deprecated.patch + * Options object has been deprecated since scons 0.98.1 + use newer Variables object if available + +------------------------------------------------------------------- New: ---- scons-0.98.1-Options-deprecated.patch toluapp-fix-deprecared-env-copy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lua-toluapp.spec ++++++ --- /var/tmp/diff_new_pack.aEx42z/_old 2020-06-04 16:04:03.751598366 +0200 +++ /var/tmp/diff_new_pack.aEx42z/_new 2020-06-04 16:04:03.759598392 +0200 @@ -1,7 +1,7 @@ # # spec file for package lua-toluapp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # 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/ # @@ -34,13 +34,17 @@ Summary: C/C++ with Lua Integration Tool License: MIT Group: Development/Languages/Other -Url: https://github.com/LuaDist/toluapp +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 +#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 BuildRequires: %{flavor}-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig @@ -95,6 +99,8 @@ %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 %if "%{flavor}" != "lua51" %patch3 -p1 %endif ++++++ scons-0.98.1-Options-deprecated.patch ++++++ 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']: else: options_file = "posix" -opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) +try: + opts = Variables(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) +except NameError: + opts = Options(["config_"+options_file+".py", "custom.py", "custom_"+options_file+".py"], ARGUMENTS) + opts.Add('CC', 'The C compiler.') opts.Add('CXX', 'The C++ compiler (for the tests)') opts.Add('CCFLAGS', 'Flags for the compiler.', ['-O2', '-Wall']) ++++++ toluapp-fix-deprecared-env-copy.patch ++++++ Index: b/src/tests/SCsub =================================================================== --- a/src/tests/SCsub +++ b/src/tests/SCsub @@ -1,5 +1,8 @@ Import('env') -env_tests = env.Copy() +try: + env_tests = env.Copy() +except AttributeError: + env_tests = env.Clone() env_tests.LuaBinding('tclassbind.cpp', 'tclass.pkg', 'tclass', use_own=1, use_typeid=1)
