Hello community, here is the log from the commit of package ibus-sunpinyin for openSUSE:Factory checked in at 2017-11-24 10:57:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibus-sunpinyin (Old) and /work/SRC/openSUSE:Factory/.ibus-sunpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-sunpinyin" Fri Nov 24 10:57:34 2017 rev:5 rq:545056 version:2.0.99 Changes: -------- --- /work/SRC/openSUSE:Factory/ibus-sunpinyin/ibus-sunpinyin.changes 2017-09-13 22:35:16.585869885 +0200 +++ /work/SRC/openSUSE:Factory/.ibus-sunpinyin.new/ibus-sunpinyin.changes 2017-11-24 10:57:35.105459945 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 17:08:29 UTC 2017 - [email protected] + +- Add ibus-sunpinyin-scons-on-py3.patch: Fix build with scons using + pythoh3 as interpreter. + +------------------------------------------------------------------- New: ---- ibus-sunpinyin-scons-on-py3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibus-sunpinyin.spec ++++++ --- /var/tmp/diff_new_pack.6uR41X/_old 2017-11-24 10:57:35.921430147 +0100 +++ /var/tmp/diff_new_pack.6uR41X/_new 2017-11-24 10:57:35.925430000 +0100 @@ -24,6 +24,8 @@ Group: System/I18n/Chinese Url: https://github.com/sunpinyin/sunpinyin Source: https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1/sunpinyin-3.0.0-rc1.tar.gz +# PATCH-FIX-UPSTREAM ibus-sunpinyin-scons-on-py3.patch [email protected] -- Fix build with scons using python3 as interpreter +Patch0: ibus-sunpinyin-scons-on-py3.patch BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: scons >= 1.2.0 @@ -44,6 +46,7 @@ %prep %setup -q -n sunpinyin-3.0.0-rc1 +%patch0 -p1 sed -i "s/LIBEXECDIR'\].*ibus-sunpinyin.*/LIBEXECDIR'\]/" SConstruct %build ++++++ ibus-sunpinyin-scons-on-py3.patch ++++++ Index: sunpinyin-3.0.0-rc1/SConstruct =================================================================== --- sunpinyin-3.0.0-rc1.orig/SConstruct +++ sunpinyin-3.0.0-rc1/SConstruct @@ -1,6 +1,7 @@ import platform import os import sys +import functools version = "2.0.4" @@ -227,7 +228,7 @@ def CreateEnvironment(): def PassVariables(envvar, env): for (x, y) in envvar: if x in os.environ: - print 'Warning: you\'ve set %s in the environmental variable!' % x + print ('Warning: you\'ve set %s in the environmental variable!' % x) env[y] = os.environ[x] env = CreateEnvironment() @@ -427,7 +428,7 @@ env.Substfile('sunpinyin-2.0.pc.in', SUB '@PREFIX@': env['PREFIX'], '@LIBDIR@': env['LIBDIR'], '@VERSION@': version, - '@CFLAGS@': reduce(lambda a, b: a + ' ' + b, + '@CFLAGS@': functools.reduce(lambda a, b: a + ' ' + b, map(lambda x: '-I$${includedir}' + x[3:], allinc())), }) Index: sunpinyin-3.0.0-rc1/src/SConscript =================================================================== --- sunpinyin-3.0.0-rc1.orig/src/SConscript +++ sunpinyin-3.0.0-rc1/src/SConscript @@ -53,7 +53,7 @@ env.Substfile('sunpinyin-dictgen.mk.in', }) env.Command('sunpinyin-dictgen', 'sunpinyin-dictgen.mk', [ Copy("$TARGET", "$SOURCE"), - Chmod("$TARGET", 0755), + Chmod("$TARGET", 0o755), ]) # -*- indent-tabs-mode: nil -*- vim:et:ts=4 Index: sunpinyin-3.0.0-rc1/wrapper/ibus/SConstruct =================================================================== --- sunpinyin-3.0.0-rc1.orig/wrapper/ibus/SConstruct +++ sunpinyin-3.0.0-rc1/wrapper/ibus/SConstruct @@ -36,7 +36,7 @@ opts.Add('DATADIR', default='/usr/local/ def PassVariables(envvar, env): for (x, y) in envvar: if x in os.environ: - print 'Warning: you\'ve set %s in the environmental variable!' % x + print ('Warning: you\'ve set %s in the environmental variable!' % x) env[y] = os.environ[x] env = Environment(ENV=os.environ, @@ -141,7 +141,7 @@ def DoInstall(): libexec_target = env.Install(bin_dir, ['ibus-engine-sunpinyin', 'setup/ibus-setup-sunpinyin']) for exec_bin in libexec_target: - env.AddPostAction(exec_bin, Chmod(str(exec_bin), 0755)) + env.AddPostAction(exec_bin, Chmod(str(exec_bin), 0o755)) setup_target = env.Install(data_dir + '/setup', ['setup/setup.xml',
