Hello community,

here is the log from the commit of package lua-toluapp for openSUSE:Factory 
checked in at 2018-02-02 22:23:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lua-toluapp (Old)
 and      /work/SRC/openSUSE:Factory/.lua-toluapp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "lua-toluapp"

Fri Feb  2 22:23:01 2018 rev:5 rq:572012 version:1.0.93

Changes:
--------
--- /work/SRC/openSUSE:Factory/lua-toluapp/lua-toluapp.changes  2017-10-31 
15:44:29.368709471 +0100
+++ /work/SRC/openSUSE:Factory/.lua-toluapp.new/lua-toluapp.changes     
2018-02-02 22:23:29.226500629 +0100
@@ -1,0 +2,6 @@
+Thu Jan 25 20:16:23 UTC 2018 - tchva...@suse.com
+
+- Fix build with py3 scons:
+  * toluapp-scons-py3.patch
+
+-------------------------------------------------------------------

New:
----
  toluapp-scons-py3.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lua-toluapp.spec ++++++
--- /var/tmp/diff_new_pack.r7rlEl/_old  2018-02-02 22:23:30.150457499 +0100
+++ /var/tmp/diff_new_pack.r7rlEl/_new  2018-02-02 22:23:30.154457311 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package lua-toluapp
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -40,6 +40,7 @@
 Patch1:         toluapp-versioned-shared-lib.patch
 Patch2:         toluapp-build-compare.patch
 Patch3:         tolua++-1.0.93-lua52.patch
+Patch4:         toluapp-scons-py3.patch
 BuildRequires:  %{flavor}-devel
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -93,6 +94,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch4 -p1
 %if "%{flavor}" != "lua51"
 %patch3 -p1
 %endif
@@ -106,6 +108,7 @@
 LIBS = re.split(r"\s+", os.environ['LIBS'])
 prefix = "%{_prefix}"
 EOF
+cp config_linux.py config_posix.py
 
 CCFLAGS="%{optflags} -fPIC -I%{lua_incdir}" \
 LIBS="-llua -lm -ldl" \
@@ -114,7 +117,7 @@
     libdir="%{_libdir}" \
     shared=1 \
     lib bin \
-    -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC 
-DDATAPATH=\\\"%{lua_noarchdir}/%{name}\\\""
+    -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC 
-DDATAPATH=\\\"%{lua_noarchdir}/%{name}\\\"" \
 
 %install
 CCFLAGS="%{optflags} -fPIC -I%{lua_incdir}" \
@@ -124,7 +127,7 @@
     libdir="%{buildroot}%{_libdir}" \
     shared=1 \
     install \
-    -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC 
-DDATAPATH=\\\"%{lua_noarchdir}/%{name}\\\""
+    -Q CCFLAGS="%{optflags} -I%{lua_incdir} -fPIC 
-DDATAPATH=\\\"%{lua_noarchdir}/%{name}\\\"" \
 
 # pkgconfig file
 mkdir -p %{buildroot}%{_libdir}/pkgconfig

++++++ toluapp-scons-py3.patch ++++++
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
 env['build_dev'] = int(env['build_dev'])
 
 ## detecting the install directory on win32
-if 'msvc' in env['TOOLS'] and not (env.has_key('prefix') or env['prefix']):
+if 'msvc' in env['TOOLS'] and not ('prefix' in env or env['prefix']):
 
-       if env['MSVS'].has_key('PLATFORMSDKDIR'):
+       if 'PLATFORMSDKDIR' in env['MSVS']:
                env['prefix'] = env['MSVS']['PLATFORMSDKDIR']
 
 
@@ -68,7 +68,7 @@ def pkg_scan_dep(self, target, source):
        ## TODO: detectar si el archivo existe antes de abrirlo asi nomas
        pkg = open(source, "rt")
 
-       for linea in pkg.xreadlines():
+       for linea in pkg:
                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
                        tolua = 'bin\\'+self['TOLUAPP_BOOTSTRAP']
                else:
                        tolua = 'bin/'+self['TOLUAPP_BOOTSTRAP']
-               print("********* tolua is ", tolua)
+               print(("********* tolua is ", tolua))
        else:
                if use_own:
                        if 'msvc' in self['TOOLS']:

Reply via email to