Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2016-04-22 16:22:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mozc" Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2015-10-19 22:49:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-04-22 16:22:59.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Mar 8 14:52:16 UTC 2016 - ftake@geeko.jp + +- Upstream update to 2.17.2313.102 + * "-j" option is deprecated + * Calculator supports inputs starting with "=" + * ibus-mozc supports "icon_prop_key" and input mode labels are + shown on tray icon + * Minor updates and refactoring +- Update ibus-provide-layout-variations.patch +- Update mozc-ninja-verbose-build.patch + +------------------------------------------------------------------- Old: ---- mozc-2.17.2123.102.tar.xz New: ---- mozc-2.17.2313.102.tar.xz protobuf.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.JD1YB0/_old 2016-04-22 16:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.JD1YB0/_new 2016-04-22 16:23:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mozc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -30,14 +30,18 @@ %define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model Name: mozc -Version: 2.17.2123.102 +Version: 2.17.2313.102 Release: 0 Summary: Mozc - Japanese Input Method for Chromium OS, Mac and Linux License: BSD-3-Clause and SUSE-Public-Domain Group: System/I18n/Japanese -Url: http://code.google.com/p/mozc -# svn export http://mozc.googlecode.com/svn/trunk/src/@r510 mozc +Url: https://github.com/google/mozc +# git clone https://github.com/google/mozc.git +# cd mozc +# git archive --prefix=mozc-$version/ 3306d33 | tar xC ../ +# rm mozc-$version/src/third_party/* +# tar cvJf mozc-$version.tar.xz mozc-$version Source0: %{name}-%{version}.tar.xz Source1: README.SUSE @@ -52,6 +56,15 @@ # japanese-usage-dictionary # License: BSD-2-Clause Source5: japanese_usage_dictionary-r10.tar.xz +# protobuf +# License: BSD-3-Clause +# +# Use static protobuf lib because of the binary incopatibility problem +# between GCC5 and LLVM +# +# git clone https://github.com/google/protobuf/ +# git archive --prefix protobuf/ v3.0.0-beta-2 | xz > ../protobuf.tar.xz +Source6: protobuf.tar.xz # # jigyosyo.zip and ken_all.zip are zip-code--address data provided by # Japan Post Co., Ltd. @@ -161,8 +174,8 @@ %patch -p2 %endif -%patch1 -p0 -%patch2 -p1 +%patch1 -p2 +%patch2 -p2 %ifarch ppc ppc64 ppc64le %patch3 -p1 %endif @@ -175,6 +188,8 @@ tar xvf %{SOURCE3} # japanese_usage_dictionary tar xvf %{SOURCE5} +# protobuf +tar xvf %{SOURCE6} cd protobuf %patch4 -p1 %patch5 -p1 @@ -207,7 +222,7 @@ export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=0 use_libzinnia=1 document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path} release_extra_cflags="'$flags'"' python build_mozc.py gyp --server_dir=%{_libdir}/mozc -python build_mozc.py build -c %{target} %{?_smp_mflags} \ +python build_mozc.py build -c %{target} \ unix/ibus/ibus.gyp:ibus_mozc \ %if %{with_fcitx} unix/fcitx/fcitx.gyp:fcitx-mozc \ ++++++ ibus-provide-layout-variations.patch ++++++ --- /var/tmp/diff_new_pack.JD1YB0/_old 2016-04-22 16:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.JD1YB0/_new 2016-04-22 16:23:01.000000000 +0200 @@ -1,32 +1,36 @@ -diff -ru unix.org/ibus/gen_mozc_xml.py unix/ibus/gen_mozc_xml.py ---- unix.org/ibus/gen_mozc_xml.py 2014-01-07 20:05:54.092270180 +0900 -+++ unix/ibus/gen_mozc_xml.py 2014-01-07 20:12:25.162442386 +0900 -@@ -69,7 +69,6 @@ - 'description': '%(product_name)s (Japanese Input Method)', - 'language': 'ja', - 'icon': '%(ibus_mozc_icon_path)s', -- 'rank': '80', - 'symbol': 'あ', - } +diff --git a/src/unix/ibus/gen_mozc_xml.py b/src/unix/ibus/gen_mozc_xml.py +index 1e2180c..5cb1e50 100644 +--- a/src/unix/ibus/gen_mozc_xml.py ++++ b/src/unix/ibus/gen_mozc_xml.py +@@ -183,14 +183,20 @@ def main(): + 'description': '%(product_name)s (Japanese Input Method)', + 'language': 'ja', + 'icon': '%(ibus_mozc_icon_path)s', +- 'rank': '80', ++ 'symbol': 'あ', + } -@@ -86,12 +85,17 @@ - }, - # On Linux (IBus >= 1.5), we use special label 'default' for the keyboard - # layout. -+ # openSUSE provides four engines like ChromeOS - 'Linux-IBus1.5': { - # DO NOT change the engine name 'mozc-jp'. The names is referenced by - # unix/ibus/mozc_engine.cc. -- 'name': ['mozc-jp'], -- 'longname': ['%(product_name)s'], -- 'layout': ['default'], -+ 'name': ['mozc-jp', 'mozc-jp-jp', 'mozc-us', 'mozc-dv'], -+ 'longname': ['%(product_name)s', -+ '%(product_name)s - JP layout', -+ '%(product_name)s - US layout', -+ '%(product_name)s - US Dvorak layout'], -+ 'layout': ['default', 'jp', 'us', 'us(dvorak)'], -+ 'rank': ['80', '0', '0', '0'], - }, - } + # DO NOT change the engine name 'mozc-jp'. The names is referenced by + # unix/ibus/mozc_engine.cc. ++ # openSUSE provides four engines like ChromeOS + engines_props = { +- 'name': ['mozc-jp'], +- 'longname': ['%(product_name)s'], ++ 'name': ['mozc-jp', 'mozc-jp-jp', 'mozc-us', 'mozc-dv'], ++ 'longname': ['%(product_name)s', ++ '%(product_name)s - JP layout', ++ '%(product_name)s - US layout', ++ '%(product_name)s - US Dvorak layout'], ++ 'layout': ['default', 'jp', 'us', 'us(dvorak)'], ++ 'rank': ['80', '0', '0', '0'], + } + + # IBus 1.5.11 and greater supports 'icon_prop_key'. +@@ -202,7 +208,6 @@ def main(): + + if CheckIBusVersion(options, '1.5.0'): + engine_common_props['symbol'] = 'あ' +- engines_props['layout'] = ['default'] + else: + engines_props['layout'] = ['jp'] ++++++ mozc-2.17.2123.102.tar.xz -> mozc-2.17.2313.102.tar.xz ++++++ /work/SRC/openSUSE:Factory/mozc/mozc-2.17.2123.102.tar.xz /work/SRC/openSUSE:Factory/.mozc.new/mozc-2.17.2313.102.tar.xz differ: char 1, line 1 ++++++ mozc-ninja-verbose-build.patch ++++++ --- /var/tmp/diff_new_pack.JD1YB0/_old 2016-04-22 16:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.JD1YB0/_new 2016-04-22 16:23:01.000000000 +0200 @@ -1,13 +1,13 @@ -Index: mozc-2.16.2037.102/build_mozc.py -=================================================================== ---- mozc-2.16.2037.102.orig/build_mozc.py -+++ mozc-2.16.2037.102/build_mozc.py -@@ -1022,7 +1022,7 @@ def BuildOnLinux(options, targets, unuse +diff --git a/src/build_mozc.py b/src/build_mozc.py +index 651dd30..3f817a5 100644 +--- a/src/build_mozc.py ++++ b/src/build_mozc.py +@@ -964,7 +964,7 @@ def BuildOnLinux(options, targets, unused_original_directory_name): + short_basename = GetBuildShortBaseName(options, GetMozcVersion().GetTargetPlatform()) make_command = ninja - build_args = ['-j %s' % options.jobs, -- '-C', '%s/%s' % (short_basename, options.configuration)] -+ '-C', '%s/%s' % (short_basename, options.configuration), '-v'] +- build_args = ['-C', '%s/%s' % (short_basename, options.configuration)] ++ build_args = ['-C', '%s/%s' % (short_basename, options.configuration), '-v'] RunOrDie([make_command] + build_args + target_names)