rpm/lua-toluapp
SHA256
1
0
Fork 0
forked from pool/lua-toluapp
Code Pull Requests Activity

Accepting request 810965 from home:mlin7442:rebuild_152

Browse Source 
fix build with newer scons

OBS-URL: https://build.opensuse.org/request/show/810965
OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-toluapp?expand=0&rev=21
This commit is contained in:
Matej Cepl 2020-06-03 17:35:52 +00:00 committed by Git OBS Bridge
parent 90be1cc7a1
commit b157774cee
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lua-toluapp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 2 21:23:34 UTC 2020 - Max Lin <mlin@suse.com>
- 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 <i@marguerite.su> Tue Feb 26 03:51:05 UTC 2019 - Marguerite Su <i@marguerite.su>

7
lua-toluapp.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package lua-toluapp # spec file for package lua-toluapp
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2020 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -34,7 +34,7 @@ Release: 0
Summary: C/C++ with Lua Integration Tool Summary: C/C++ with Lua Integration Tool
License: MIT License: MIT
Group: Development/Languages/Other 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 Source: https://github.com/LuaDist/toluapp/archive/%{version}/toluapp-%{version}.tar.gz
Patch0: toluapp-libdir.patch Patch0: toluapp-libdir.patch
Patch1: toluapp-versioned-shared-lib.patch Patch1: toluapp-versioned-shared-lib.patch
@ -43,6 +43,8 @@ Patch3: tolua++-1.0.93-lua52.patch
Patch4: toluapp-scons-py3.patch Patch4: toluapp-scons-py3.patch
#PATCH-FIX-UPSTREAM marguerite@opensuse.org - scons Options() is deprecated in 0.98.1, use Variables() instead #PATCH-FIX-UPSTREAM marguerite@opensuse.org - scons Options() is deprecated in 0.98.1, use Variables() instead
Patch5: scons-0.98.1-Options-deprecated.patch Patch5: scons-0.98.1-Options-deprecated.patch
#PATCH-FIX-OPENSUSE mlin@suse.com - scons env.Copy() has been deprecated, use env.Clone() instead if needed
Patch6: toluapp-fix-deprecared-env-copy.patch
BuildRequires: %{flavor}-devel BuildRequires: %{flavor}-devel
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
@ -98,6 +100,7 @@ This package provides development headers for tolua++.
%patch2 -p1 %patch2 -p1
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1
%if "%{flavor}" != "lua51" %if "%{flavor}" != "lua51"
%patch3 -p1 %patch3 -p1
%endif %endif

14
toluapp-fix-deprecared-env-copy.patch Normal file
View File

@ -0,0 +1,14 @@
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)