Hello community, here is the log from the commit of package mypaint for openSUSE:Factory checked in at 2017-12-11 18:56:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mypaint (Old) and /work/SRC/openSUSE:Factory/.mypaint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mypaint" Mon Dec 11 18:56:56 2017 rev:3 rq:555698 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mypaint/mypaint.changes 2017-11-27 22:15:53.900107145 +0100 +++ /work/SRC/openSUSE:Factory/.mypaint.new/mypaint.changes 2017-12-11 18:57:01.405074324 +0100 @@ -1,0 +2,6 @@ +Sun Dec 10 13:30:29 UTC 2017 - [email protected] + +- rework mypaint-scons-to-python3.patch + * fix more 'print' parentheses + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mypaint.spec ++++++ --- /var/tmp/diff_new_pack.EubQuJ/_old 2017-12-11 18:57:02.801007835 +0100 +++ /var/tmp/diff_new_pack.EubQuJ/_new 2017-12-11 18:57:02.805007645 +0100 @@ -36,6 +36,11 @@ BuildRequires: python-gtk-devel BuildRequires: python-numpy >= 1.5 BuildRequires: python-numpy-devel +%if 0%{?suse_version} > 1320 +# just for a working python3 scons +BuildRequires: python3-numpy +BuildRequires: python3-numpy-devel +%endif BuildRequires: rsvg-view BuildRequires: scons >= 1.2 BuildRequires: swig ++++++ mypaint-scons-to-python3.patch ++++++ --- /var/tmp/diff_new_pack.EubQuJ/_old 2017-12-11 18:57:02.821006882 +0100 +++ /var/tmp/diff_new_pack.EubQuJ/_new 2017-12-11 18:57:02.825006692 +0100 @@ -1,7 +1,41 @@ -Index: mypaint-1.1.0/SConstruct +Index: b/SConscript =================================================================== ---- mypaint-1.1.0.orig/SConstruct -+++ mypaint-1.1.0/SConstruct +--- a/SConscript ++++ b/SConscript +@@ -10,9 +10,9 @@ mypaintlib = SConscript('lib/SConscript' + languages = SConscript('po/SConscript') + + try: +- new_umask = 022 ++ new_umask = 0o22 + old_umask = os.umask(new_umask) +- print "set umask to 0%03o (was 0%03o)" % (new_umask, old_umask) ++ print("set umask to 0%03o (was 0%03o)" % (new_umask, old_umask)) + except OSError: + # Systems like Win32... + pass +@@ -28,7 +28,7 @@ def burn_python_version(target, source, + f.write(s) + f.close() + +-env.Command('mypaint', 'mypaint.py', [burn_python_version, Chmod('$TARGET', 0755)]) ++env.Command('mypaint', 'mypaint.py', [burn_python_version, Chmod('$TARGET', 0o755)]) + AlwaysBuild('mypaint') # especially if the "python_binary" option was changed + + env.Clean('.', Glob('*.pyc')) +@@ -49,7 +49,7 @@ install_perms(env, '$prefix/share/applic + install_perms(env, '$prefix/lib/mypaint', mypaintlib) + + # Program and supporting UI XML +-install_perms(env, '$prefix/bin', 'mypaint', perms=0755) ++install_perms(env, '$prefix/bin', 'mypaint', perms=0o755) + install_perms(env, '$prefix/share/mypaint/gui', Glob('gui/*.xml')) + install_perms(env, "$prefix/share/mypaint/lib", Glob("lib/*.py")) + install_perms(env, "$prefix/share/mypaint/gui", Glob("gui/*.py")) +Index: b/SConstruct +=================================================================== +--- a/SConstruct ++++ b/SConstruct @@ -13,7 +13,7 @@ if sys.platform == "win32": default_python_config = 'python-config' @@ -11,7 +45,15 @@ default_python_config = 'python-config-%d.%d' % (sys.version_info[0],sys.version_info[1]) SConsignFile() # no .scsonsign into $PREFIX please -@@ -80,7 +80,7 @@ env.Append(RPATH = env.Literal(os.path.j +@@ -73,14 +73,14 @@ if env['enable_profiling'] or env['debug + if sys.platform == "linux2": + env.Append(LINKFLAGS = Split('-z origin')) + +-env.Append(RPATH = env.Literal(os.path.join('\\$$ORIGIN'))) ++env.Append(RPATH = '$$ORIGIN') + + # remove libraries produced by earlier versions, which are actually + # being used if they keep lying around, leading to mysterious bugs env.Execute('rm -f libmypaint-tests.so libmypaint.so libmypaintlib.so') set_dir_postaction = {} @@ -38,37 +80,63 @@ assert os.path.isdir(path) target_root = join(dest, os.path.basename(path)) for dirpath, dirnames, filenames in os.walk(path): -Index: mypaint-1.1.0/SConscript +Index: b/brushlib/SConscript =================================================================== ---- mypaint-1.1.0.orig/SConscript -+++ mypaint-1.1.0/SConscript -@@ -10,9 +10,9 @@ mypaintlib = SConscript('lib/SConscript' - languages = SConscript('po/SConscript') - +--- a/brushlib/SConscript ++++ b/brushlib/SConscript +@@ -60,8 +60,8 @@ env = env.Clone() + if env['enable_introspection']: + env['use_glib'] = True + env['use_sharedlib'] = True +- print "Enabling glib because of enable_introspection=true" +- print "Building a shared lib instead of a static lib because of enable_introspection=true" ++ print("Enabling glib because of enable_introspection=true") ++ print("Building a shared lib instead of a static lib because of enable_introspection=true") + else: + env['use_sharedlib'] = False + env['use_glib'] = False +Index: b/brushlib/generate.py +=================================================================== +--- a/brushlib/generate.py ++++ b/brushlib/generate.py +@@ -27,15 +27,15 @@ def writefile(filename, s): + "write generated code if changed" + s = '// DO NOT EDIT - autogenerated by ' + sys.argv[0] + '\n\n' + s + if os.path.exists(filename) and open(filename).read() == s: +- print 'Checked', filename ++ print('Checked {}'.format(filename)) + else: +- print 'Writing', filename ++ print('Writing {}'.format(filename)) + open(filename, 'w').write(s) + + def generate_enum(enum_name, enum_prefix, count_name, name_list, value_list): + # Can only generate an enum which starts at 0, and where each value is 1 more than the former + assert len(name_list) == len(value_list) +- assert value_list == list(xrange(0, len(value_list))) ++ assert value_list == list(range(0, len(value_list))) + + indent = " " * 4 + begin = "typedef enum {\n" +Index: b/lib/SConscript +=================================================================== +--- a/lib/SConscript ++++ b/lib/SConscript +@@ -4,7 +4,7 @@ import sys, os try: -- new_umask = 022 -+ new_umask = 0o22 - old_umask = os.umask(new_umask) -- print "set umask to 0%03o (was 0%03o)" % (new_umask, old_umask) -+ print("set umask to 0%03o (was 0%03o)" % (new_umask, old_umask)) - except OSError: - # Systems like Win32... - pass -@@ -28,7 +28,7 @@ def burn_python_version(target, source, - f.write(s) - f.close() - --env.Command('mypaint', 'mypaint.py', [burn_python_version, Chmod('$TARGET', 0755)]) -+env.Command('mypaint', 'mypaint.py', [burn_python_version, Chmod('$TARGET', 0o755)]) - AlwaysBuild('mypaint') # especially if the "python_binary" option was changed + import numpy + except ImportError: +- print 'You need to have numpy installed.' ++ print('You need to have numpy installed.') + print + raise + +@@ -93,7 +93,7 @@ else: + env.ParseConfig(env['python_config'] + ' --cflags') + env.ParseConfig(env['python_config'] + ' --ldflags') + except OSError: +- print '%r does not work, trying python-config instead' % env['python_config'] ++ print('{!r} does not work, trying python-config instead'.format(env['python_config'])) + env.ParseConfig('python-config --ldflags') + env.ParseConfig('python-config --cflags') - env.Clean('.', Glob('*.pyc')) -@@ -49,7 +49,7 @@ install_perms(env, '$prefix/share/applic - install_perms(env, '$prefix/lib/mypaint', mypaintlib) - - # Program and supporting UI XML --install_perms(env, '$prefix/bin', 'mypaint', perms=0755) -+install_perms(env, '$prefix/bin', 'mypaint', perms=0o755) - install_perms(env, '$prefix/share/mypaint/gui', Glob('gui/*.xml')) - install_perms(env, "$prefix/share/mypaint/lib", Glob("lib/*.py")) - install_perms(env, "$prefix/share/mypaint/gui", Glob("gui/*.py"))
