commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2020-09-15 16:28:43
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.4249 (New)
Package is "mozc"
Tue Sep 15 16:28:43 2020 rev:35 rq:834322 version:2.23.2815.102
Changes:
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes2020-06-02
14:38:07.299423244 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.4249/mozc.changes 2020-09-15
16:28:47.566625660 +0200
@@ -1,0 +2,16 @@
+Thu Sep 10 14:23:44 UTC 2020 - Fuminobu Takeyama
+
+- Build scripts migration to Python 3
+ * Add: build-scripts-migration-to-python3.patch
+ * Add: fix-zip-code-conversion-output.patch
+- Update post code dictionary
+
+---
+Sat Sep 5 08:51:02 UTC 2020 - Fuminobu Takeyama
+
+- Use system libprotobuf because Mozc's build script cannot handle
+ newer protobuf source code
+ * Fix build error under RISC V environment
+ * Add: mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
+
+---
New:
build-scripts-migration-to-python3.patch
fix-zip-code-conversion-output.patch
mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.iK3wPH/_old 2020-09-15 16:28:48.586626636 +0200
+++ /var/tmp/diff_new_pack.iK3wPH/_new 2020-09-15 16:28:48.590626640 +0200
@@ -29,7 +29,7 @@
%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png
%define document_dir %{_docdir}/ibus-mozc
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
-%define use_libprotobuf 0
+%define use_libprotobuf 1
Name: mozc
Version:2.23.2815.102
@@ -39,12 +39,7 @@
Group: System/I18n/Japanese
ExcludeArch:ppc ppc64 s390 s390x
URL:https://github.com/google/mozc
-# git clone https://github.com/google/mozc.git
-# cd mozc
-# git archive --prefix=mozc-$version/ afb03ddf | tar xC ../
-# rm mozc-$version/src/third_party/*
-# rm mozc-$version/docker
-# tar cvJf mozc-$version.tar.xz mozc-$version
+# Run ./make_archive.sh to make tar.xz removing third party files
Source0:%{name}-%{version}.tar.xz
Source1:README.SUSE
@@ -106,12 +101,19 @@
Patch11:add-Japanese-new-era-reiwa-to-date_rewriter.patch
# PATCH-FIX-UPSTREAM ft...@geeko.jp
Patch12:add-Japanese-new-era-reiwa-ligature-to-dict.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp -- fix compile error caused by newer
protobuf (from Gentoo)
+# https://github.com/google/mozc/issues/460
+Patch13:
mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp -- Use Python 3 to build Mozc
+Patch14:build-scripts-migration-to-python3.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp -- fix a bug of the Python3 patch
+Patch15:fix-zip-code-conversion-output.patch
BuildRequires: ninja >= 1.4
%if %{use_libprotobuf}
BuildRequires: protobuf-devel
%endif
-BuildRequires: python
+BuildRequires: python3
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
@@ -218,6 +220,15 @@
%patch12 -p1
cd ..
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+
+# Use python as python3
+mkdir %{_builddir}/bin
+ln -s /usr/bin/python3 %{_builddir}/bin/python
+export PATH=%{_builddir}/bin:$PATH
+
# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop
@@ -230,7 +241,7 @@
%build
%define target Release
-
+export PATH=%{_builddir}/bin:$PATH
export QTDIR=%{_libdir}/qt5
# -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp.
++ build-scripts-migration-to-python3.patch ++
3693 lines (skipped)
++ fix-zip-code-conversion-output.patch ++
--- mozc-2.23.2815.102/src/dictionary/gen_zip_code_seed.py.org 2020-09-08
14:34:18.613390927 +
+++ mozc-2.23.2815.102/src/dictionary/gen_zip_code_seed.py 2020-09-08
14:40:55.050072520 +
@@ -83,7 +83,7 @@
address = unicodedata.normalize('NFKC', self.address)
line = '\t'.join([zip_code, '0', '0', str(ZIP_CODE_COST),
address, ZIP_CODE_LABEL])
-print(line.encode('utf-8'))
+print(line)
def ProcessZipCodeCSV(file_name):
++ jigyosyo.zip ++
Binary files /var/tmp/diff_new_pack.iK3wPH/_old and
/var/tmp/diff_new_pack.iK3wPH/_new differ
++ ken_all.zip ++
Binary files /var/tmp/diff_new_pack.iK3wPH/_old and
/var/tmp/diff_new_pack.iK3wPH/_new differ
++ mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch ++
1039 lines (skipped)
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2020-06-02 14:37:18
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.3606 (New)
Package is "mozc"
Tue Jun 2 14:37:18 2020 rev:34 rq:810376 version:2.23.2815.102
Changes:
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes2020-04-27
23:32:02.182780511 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.3606/mozc.changes 2020-06-02
14:38:07.299423244 +0200
@@ -1,0 +2,6 @@
+Wed May 27 15:42:20 UTC 2020 - Fuminobu Takeyama
+
+- Remove third party files which are not distributed BSD-3-Clause
+ from the source tar.xz
+
+---
New:
make_archive.sh
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.7fK5ka/_old 2020-06-02 14:38:09.435429996 +0200
+++ /var/tmp/diff_new_pack.7fK5ka/_new 2020-06-02 14:38:09.435429996 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mozc
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -79,6 +79,8 @@
Patch: fcitx-mozc-2.23.2815.102.1.patch
Source21: fcitx-mozc-icons.tar.gz
%endif
+# A script for making a source tar.xz archive
+Source99: make_archive.sh
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
Patch1: ibus-provide-layout-variations.patch
@@ -195,6 +197,7 @@
tar xvf %{SOURCE5}
# protobuf
%if ! %{use_libprotobuf}
+mkdir protobuf
tar xvf %{SOURCE6} -C protobuf --strip-components 1
%endif
cd ../..
++ make_archive.sh ++
#!/bin/sh
version=2.23.2815.102
commit=afb03ddf
set -e
# git clone --depth=1 https://github.com/google/mozc.git
cd mozc
git archive --prefix=mozc-$version/ $commit | tar xC ../
cd ..
rm -r mozc-$version/src/third_party/*
rm -r mozc-$version/docker
tar --owner=0 --group=0 -cvJf mozc-$version.tar.xz mozc-$version++
mozc-2.23.2815.102.tar.xz ++
/work/SRC/openSUSE:Factory/mozc/mozc-2.23.2815.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new.3606/mozc-2.23.2815.102.tar.xz differ:
char 25, line 1
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2020-04-27 23:31:53
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.2738 (New)
Package is "mozc"
Mon Apr 27 23:31:53 2020 rev:33 rq:796234 version:2.23.2815.102
Changes:
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes2020-02-04
19:52:24.217288367 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new.2738/mozc.changes 2020-04-27
23:32:02.182780511 +0200
@@ -1,0 +2,6 @@
+Mon Apr 20 05:33:17 UTC 2020 - Cliff Zhao
+
+- Update mozc.spec: Drop the is_opensuse macro to eliminate in
+ behavior in between SLE-15 and openSUSE Leap (jsc#SLE-11737).
+
+---
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.djztbr/_old 2020-04-27 23:32:03.322782736 +0200
+++ /var/tmp/diff_new_pack.djztbr/_new 2020-04-27 23:32:03.322782736 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mozc
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020 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
@@ -17,9 +17,7 @@
%define with_fcitx 1
-%if !0%{?is_opensuse}
-%define with_fcitx 0
-%endif
+
%if %{with_fcitx}
%define fcitx_icon_dir %{_datadir}/fcitx/mozc/icon/
%define fcitx_addon_dir %{_datadir}/fcitx/addon/
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2020-02-04 19:52:01
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.26092 (New)
Package is "mozc"
Tue Feb 4 19:52:01 2020 rev:32 rq:769414 version:2.23.2815.102
Changes:
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes2019-04-23
14:36:20.649484421 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.26092/mozc.changes 2020-02-04
19:52:24.217288367 +0100
@@ -1,0 +2,20 @@
+Sun Feb 2 03:01:07 UTC 2020 - Fuminobu Takeyama
+
+- Upstream update to 2.23.2815
+ * Do not use mozc_renderer on Wayland session
+ * Support GYP_DEFINES='enable_gtk_renderer=0'
+ * Migrate from IBusConfig to GSetting in ibus_mozc
+ * Update dictionary
+ * Code refactoring
+- Update zip code dictionary to Jan. 2020
+- Update gyp
+ * to the version ready for Python 3
+- Update protobuf to 3.5.2
+- Update Fcitx Mozc
+ * Remove: fcitx-mozc-2.18.2612.102.1.patch
+ * Add: fcitx-mozc-2.23.2815.102.1.patch
+- Refresh patches
+ * add-Japanese-new-era-reiwa-to-date_rewriter.patch
+ * add-Japanese-new-era-reiwa-to-dict.patch
+
+---
Old:
fcitx-mozc-2.18.2612.102.1.patch
gyp-940a15e.tar.xz
mozc-2.18.2612.102.tar.xz
protobuf.tar.xz
New:
fcitx-mozc-2.23.2815.102.1.patch
gyp-e87d37d.tar.xz
mozc-2.23.2815.102.tar.xz
protobuf-v3.5.2.tar.gz
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.nXmxjK/_old 2020-02-04 19:52:26.321289594 +0100
+++ /var/tmp/diff_new_pack.nXmxjK/_new 2020-02-04 19:52:26.325289596 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mozc
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -34,16 +34,16 @@
%define use_libprotobuf 0
Name: mozc
-Version:2.18.2612.102
+Version:2.23.2815.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
ExcludeArch:ppc ppc64 s390 s390x
-Url:https://github.com/google/mozc
+URL:https://github.com/google/mozc
# git clone https://github.com/google/mozc.git
# cd mozc
-# git archive --prefix=mozc-$version/ 05464ea | tar xC ../
+# git archive --prefix=mozc-$version/ afb03ddf | tar xC ../
# rm mozc-$version/src/third_party/*
# rm mozc-$version/docker
# tar cvJf mozc-$version.tar.xz mozc-$version
@@ -53,7 +53,7 @@
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
# git clone https://chromium.googlesource.com/external/gyp
-Source3:gyp-940a15e.tar.xz
+Source3:gyp-e87d37d.tar.xz
#
Source4:ibus-setup-mozc-jp.desktop.in
#
@@ -64,12 +64,10 @@
# 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.1.0 | xz > ../protobuf.tar.xz
-Source6:protobuf.tar.xz
+# Use static protobuf, which is recommended when protobuf is used from a C++
application
+# Using protobuf >= 3.6 requires to update Mozc source
+# https://github.com/protocolbuffers/protobuf/archive/v3.5.2.tar.gz
+Source6:protobuf-v3.5.2.tar.gz
#
# jigyosyo.zip and ken_all.zip are zip-code--address data provided by
# Japan Post Co., Ltd.
@@ -80,7 +78,7 @@
%if %{with_fcitx}
# add fcitx as mozc module
# License: BSD-3-Clause
-Patch: fcitx-mozc-2.18.2612.102.1.patch
+Patch: fcitx-mozc-2.23.2815.102.1.patch
Source21: fcitx-mozc-icons.tar.gz
%endif
@@ -110,7 +108,6 @@
Patch12:add-Japanese-new-era-reiwa-ligature-to-dict.patch
BuildRequires: ninja >= 1.4
-BuildRequires: pkgconfig
%if %{use_libprotobuf}
BuildRequires: protobuf-devel
%endif
@@ -184,59 +181,65 @@
# extract fcitx-mozc
%if %{with_fcitx}
-%patch -p2
+%patch -p1
%endif
-%patch1 -p2
-%patch2 -p2
+%patch1 -p1
+%patch2 -p1
cp %{SOURCE1} .
# install third_party files
-pushd third_party
+cd src/third_party
# gyp
tar xvf %{SOURCE3}
# japanese_usage_dictionary
tar xvf %{SOURCE5}
# protobuf
%if ! %{use_libprotobuf}
-tar xvf %{SOURCE6}
+tar
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2019-04-23 14:36:14
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new.5536 (New)
Package is "mozc"
Tue Apr 23 14:36:14 2019 rev:31 rq:696785 version:2.18.2612.102
Changes:
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes2018-07-27
10:55:54.853608918 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new.5536/mozc.changes 2019-04-23
14:36:20.649484421 +0200
@@ -1,0 +2,9 @@
+Fri Apr 12 12:42:19 UTC 2019 - ft...@geeko.jp
+
+- update to support the Japanese new era, Reiwa (boo#1132450)
+ * add-Japanese-new-era-reiwa-ligature-to-dict.patch
+ * add-Japanese-new-era-reiwa-to-date_rewriter.patch
+ * add-Japanese-new-era-reiwa-to-dict.patch
+- update zip code dictionary
+
+---
New:
add-Japanese-new-era-reiwa-ligature-to-dict.patch
add-Japanese-new-era-reiwa-to-date_rewriter.patch
add-Japanese-new-era-reiwa-to-dict.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.FrCYhS/_old 2019-04-23 14:36:21.957485292 +0200
+++ /var/tmp/diff_new_pack.FrCYhS/_new 2019-04-23 14:36:21.961485295 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mozc
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -102,6 +102,12 @@
# PATCH-FIX-UPSTREAM ft...@geeko.jp
# fix build error with gcc 8.1
Patch9: gcc-8.1-ZeroQueryDict-iterator.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp
+Patch10:add-Japanese-new-era-reiwa-to-dict.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp
+Patch11:add-Japanese-new-era-reiwa-to-date_rewriter.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp
+Patch12:add-Japanese-new-era-reiwa-ligature-to-dict.patch
BuildRequires: ninja >= 1.4
BuildRequires: pkgconfig
@@ -206,6 +212,11 @@
%patch9 -p2
+# patches to support new Japanese era, Reiwa
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+
# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop
++ add-Japanese-new-era-reiwa-ligature-to-dict.patch ++
diff -ru mozc-2.18.2612.102/data/symbol/symbol.tsv
mozc-2.18.2612.102.mod/data/symbol/symbol.tsv
--- mozc-2.18.2612.102/data/symbol/symbol.tsv 2016-10-03 15:16:39.0
+0900
+++ mozc-2.18.2612.102.mod/data/symbol/symbol.tsv 2019-04-11
23:49:02.870950329 +0900
@@ -523,6 +523,7 @@
記号 ㊦ した げ丸下
記号 ㊧ ひだり 丸左
記号 ㊨ みぎ 丸右
+記号 ㋿ れいわ ねんごう年号 OTHER
記号 ㍻ へいせい ねんごう 年号 OTHER
記号 ㍼ しょうわ ねんごう 年号 OTHER
記号 ㍽ たいしょう ねんごう 年号 OTHER
diff -ru mozc-2.18.2612.102/data/unicode/UnicodeData.txt
mozc-2.18.2612.102.mod/data/unicode/UnicodeData.txt
--- mozc-2.18.2612.102/data/unicode/UnicodeData.txt 2016-10-03
15:16:39.0 +0900
+++ mozc-2.18.2612.102.mod/data/unicode/UnicodeData.txt 2019-04-12
00:15:46.083941218 +0900
@@ -11314,6 +11314,7 @@
32FC;CIRCLED KATAKANA WI;So;0;L; 30F0N;
32FD;CIRCLED KATAKANA WE;So;0;L; 30F1N;
32FE;CIRCLED KATAKANA WO;So;0;L; 30F2N;
+337B;SQUARE ERA NAME REIWA;So;0;L; 4EE4 548CN;SQUARED TWO
IDEOGRAPHS ERA NAME REIWA
3300;SQUARE APAATO;So;0;L; 30A2 30D1 30FC 30C8N;SQUARED APAATO
3301;SQUARE ARUHUA;So;0;L; 30A2 30EB 30D5 30A1N;SQUARED ARUHUA
3302;SQUARE ANPEA;So;0;L; 30A2 30F3 30DA 30A2N;SQUARED ANPEA
++ add-Japanese-new-era-reiwa-to-date_rewriter.patch ++
--- mozc-2.18.2612.102/rewriter/date_rewriter.cc.org2019-04-09
00:24:39.974142422 +0900
+++ mozc-2.18.2612.102/rewriter/date_rewriter.cc2019-04-09
00:36:30.557247652 +0900
@@ -1501,6 +1501,11 @@
1989,
"\xE5\xB9\xB3\xE6\x88\x90",
"\xE3\x81\xB8\xE3\x81\x84\xE3\x81\x9B\xE3\x81\x84",
+ }, {
+// "令和" "れいわ"
+2019,
+"\xE4\xBB\xA4\xE5\x92\x8C",
+"\xE3\x82\x8C\xE3\x81\x84\xE3\x82\x8F",
}
};
++ add-Japanese-new-era-reiwa-to-dict.patch ++
--- mozc-2.18.2612.102/data/dictionary_oss/dictionary08.txt.org 2019-04-09
00:18:08.744509535 +0900
+++ mozc-2.18.2612.102/data/dictionary_oss/dictionary08.txt 2019-04-09
00:21:16.293257093 +0900
@@ -16221,6 +16221,8 @@
れいれいと 12 12 7483れいれいと
れいろう 182718277266玲瓏
れいわ182718278158例話
+れいわ189518951690令和
+れいわ189818984000令和
れいんこーと 182718275714レインコート
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2018-07-27 10:55:54
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new (New)
Package is "mozc"
Fri Jul 27 10:55:54 2018 rev:30 rq:625309 version:2.18.2612.102
Changes:
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes2018-03-28
10:30:05.239837997 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2018-07-27
10:55:54.853608918 +0200
@@ -1,0 +2,6 @@
+Tue Jul 24 15:23:05 UTC 2018 - ft...@geeko.jp
+
+- add gcc-8.1-ZeroQueryDict-iterator.patch
+ * fix a build error with gcc 8
+
+---
New:
gcc-8.1-ZeroQueryDict-iterator.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.UcVqIl/_old 2018-07-27 10:55:55.921610962 +0200
+++ /var/tmp/diff_new_pack.UcVqIl/_new 2018-07-27 10:55:55.921610962 +0200
@@ -37,7 +37,7 @@
Version:2.18.2612.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
-License:BSD-3-Clause and SUSE-Public-Domain
+License:BSD-3-Clause AND SUSE-Public-Domain
Group: System/I18n/Japanese
ExcludeArch:ppc ppc64 s390 s390x
Url:https://github.com/google/mozc
@@ -99,6 +99,9 @@
# PATCH-FIX-UPSTREAM i...@marguerite.su
# fix python import error
Patch8: mozc-gen_zip_code_seed_py.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp
+# fix build error with gcc 8.1
+Patch9: gcc-8.1-ZeroQueryDict-iterator.patch
BuildRequires: ninja >= 1.4
BuildRequires: pkgconfig
@@ -201,6 +204,8 @@
%patch8 -p2
+%patch9 -p2
+
# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop
++ gcc-8.1-ZeroQueryDict-iterator.patch ++
diff --git a/src/prediction/zero_query_dict.h b/src/prediction/zero_query_dict.h
index c11aa24d..4eece4eb 100644
--- a/src/prediction/zero_query_dict.h
+++ b/src/prediction/zero_query_dict.h
@@ -132,6 +132,17 @@ class ZeroQueryDict {
return tmp;
}
+iterator () {
+ ptr_ -= kTokenByteSize;
+ return *this;
+}
+
+iterator operator--(int) {
+ const iterator tmp(ptr_, string_array_);
+ ptr_ -= kTokenByteSize;
+ return tmp;
+}
+
iterator +=(ptrdiff_t n) {
ptr_ += n * kTokenByteSize;
return *this;
commit mozc for openSUSE:Factory
Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2018-03-28 10:29:57 Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) Package is "mozc" Wed Mar 28 10:29:57 2018 rev:29 rq:590973 version:2.18.2612.102 Changes: --- /work/SRC/openSUSE:Factory/mozc/mozc.changes2016-12-06 14:26:42.0 +0100 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2018-03-28 10:30:05.239837997 +0200 @@ -1,0 +2,6 @@ +Mon Mar 26 01:03:31 CEST 2018 - r...@suse.de + +- add excludearch for ppc/ppc64/s390/s390x as the code assumes + little endian all over the place (bsc#1086763) + +--- Other differences: -- ++ mozc.spec ++ --- /var/tmp/diff_new_pack.5bVpcM/_old 2018-03-28 10:30:08.795710118 +0200 +++ /var/tmp/diff_new_pack.5bVpcM/_new 2018-03-28 10:30:08.803709830 +0200 @@ -1,7 +1,7 @@ # # spec file for package mozc # -# Copyright (c) 2016 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 @@ -39,7 +39,7 @@ Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux License:BSD-3-Clause and SUSE-Public-Domain Group: System/I18n/Japanese - +ExcludeArch:ppc ppc64 s390 s390x Url:https://github.com/google/mozc # git clone https://github.com/google/mozc.git # cd mozc
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2016-12-06 14:26:40
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.changes2016-08-29
15:45:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-12-06
14:26:42.0 +0100
@@ -1,0 +2,19 @@
+Sun Dec 4 15:22:30 UTC 2016 - i...@marguerite.su
+
+- update 2.18.2612.102
+ * fixed unexpected size bloat of the APK
+ * fixed duplicate candidates after undo
+ * fixed suggestion-only user dictionary entry may not work
+ * fixed abbreviation user dictionary entry may not work
+ * fixed suppression word may not work
+ * fixed single character noun user dictionary entry may not work
+- fcitx-mozc updated to 2.18.2612.102
+ * dropped patch: fcitx-mozc-2.17.2102.102.1.patch
+ * added patch: fcitx-mozc-2.18.2612.102.1.patch
+- protobuf updated to 3.1.0
+ * dropped patch: protobuf-atomic.patch, upstreamed
+ * dropped patch: protobuf-generic-atomic.patch, upstreamed
+- gyp updated to latest master@940a15e
+- added patch: mozc-gen_zip_code_seed_py.patch
+
+---
Old:
fcitx-mozc-2.17.2102.102.1.patch
gyp-20150628.tar.xz
mozc-2.17.2313.102.tar.xz
protobuf-atomic.patch
protobuf-generic-atomic.patch
New:
fcitx-mozc-2.18.2612.102.1.patch
gyp-940a15e.tar.xz
mozc-2.18.2612.102.tar.xz
mozc-gen_zip_code_seed_py.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.YA4Qxt/_old 2016-12-06 14:26:43.0 +0100
+++ /var/tmp/diff_new_pack.YA4Qxt/_new 2016-12-06 14:26:43.0 +0100
@@ -34,7 +34,7 @@
%define use_libprotobuf 0
Name: mozc
-Version:2.17.2313.102
+Version:2.18.2612.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License:BSD-3-Clause and SUSE-Public-Domain
@@ -43,8 +43,9 @@
Url:https://github.com/google/mozc
# git clone https://github.com/google/mozc.git
# cd mozc
-# git archive --prefix=mozc-$version/ 3306d33 | tar xC ../
+# git archive --prefix=mozc-$version/ 05464ea | tar xC ../
# rm mozc-$version/src/third_party/*
+# rm mozc-$version/docker
# tar cvJf mozc-$version.tar.xz mozc-$version
Source0:%{name}-%{version}.tar.xz
Source1:README.SUSE
@@ -52,7 +53,7 @@
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
# git clone https://chromium.googlesource.com/external/gyp
-Source3:gyp-20150628.tar.xz
+Source3:gyp-940a15e.tar.xz
#
Source4:ibus-setup-mozc-jp.desktop.in
#
@@ -67,7 +68,7 @@
# between GCC5 and LLVM
#
# git clone https://github.com/google/protobuf/
-# git archive --prefix protobuf/ v3.0.0-beta-2 | xz > ../protobuf.tar.xz
+# git archive --prefix protobuf/ v3.1.0 | xz > ../protobuf.tar.xz
Source6:protobuf.tar.xz
#
# jigyosyo.zip and ken_all.zip are zip-code--address data provided by
@@ -79,7 +80,7 @@
%if %{with_fcitx}
# add fcitx as mozc module
# License: BSD-3-Clause
-Patch: fcitx-mozc-2.17.2102.102.1.patch
+Patch: fcitx-mozc-2.18.2612.102.1.patch
Source21: fcitx-mozc-icons.tar.gz
%endif
@@ -88,10 +89,6 @@
# PATCH-FIX-UPSTREAM marguer...@opensuse.org
Patch2: mozc-ninja-verbose-build.patch
-# PATCH-FIX-UPSTREAM -
https://groups.google.com/forum/#!topic/protobuf/ZXxXR3uPAM4
-Patch4: protobuf-generic-atomic.patch
-Patch5: protobuf-atomic.patch
-
# PATCH-FIX-OPENSUSE ft...@geeko.jp
# workaround for the Qt5 bug (boo#947013)
Patch6: ibus-qt5-hide_preedit_text-workaround.patch
@@ -99,6 +96,10 @@
# PATCH-FIX-OPENSUSE mozc-build-gcc.patch bsc#990844 qz...@suse.com -- Portng
mozc-build-gcc.patch to force mozc build with gcc.
Patch7: mozc-build-gcc.patch
+# PATCH-FIX-UPSTREAM i...@marguerite.su
+# fix python import error
+Patch8: mozc-gen_zip_code_seed_py.patch
+
BuildRequires: ninja >= 1.4
BuildRequires: pkgconfig
%if %{use_libprotobuf}
@@ -157,8 +158,10 @@
%package gui-tools
Summary:GUI tools for mozc
Group: System/I18n/Japanese
-BuildRequires: libqt4-devel
BuildRequires: zinnia-devel
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
Requires: mozc = %{version}
Requires: zinnia
Requires: zinnia-tomoe
@@ -189,10 +192,6 @@
# protobuf
%if ! %{use_libprotobuf}
tar xvf %{SOURCE6}
-cd protobuf
-%patch4 -p1
-%patch5 -p1
-cd ..
%endif
popd
@@ -200,6 +199,8 @@
%patch7 -p1
+%patch8 -p2
+
# fix installation path
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2016-08-29 15:42:37
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.changes2016-08-05
18:17:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-08-29
15:45:51.0 +0200
@@ -1,0 +2,5 @@
+Tue Aug 23 02:14:40 UTC 2016 - mgo...@suse.com
+
+- Disable fcitx on SLE again.
+
+---
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.8C5jMt/_old 2016-08-29 15:45:55.0 +0200
+++ /var/tmp/diff_new_pack.8C5jMt/_new 2016-08-29 15:45:55.0 +0200
@@ -17,6 +17,9 @@
%define with_fcitx 1
+%if !0%{?is_opensuse}
+%define with_fcitx 0
+%endif
%if %{with_fcitx}
%define fcitx_icon_dir %{_datadir}/fcitx/mozc/icon/
%define fcitx_addon_dir %{_datadir}/fcitx/addon/
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2016-08-05 18:17:04
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.changes2016-07-30
00:27:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-08-05
18:17:10.0 +0200
@@ -1,0 +2,13 @@
+Tue Aug 2 12:54:33 UTC 2016 - ft...@geeko.jp
+
+- fix unnecessary "BuildRequires: protobuf-devel"
+
+---
+Fri Jul 29 14:13:39 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- remove ExcludeArch as related failure caused by workaround
+- remove workaround https://llvm.org/bugs/show_bug.cgi?id=22248
+ in spec as now using gcc not clang.
+ remove mozc-stack-protector.patch
+
+---
Old:
mozc-stack-protector.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.1yaJXM/_old 2016-08-05 18:17:12.0 +0200
+++ /var/tmp/diff_new_pack.1yaJXM/_new 2016-08-05 18:17:12.0 +0200
@@ -28,6 +28,7 @@
%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png
%define document_dir %{_docdir}/ibus-mozc
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
+%define use_libprotobuf 0
Name: mozc
Version:2.17.2313.102
@@ -84,9 +85,6 @@
# PATCH-FIX-UPSTREAM marguer...@opensuse.org
Patch2: mozc-ninja-verbose-build.patch
-# PATCH-FIX-OPENSUSE dval...@suse.com
-Patch3: mozc-stack-protector.patch
-
# PATCH-FIX-UPSTREAM -
https://groups.google.com/forum/#!topic/protobuf/ZXxXR3uPAM4
Patch4: protobuf-generic-atomic.patch
Patch5: protobuf-atomic.patch
@@ -100,17 +98,15 @@
BuildRequires: ninja >= 1.4
BuildRequires: pkgconfig
+%if %{use_libprotobuf}
BuildRequires: protobuf-devel
+%endif
BuildRequires: python
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# Exclude PowerPC and arm64 arches because no support in
-# third_party/protobuf/src/google/protobuf/stubs/ atomicops
-ExcludeArch:ppc ppc64 ppc64le aarch64
-
%description
Mozc is a Japanese Input Method Editor (IME) designed for
multi-platform such as Chromium OS, Mac and Linux. This open-source
@@ -178,9 +174,6 @@
%patch1 -p2
%patch2 -p2
-%ifarch ppc ppc64 ppc64le
-%patch3 -p1
-%endif
cp %{SOURCE1} .
@@ -191,11 +184,13 @@
# japanese_usage_dictionary
tar xvf %{SOURCE5}
# protobuf
+%if ! %{use_libprotobuf}
tar xvf %{SOURCE6}
cd protobuf
%patch4 -p1
%patch5 -p1
cd ..
+%endif
popd
%patch6 -p1
@@ -219,11 +214,8 @@
# -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp.
# gyp inserts -Wall to the head of release_extra_flags.
flags=${RPM_OPT_FLAGS/-Wall/}
-%ifarch ppc ppc64 ppc64le
-flags=${flags/-fstack-protector/}
-%endif
-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'"'
+export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path}
ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=%{use_libprotobuf}
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} \
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2016-07-30 00:27:47
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.changes2016-07-05
09:53:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-07-30
00:27:49.0 +0200
@@ -1,0 +2,6 @@
+Wed Jul 27 10:56:20 UTC 2016 - qz...@suse.com
+
+- Add mozc-build-gcc.patch, Force mozc build with gcc(g++).
+ Exclude PPC, PPC64, PPC64LE and AARCH64 build target.(bsc#990844)
+
+---
New:
mozc-build-gcc.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.Mzjir1/_old 2016-07-30 00:27:51.0 +0200
+++ /var/tmp/diff_new_pack.Mzjir1/_new 2016-07-30 00:27:51.0 +0200
@@ -95,7 +95,9 @@
# workaround for the Qt5 bug (boo#947013)
Patch6: ibus-qt5-hide_preedit_text-workaround.patch
-BuildRequires: llvm-clang
+# PATCH-FIX-OPENSUSE mozc-build-gcc.patch bsc#990844 qz...@suse.com -- Portng
mozc-build-gcc.patch to force mozc build with gcc.
+Patch7: mozc-build-gcc.patch
+
BuildRequires: ninja >= 1.4
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
@@ -105,9 +107,9 @@
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# Exclude PowerPC arches because no support in
+# Exclude PowerPC and arm64 arches because no support in
# third_party/protobuf/src/google/protobuf/stubs/ atomicops
-#ExcludeArch:ppc ppc64 ppc64le
+ExcludeArch:ppc ppc64 ppc64le aarch64
%description
Mozc is a Japanese Input Method Editor (IME) designed for
@@ -198,6 +200,8 @@
%patch6 -p1
+%patch7 -p1
+
# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop
++ mozc-build-gcc.patch ++
diff -pruN mozc-2.17.2077.102.orig/gyp/common.gypi
mozc-2.17.2077.102/gyp/common.gypi
--- mozc-2.17.2077.102.orig/gyp/common.gypi 2015-04-28 18:17:51.0
+0900
+++ mozc-2.17.2077.102/gyp/common.gypi 2015-04-30 10:28:20.122718394 +0900
@@ -161,9 +161,9 @@
['target_platform=="Linux"', {
# enable_gtk_renderer represents if mozc_renderer is supported on Linux
# or not.
-'compiler_target': 'clang',
+'compiler_target': 'gcc',
'compiler_target_version_int': 304, # Clang 3.4 or higher
-'compiler_host': 'clang',
+'compiler_host': 'gcc',
'compiler_host_version_int': 304, # Clang 3.4 or higher
'enable_gtk_renderer%': 1,
}, { # else
@@ -885,8 +885,8 @@
['target_platform=="Linux"', {
'make_global_settings': [
['AR', '
commit mozc for openSUSE:Factory
Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2016-07-05 09:52:52 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.changes2016-04-22 16:22:59.0 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-07-05 09:53:04.0 +0200 @@ -1,0 +2,5 @@ +Sat Jul 2 15:49:12 UTC 2016 - ft...@geeko.jp + +- Update Japanese zip code / address table (June 2016) + +--- Other differences: -- ++ jigyosyo.zip ++ Files /var/tmp/diff_new_pack.sM5RLC/_old and /var/tmp/diff_new_pack.sM5RLC/_new differ ++ ken_all.zip ++ Files /var/tmp/diff_new_pack.sM5RLC/_old and /var/tmp/diff_new_pack.sM5RLC/_new differ
commit mozc for openSUSE:Factory
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.changes2015-10-19
22:49:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-04-22
16:22:59.0 +0200
@@ -1,0 +2,12 @@
+Tue Mar 8 14:52:16 UTC 2016 - ft...@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.0 +0200
+++ /var/tmp/diff_new_pack.JD1YB0/_new 2016-04-22 16:23:01.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.JD1YB0/_new 2016-04-22 16:23:01.0 +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
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2015-10-19 22:49:13
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.changes2015-10-06
13:25:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-10-19
22:49:15.0 +0200
@@ -1,0 +2,17 @@
+Fri Oct 9 02:27:06 UTC 2015 - liujianfeng1...@gmail.com
+
+- Upstream update to 2.17.2123.102
+ * Update system dictionary
+ * Support rule-based zero query suggestion in 2.16.2080.102
+ * GYP repository is switched from code.google.com to
chromium.googlesource.com
+ * Fix: ibus predict window is shown at the previous cursor position
+ * Fix: Preedit and candidate changes buffer modification flag
+ * Fix a typo
+ * Fix: Possible build failure due to missing dependency on commands_proto
from key_info_util
+ * Fix: ibus-mozc should enable undo-commit if and only if
IBUS_CAP_SURROUNDING_TEXT is set
+ * ibus-mozc no longer tries to align suggestion window to the left edge of
the composing text
+- add fcitx-mozc-2.17.2102.102.1.patch
+- remove fcitx-mozc-2.16.2037.102.2.patch
+- Specify GYP_DEFINES="use_libzinnia=1" to link to system-installed Zinnia
+
+---
Old:
fcitx-mozc-2.16.2037.102.2.patch
mozc-2.16.2037.102.tar.xz
New:
fcitx-mozc-2.17.2102.102.1.patch
mozc-2.17.2123.102.tar.xz
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.OqDQTN/_old 2015-10-19 22:49:17.0 +0200
+++ /var/tmp/diff_new_pack.OqDQTN/_new 2015-10-19 22:49:17.0 +0200
@@ -30,7 +30,7 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:2.16.2037.102
+Version:2.17.2123.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License:BSD-3-Clause and SUSE-Public-Domain
@@ -62,7 +62,7 @@
%if %{with_fcitx}
# add fcitx as mozc module
# License: BSD-3-Clause
-Patch: fcitx-mozc-2.16.2037.102.2.patch
+Patch: fcitx-mozc-2.17.2102.102.1.patch
Source21: fcitx-mozc-icons.tar.gz
%endif
@@ -204,7 +204,7 @@
flags=${flags/-fstack-protector/}
%endif
-export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path}
ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=0
document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path}
release_extra_cflags="'$flags'"'
+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} \
++ fcitx-mozc-2.16.2037.102.2.patch -> fcitx-mozc-2.17.2102.102.1.patch
++
634 lines (skipped)
between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-2.16.2037.102.2.patch
and /work/SRC/openSUSE:Factory/.mozc.new/fcitx-mozc-2.17.2102.102.1.patch
++ mozc-2.16.2037.102.tar.xz -> mozc-2.17.2123.102.tar.xz ++
/work/SRC/openSUSE:Factory/mozc/mozc-2.16.2037.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new/mozc-2.17.2123.102.tar.xz differ: char 26,
line 1
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2015-10-06 13:25:28
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.changes2015-08-19
09:29:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-10-06
13:25:30.0 +0200
@@ -1,0 +2,8 @@
+Tue Sep 22 14:36:03 UTC 2015 - ft...@geeko.jp
+
+- Fix ibus-mozc does not allow to remove tha last character
+ of preedit text on Qt5 application
+ * workaround for the Qt5 bug (boo#947013)
+ * Add ibus-qt5-hide_preedit_text-workaround.patch
+
+---
New:
ibus-qt5-hide_preedit_text-workaround.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.47fRdx/_old 2015-10-06 13:25:32.0 +0200
+++ /var/tmp/diff_new_pack.47fRdx/_new 2015-10-06 13:25:32.0 +0200
@@ -78,6 +78,10 @@
Patch4: protobuf-generic-atomic.patch
Patch5: protobuf-atomic.patch
+# PATCH-FIX-OPENSUSE ft...@geeko.jp
+# workaround for the Qt5 bug (boo#947013)
+Patch6: ibus-qt5-hide_preedit_text-workaround.patch
+
BuildRequires: llvm-clang
BuildRequires: ninja >= 1.4
BuildRequires: pkgconfig
@@ -177,6 +181,8 @@
cd ..
popd
+%patch6 -p1
+
# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} > ibus-setup-mozc-jp.desktop
++ ibus-qt5-hide_preedit_text-workaround.patch ++
--- mozc-2.16.2037.102/unix/ibus/preedit_handler.cc.org 2015-03-04
15:36:31.902548226 +0900
+++ mozc-2.16.2037.102/unix/ibus/preedit_handler.cc 2015-09-22
23:14:48.097972613 +0900
@@ -123,13 +123,12 @@ PreeditHandler::~PreeditHandler() {
bool PreeditHandler::Update(IBusEngine *engine,
const commands::Output ) {
- if (!output.has_preedit()) {
-ibus_engine_hide_preedit_text(engine);
-return true;
- }
+ // Send an empty IBusText if has_preedit() is false
+ // because Qt5 does not support hide_preedit_text
IBusText *text = ComposePreeditText(output.preedit());
ibus_engine_update_preedit_text_with_mode(engine, text, CursorPos(output),
-TRUE, IBUS_ENGINE_PREEDIT_COMMIT);
+output.has_preedit(),
+IBUS_ENGINE_PREEDIT_COMMIT);
// |text| is released by ibus_engine_update_preedit_text.
return true;
}
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2015-08-19 09:29:40
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.changes2015-08-14
14:47:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-08-19
09:29:43.0 +0200
@@ -1,0 +2,9 @@
+Mon Aug 17 12:51:02 UTC 2015 - dval...@suse.com
+
+- Enable PowerPC builds.
+ * Add generic atomics on Power (protobuf-generic-atomic.patch ,
+protobuf-atomic.patch)
+ * Workaround llvm bug https://llvm.org/bugs/show_bug.cgi?id=22248
+ (mozc-stack-protector.patch)
+
+---
New:
mozc-stack-protector.patch
protobuf-atomic.patch
protobuf-generic-atomic.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.AbNbJm/_old 2015-08-19 09:29:45.0 +0200
+++ /var/tmp/diff_new_pack.AbNbJm/_new 2015-08-19 09:29:45.0 +0200
@@ -71,6 +71,13 @@
# PATCH-FIX-UPSTREAM marguer...@opensuse.org
Patch2: mozc-ninja-verbose-build.patch
+# PATCH-FIX-OPENSUSE dval...@suse.com
+Patch3: mozc-stack-protector.patch
+
+# PATCH-FIX-UPSTREAM -
https://groups.google.com/forum/#!topic/protobuf/ZXxXR3uPAM4
+Patch4: protobuf-generic-atomic.patch
+Patch5: protobuf-atomic.patch
+
BuildRequires: llvm-clang
BuildRequires: ninja = 1.4
BuildRequires: pkgconfig
@@ -83,7 +90,7 @@
# Exclude PowerPC arches because no support in
# third_party/protobuf/src/google/protobuf/stubs/ atomicops
-ExcludeArch:ppc ppc64 ppc64le
+#ExcludeArch:ppc ppc64 ppc64le
%description
Mozc is a Japanese Input Method Editor (IME) designed for
@@ -152,6 +159,9 @@
%patch1 -p0
%patch2 -p1
+%ifarch ppc ppc64 ppc64le
+%patch3 -p1
+%endif
cp %{SOURCE1} .
@@ -161,6 +171,10 @@
tar xvf %{SOURCE3}
# japanese_usage_dictionary
tar xvf %{SOURCE5}
+cd protobuf
+%patch4 -p1
+%patch5 -p1
+cd ..
popd
# fix installation path
@@ -180,6 +194,9 @@
# -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp.
# gyp inserts -Wall to the head of release_extra_flags.
flags=${RPM_OPT_FLAGS/-Wall/}
+%ifarch ppc ppc64 ppc64le
+flags=${flags/-fstack-protector/}
+%endif
export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path}
ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=0
document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path}
release_extra_cflags='$flags''
++ mozc-stack-protector.patch ++
Index: mozc-2.16.2037.102/gyp/common.gypi
===
--- mozc-2.16.2037.102.orig/gyp/common.gypi
+++ mozc-2.16.2037.102/gyp/common.gypi
@@ -89,7 +89,6 @@
'linux_cflags': [
'@(gcc_cflags)',
'-fno-omit-frame-pointer',
- '-fstack-protector',
'--param=ssp-buffer-size=4',
],
# nacl_cflags will be used for NaCl.
++ protobuf-atomic.patch ++
From 17037a67bae85385a6f98273a824fb9350f8ccaa Mon Sep 17 00:00:00 2001
From: sangameshs small...@in.ibm.com
Date: Thu, 10 Jul 2014 08:09:22 -0500
Subject: [PATCH] File atomicops_internals_generic_gcc.h
---
.../stubs/atomicops_internals_generic_gcc.h| 139 +
1 file changed, 139 insertions(+)
create mode 100644 src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
diff --git a/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
new file mode 100644
index 000..3fc2a9b
--- /dev/null
+++ b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
@@ -0,0 +1,139 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2013 Red Hat Inc. All rights reserved.
+// http://code.google.com/p/protobuf/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+// * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+// * Neither the name of Red Hat Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES,
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2015-08-14 14:47:00
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.changes2015-06-30
10:18:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-08-14
14:47:01.0 +0200
@@ -1,0 +2,6 @@
+Thu Aug 13 16:45:01 UTC 2015 - norm...@linux.vnet.ibm.com
+
+- ExcludeArch ppc ppc64 ppc64le because no support in
+ third_party/protobuf/src/google/protobuf/stubs/ atomicops
+
+---
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.0lJo7s/_old 2015-08-14 14:47:02.0 +0200
+++ /var/tmp/diff_new_pack.0lJo7s/_new 2015-08-14 14:47:02.0 +0200
@@ -81,6 +81,10 @@
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# Exclude PowerPC arches because no support in
+# third_party/protobuf/src/google/protobuf/stubs/ atomicops
+ExcludeArch:ppc ppc64 ppc64le
+
%description
Mozc is a Japanese Input Method Editor (IME) designed for
multi-platform such as Chromium OS, Mac and Linux. This open-source
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2015-06-30 10:18:55
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.changes2015-03-05
18:17:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-06-30
10:18:56.0 +0200
@@ -1,0 +2,9 @@
+Sun Jun 28 09:32:07 UTC 2015 - i...@marguerite.su
+
+- add fcitx-mozc-2.16.2037.102.2.patch
+- add mozc-ninja-verbose-build.patch
+- update gyp 20150628
+- use-libprotobuf=0 for internal protobuf to workaround system
+ one's symbol undefined errors caused by gcc-5
+
+---
Old:
fcitx-mozc-20140713.tar.bz2
gyp-r2012.tar.xz
New:
fcitx-mozc-2.16.2037.102.2.patch
gyp-20150628.tar.xz
mozc-ninja-verbose-build.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.Qb9YoS/_old 2015-06-30 10:18:57.0 +0200
+++ /var/tmp/diff_new_pack.Qb9YoS/_new 2015-06-30 10:18:57.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mozc
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -43,8 +43,8 @@
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
-# svn export http://gyp.googlecode.com/svn/trunk/@r2012 gyp
-Source3:gyp-r2012.tar.xz
+# git clone https://chromium.googlesource.com/external/gyp
+Source3:gyp-20150628.tar.xz
#
Source4:ibus-setup-mozc-jp.desktop.in
#
@@ -62,14 +62,16 @@
%if %{with_fcitx}
# add fcitx as mozc module
# License: BSD-3-Clause
-Source20: fcitx-mozc-20140713.tar.bz2
+Patch: fcitx-mozc-2.16.2037.102.2.patch
Source21: fcitx-mozc-icons.tar.gz
%endif
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
-Patch3: ibus-provide-layout-variations.patch
-
+Patch1: ibus-provide-layout-variations.patch
+# PATCH-FIX-UPSTREAM marguer...@opensuse.org
+Patch2: mozc-ninja-verbose-build.patch
+BuildRequires: llvm-clang
BuildRequires: ninja = 1.4
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
@@ -77,7 +79,6 @@
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
-BuildRequires: llvm-clang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -140,7 +141,13 @@
%prep
%setup -q
-%patch3 -p0
+# extract fcitx-mozc
+%if %{with_fcitx}
+%patch -p2
+%endif
+
+%patch1 -p0
+%patch2 -p1
cp %{SOURCE1} .
@@ -152,13 +159,6 @@
tar xvf %{SOURCE5}
popd
-# extract fcitx-mozc
-%if %{with_fcitx}
-pushd unix
-tar xvf %{SOURCE20}
-popd
-%endif
-
# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} ibus-setup-mozc-jp.desktop
@@ -177,7 +177,7 @@
# gyp inserts -Wall to the head of release_extra_flags.
flags=${RPM_OPT_FLAGS/-Wall/}
-export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path}
ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=1
document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path}
release_extra_cflags='$flags''
+export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path}
ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=0
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} \
++ fcitx-mozc-2.16.2037.102.2.patch ++
3951 lines (skipped)
++ gyp-r2012.tar.xz - gyp-20150628.tar.xz ++
11421 lines of diff (skipped)
++ mozc-ninja-verbose-build.patch ++
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
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']
RunOrDie([make_command] + build_args + target_names)
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2015-03-05 15:42:56
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.changes2015-01-22
21:50:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-03-05
18:17:07.0 +0100
@@ -1,0 +2,6 @@
+Wed Mar 4 07:54:57 UTC 2015 - liujianfeng1...@gmail.com
+
+- Upstream update to 2.16.2037.102
+ * Fix: Inconsistency between suggestion candidates and conversion candidates
+ * add llvm-clang as build dependence
+---
Old:
mozc-2.16.2020.102.tar.xz
New:
mozc-2.16.2037.102.tar.xz
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.wQaFIW/_old 2015-03-05 18:17:08.0 +0100
+++ /var/tmp/diff_new_pack.wQaFIW/_new 2015-03-05 18:17:08.0 +0100
@@ -30,14 +30,14 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:2.16.2020.102
+Version:2.16.2037.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/@r486 mozc
+# svn export http://mozc.googlecode.com/svn/trunk/src/@r510 mozc
Source0:%{name}-%{version}.tar.xz
Source1:README.SUSE
@@ -77,6 +77,7 @@
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
+BuildRequires: llvm-clang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++ mozc-2.16.2020.102.tar.xz - mozc-2.16.2037.102.tar.xz ++
/work/SRC/openSUSE:Factory/mozc/mozc-2.16.2020.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new/mozc-2.16.2037.102.tar.xz differ: char 26,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2015-01-22 21:49:42
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.changes2014-12-30
00:50:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-01-22
21:50:25.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan 22 11:36:24 UTC 2015 - liujianfeng1...@gmail.com
+
+- Upstream update to 2.16.2020.102
+ * Fix Noisy candidate itsumo due to language aware conversion
+ * Fix AssertionError in gen_zip_code_seed.py
+---
Old:
mozc-2.16.2003.102.tar.xz
New:
mozc-2.16.2020.102.tar.xz
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.dNHVJc/_old 2015-01-22 21:50:26.0 +0100
+++ /var/tmp/diff_new_pack.dNHVJc/_new 2015-01-22 21:50:26.0 +0100
@@ -30,14 +30,14 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:2.16.2003.102
+Version:2.16.2020.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/@r463 mozc
+# svn export http://mozc.googlecode.com/svn/trunk/src/@r486 mozc
Source0:%{name}-%{version}.tar.xz
Source1:README.SUSE
++ mozc-2.16.2003.102.tar.xz - mozc-2.16.2020.102.tar.xz ++
/work/SRC/openSUSE:Factory/mozc/mozc-2.16.2003.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new/mozc-2.16.2020.102.tar.xz differ: char 25,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2014-12-30 00:49: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.changes2014-12-22
12:52:54.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2014-12-30
00:50:14.0 +0100
@@ -1,0 +2,10 @@
+Sun Dec 28 14:01:58 UTC 2014 - liujianfeng1...@gmail.com
+
+- Upstream update to 2.16.2003.102
+ * Updated main dictionary, Emoji dictionary, emoticon dictionary, and single
kanji dictionary
+ * Fix IME crashes when using US International hardware keyboard
+ * Fix ibus-mozc + XIM: preedit text is not cleared after preedit commit
triggered by focus change
+ * Fix An empty word can be suggested in the candidate list
+- Remove boo906143-revert-session.patch: Merged by upstream
+- Update gyp to r2012
+---
Old:
boo906143-revert-session.patch
gyp-r1957.tar.xz
mozc-1.15.1917.102.tar.xz
New:
gyp-r2012.tar.xz
mozc-2.16.2003.102.tar.xz
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.TcxjjW/_old 2014-12-30 00:50:19.0 +0100
+++ /var/tmp/diff_new_pack.TcxjjW/_new 2014-12-30 00:50:19.0 +0100
@@ -30,21 +30,21 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:1.15.1917.102
+Version:2.16.2003.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/@r318 mozc
+# svn export http://mozc.googlecode.com/svn/trunk/src/@r463 mozc
Source0:%{name}-%{version}.tar.xz
Source1:README.SUSE
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
-# svn export http://gyp.googlecode.com/svn/trunk/@r1957 gyp
-Source3:gyp-r1957.tar.xz
+# svn export http://gyp.googlecode.com/svn/trunk/@r2012 gyp
+Source3:gyp-r2012.tar.xz
#
Source4:ibus-setup-mozc-jp.desktop.in
#
@@ -69,8 +69,6 @@
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
Patch3: ibus-provide-layout-variations.patch
-# PATCH-FIX-UPSTREAM ft...@geeko.jp
-Patch30:boo906143-revert-session.patch
BuildRequires: ninja = 1.4
BuildRequires: pkgconfig
@@ -142,7 +140,6 @@
%setup -q
%patch3 -p0
-%patch30 -p1
cp %{SOURCE1} .
++ gyp-r1957.tar.xz - gyp-r2012.tar.xz ++
8350 lines of diff (skipped)
++ mozc-1.15.1917.102.tar.xz - mozc-2.16.2003.102.tar.xz ++
/work/SRC/openSUSE:Factory/mozc/mozc-1.15.1917.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new/mozc-2.16.2003.102.tar.xz differ: char 25,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2014-12-22 12:54:18
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.changes2014-12-03
22:48:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2014-12-22
12:52:54.0 +0100
@@ -1,0 +2,6 @@
+Thu Dec 18 15:23:06 UTC 2014 - ft...@geeko.jp
+
+- Add boo906143-revert-session.patch
+ * Fix pre-edit is not reset after focus lost (boo#906143)
+
+---
New:
boo906143-revert-session.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.SCJs4U/_old 2014-12-22 12:52:55.0 +0100
+++ /var/tmp/diff_new_pack.SCJs4U/_new 2014-12-22 12:52:55.0 +0100
@@ -69,6 +69,9 @@
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
Patch3: ibus-provide-layout-variations.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp
+Patch30:boo906143-revert-session.patch
+
BuildRequires: ninja = 1.4
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
@@ -139,6 +142,7 @@
%setup -q
%patch3 -p0
+%patch30 -p1
cp %{SOURCE1} .
++ boo906143-revert-session.patch ++
Index: src/unix/ibus/mozc_engine.cc
===
--- src/unix/ibus/mozc_engine.cc(リビジョン 385)
+++ src/unix/ibus/mozc_engine.cc(リビジョン 386)
@@ -335,9 +335,14 @@
GetCandidateWindowHandler(engine)-Hide(engine);
property_handler_-ResetContentType(engine);
- // Do not call SubmitSession or RevertSession. Preedit string will commit on
- // Focus Out event automatically by ibus_engine_update_preedit_text_with_mode
- // which called in UpdatePreedit method.
+ // Note that the preedit string (if any) will be committed by IBus runtime
+ // because we are specifying |IBUS_ENGINE_PREEDIT_COMMIT| flag to
+ // |ibus_engine_update_preedit_text_with_mode|. All we need to do here is
+ // simply resetting the current session in case there is a non-empty
+ // preedit text. Note that |RevertSession| is supposed to do nothing when
+ // there is no preedit text.
+ // See https://code.google.com/p/mozc/issues/detail?id=255 for details.
+ RevertSession(engine);
SyncData(false);
}
@@ -668,6 +673,8 @@
}
void MozcEngine::RevertSession(IBusEngine *engine) {
+ // TODO(team): We should skip following actions when there is no on-going
+ // omposition.
commands::SessionCommand command;
command.set_type(commands::SessionCommand::REVERT);
commands::Output output;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2014-12-03 22:47:53
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.changes2014-09-03
20:25:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2014-12-03
22:48:13.0 +0100
@@ -1,0 +2,8 @@
+Mon Dec 1 07:36:17 UTC 2014 - liujianfeng1...@gmail.com
+
+- Upstream update to 1.15.1917.102
+ * Fix Warning message from keymap editor should be updated
+- Upstream update to 1.15.1895.102
+ * Fix Partial suggestion for numbers are not annotated by 部分確定
+
+---
Old:
mozc-1.15.1868.102.tar.xz
New:
mozc-1.15.1917.102.tar.xz
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.OwDcIO/_old 2014-12-03 22:48:15.0 +0100
+++ /var/tmp/diff_new_pack.OwDcIO/_new 2014-12-03 22:48:15.0 +0100
@@ -30,7 +30,7 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:1.15.1868.102
+Version:1.15.1917.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License:BSD-3-Clause and SUSE-Public-Domain
++ mozc-1.15.1868.102.tar.xz - mozc-1.15.1917.102.tar.xz ++
/work/SRC/openSUSE:Factory/mozc/mozc-1.15.1868.102.tar.xz
/work/SRC/openSUSE:Factory/.mozc.new/mozc-1.15.1917.102.tar.xz differ: char 26,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2014-09-03 18:22:39
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.changes2014-06-24
15:16:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2014-09-03
20:25:39.0 +0200
@@ -1,0 +2,18 @@
+Sun Aug 31 04:28:41 UTC 2014 - ft...@geeko.jp
+
+- Upstream update to 1.15.1868.102
+ * Fix 'Set input mode to X' commands do not work
+during Direct Input mode
+- Upstream update to 1.15.1856.102
+ * Several internal changes and changes for other platforms
+- Upstream update to 1.15.1834.102
+ * Use Ninja for building
+- Upstream update to 1.15.1814.102
+ * Fix wring key mapping for Numpad-End in mozc.el
+ * Fix dropping candidats unexpectedly
+ * Fix preceding text is not correctly extracted by ibus-mozc
+ * Fix undo-commit (MS IME keybind) is not functional in ibus-mozc
+- Update fcitx-mozc
+- Update gyp to r1957
+
+---
Old:
fcitx-mozc.tar.bz2
gyp-r1829.tar.bz2
mozc-1.15.1785.102.tar.bz2
New:
fcitx-mozc-20140713.tar.bz2
gyp-r1957.tar.xz
japanese_usage_dictionary-r10.tar.xz
mozc-1.15.1868.102.tar.xz
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.BBo1Uv/_old 2014-09-03 20:25:41.0 +0200
+++ /var/tmp/diff_new_pack.BBo1Uv/_new 2014-09-03 20:25:41.0 +0200
@@ -30,34 +30,46 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:1.15.1785.102
+Version:1.15.1868.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
-Source0:%{name}-%{version}.tar.bz2
+# svn export http://mozc.googlecode.com/svn/trunk/src/@r318 mozc
+Source0:%{name}-%{version}.tar.xz
Source1:README.SUSE
+
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
-# svn export http://gyp.googlecode.com/svn/trunk/@r1829 gyp
-Source3:gyp-r1829.tar.bz2
+# svn export http://gyp.googlecode.com/svn/trunk/@r1957 gyp
+Source3:gyp-r1957.tar.xz
+#
Source4:ibus-setup-mozc-jp.desktop.in
+#
+# svn export http://japanese-usage-dictionary.googlecode.com/svn/trunk/@r10
+# japanese-usage-dictionary
+# License: BSD-2-Clause
+Source5:japanese_usage_dictionary-r10.tar.xz
+#
# jigyosyo.zip and ken_all.zip are zip-code--address data provided by
# Japan Post Co., Ltd.
# License: SUSE-Public-Domain
Source10: jigyosyo.zip
Source11: ken_all.zip
+#
%if %{with_fcitx}
# add fcitx as mozc module
# License: BSD-3-Clause
-Source20: fcitx-mozc.tar.bz2
+Source20: fcitx-mozc-20140713.tar.bz2
Source21: fcitx-mozc-icons.tar.gz
%endif
+
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
Patch3: ibus-provide-layout-variations.patch
+BuildRequires: ninja = 1.4
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
BuildRequires: python
@@ -130,9 +142,12 @@
cp %{SOURCE1} .
-# extract gyp
+# install third_party files
pushd third_party
+# gyp
tar xvf %{SOURCE3}
+# japanese_usage_dictionary
+tar xvf %{SOURCE5}
popd
# extract fcitx-mozc
@@ -142,6 +157,7 @@
popd
%endif
+# fix installation path
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} ibus-setup-mozc-jp.desktop
# prepare zip code dictionary
@@ -162,7 +178,6 @@
export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path}
ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=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_tools -c %{target} %{?_smp_mflags}
python build_mozc.py build -c %{target} %{?_smp_mflags} \
unix/ibus/ibus.gyp:ibus_mozc \
%if %{with_fcitx}
@@ -180,9 +195,8 @@
install -m755 -d %{buildroot}%{_libdir}/ibus-mozc
install -m755 %{output_dir}/ibus_mozc
%{buildroot}%{_libdir}/ibus-mozc/ibus-engine-mozc
install -m755 -d %{buildroot}%{_datadir}/ibus/component
-install -m644 %{output_dir}/obj/gen/unix/ibus/mozc.xml
%{buildroot}%{_datadir}/ibus/component/mozc.xml
+install -m644 %{output_dir}/gen/unix/ibus/mozc.xml
%{buildroot}%{_datadir}/ibus/component/mozc.xml
install -m755 -d %{buildroot}%{_datadir}/ibus-mozc
-#{__install} -m755 -d %{buildroot}%{_datadir}/ibus-mozc/setup
install -m644 data/images/unix/ime_product_icon_opensource-32.png
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2014-06-24 15:16:15
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.changes2014-01-16
15:12:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2014-06-24
15:16:31.0 +0200
@@ -1,0 +2,9 @@
+Thu Jun 12 14:48:55 UTC 2014 - ft...@geeko.jp
+
+- Upstream update to 1.15.1785.102
+ * Change fcitx-mozc-1.13.1651.102.1.patch to a tar.bz2 archive
+ * Fix wrong event handling in emacs-mozc and improve LEIM support
+- Drop fix-initial-input-mode.patch
+ * merged by upstream
+
+---
Old:
fcitx-mozc-1.13.1651.102.1.patch
fix-initial-input-mode.patch
mozc-1.13.1651.102.tar.bz2
New:
fcitx-mozc.tar.bz2
mozc-1.15.1785.102.tar.bz2
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.nYf9HT/_old 2014-06-24 15:16:33.0 +0200
+++ /var/tmp/diff_new_pack.nYf9HT/_new 2014-06-24 15:16:33.0 +0200
@@ -30,7 +30,7 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:1.13.1651.102
+Version:1.15.1785.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License:BSD-3-Clause and SUSE-Public-Domain
@@ -39,7 +39,6 @@
Url:http://code.google.com/p/mozc
Source0:%{name}-%{version}.tar.bz2
Source1:README.SUSE
-Source2:fcitx-mozc-icons.tar.gz
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
# svn export http://gyp.googlecode.com/svn/trunk/@r1829 gyp
@@ -51,15 +50,14 @@
Source10: jigyosyo.zip
Source11: ken_all.zip
%if %{with_fcitx}
-# PATCH-FEATURE-UPSTREAM i...@marguerite.su - add fcitx as mozc module
-Patch0: fcitx-mozc-1.13.1651.102.1.patch
+# add fcitx as mozc module
+# License: BSD-3-Clause
+Source20: fcitx-mozc.tar.bz2
+Source21: fcitx-mozc-icons.tar.gz
%endif
-# PATCH-FIX-UPSTREAM ft...@geeko.jp
-Patch2: fix-initial-input-mode.patch
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
Patch3: ibus-provide-layout-variations.patch
-BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
BuildRequires: python
@@ -127,11 +125,7 @@
%prep
%setup -q
-%if %{with_fcitx}
-%patch0 -p2
-%endif
-%patch2 -p0
%patch3 -p0
cp %{SOURCE1} .
@@ -141,6 +135,13 @@
tar xvf %{SOURCE3}
popd
+# extract fcitx-mozc
+%if %{with_fcitx}
+pushd unix
+tar xvf %{SOURCE20}
+popd
+%endif
+
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} ibus-setup-mozc-jp.desktop
# prepare zip code dictionary
@@ -232,7 +233,7 @@
install -m 644 data/images/unix/ui-tool.png
%{buildroot}%{fcitx_icon_dir}/mozc-tool.png
# fix mozc icons. they're too ugly that even lose face for openSUSE.
-cp -r %{SOURCE2} ./
+cp -r %{SOURCE21} ./
tar -xzf fcitx-mozc-icons.tar.gz
cp -r fcitx-mozc-icons/* %{buildroot}%{fcitx_icon_dir}/
rm -rf fcitx-mozc-icons
++ mozc-1.13.1651.102.tar.bz2 - mozc-1.15.1785.102.tar.bz2 ++
/work/SRC/openSUSE:Factory/mozc/mozc-1.13.1651.102.tar.bz2
/work/SRC/openSUSE:Factory/.mozc.new/mozc-1.15.1785.102.tar.bz2 differ: char
11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2014-01-16 15:12:11
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.changes2013-11-04
15:38:07.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2014-01-16
15:12:13.0 +0100
@@ -1,0 +2,30 @@
+Fri Jan 10 11:01:01 UTC 2014 - ft...@geeko.jp
+
+- Enable the zip-code dictionary feature
+
+---
+Wed Jan 8 11:30:39 UTC 2014 - ft...@geeko.jp
+
+- Upstream update to 1.13.1651.102
+ * Refactor placeholder management
+ * Fix specify _NET_WM_WINDOW_TYPE to mozc_renderer
+ * Fix header-line-format breaks candidate window on Emacs 24
+- Upstream update to 1.12.1599.102
+ * Fix Wrong conversion caused by number rewriter
+ * Reduce the file size of connection.txt
+ * Fix a crash issue in keyevent handling at mozc.el
+ * Remove Chromium OS specific code from ibus-mozc
+ * Support gyp r1667 and later
+ * Support IBus 1.5.4
+ * Update dictionary
+ * Support Adobe Reader and Adobe Flash running under protected mode on
Windows
+ * Extend did you mean feature as pseudo direct mode
+- Update fcitx-mozc
+- Drop support-input-purpose.patch
+ * merged by upstream
+- Refresh patches
+ * ibus-provide-layout-variations.patch
+ * fix-initial-input-mode.patch
+- Update gyp to r1829
+
+---
Old:
fcitx-mozc-1.11.1522.102.1.patch
gyp-r1665.tar.bz2
mozc-1.11.1522.102.tar.bz2
support-input-purpose.patch
New:
fcitx-mozc-1.13.1651.102.1.patch
gyp-r1829.tar.bz2
jigyosyo.zip
ken_all.zip
mozc-1.13.1651.102.tar.bz2
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.iRb3Xe/_old 2014-01-16 15:12:14.0 +0100
+++ /var/tmp/diff_new_pack.iRb3Xe/_new 2014-01-16 15:12:14.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mozc
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products 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,10 +30,10 @@
%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
Name: mozc
-Version:1.11.1522.102
+Version:1.13.1651.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
-License:BSD-3-Clause
+License:BSD-3-Clause and SUSE-Public-Domain
Group: System/I18n/Japanese
Url:http://code.google.com/p/mozc
@@ -42,15 +42,18 @@
Source2:fcitx-mozc-icons.tar.gz
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
-# svn export http://gyp.googlecode.com/svn/trunk/@r1665 gyp
-Source3:gyp-r1665.tar.bz2
+# svn export http://gyp.googlecode.com/svn/trunk/@r1829 gyp
+Source3:gyp-r1829.tar.bz2
Source4:ibus-setup-mozc-jp.desktop.in
+# jigyosyo.zip and ken_all.zip are zip-code--address data provided by
+# Japan Post Co., Ltd.
+# License: SUSE-Public-Domain
+Source10: jigyosyo.zip
+Source11: ken_all.zip
%if %{with_fcitx}
# PATCH-FEATURE-UPSTREAM i...@marguerite.su - add fcitx as mozc module
-Patch0: fcitx-mozc-1.11.1522.102.1.patch
+Patch0: fcitx-mozc-1.13.1651.102.1.patch
%endif
-# PATCH-FIX-UPSTREAM ft...@geeko.jp bnc#847718
-Patch1: support-input-purpose.patch
# PATCH-FIX-UPSTREAM ft...@geeko.jp
Patch2: fix-initial-input-mode.patch
# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
@@ -60,6 +63,7 @@
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
BuildRequires: python
+BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -127,7 +131,6 @@
%patch0 -p2
%endif
-%patch1 -p0
%patch2 -p0
%patch3 -p0
@@ -140,6 +143,13 @@
sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} ibus-setup-mozc-jp.desktop
+# prepare zip code dictionary
+pushd data/dictionary_oss
+unzip %{SOURCE10}
+unzip %{SOURCE11}
+python ../../dictionary/gen_zip_code_seed.py --zip_code=KEN_ALL.CSV
--jigyosyo=JIGYOSYO.CSV dictionary09.txt
+popd
+
%build
%define target Release
export QTDIR=%{_libdir}/qt4
++ fcitx-mozc-1.11.1522.102.1.patch - fcitx-mozc-1.13.1651.102.1.patch
++
--- /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-1.11.1522.102.1.patch
2013-09-02 15:00:34.0 +0200
+++
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2013-11-04 15:38:06
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.changes2013-09-02
15:00:35.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-11-04
15:38:07.0 +0100
@@ -1,0 +2,12 @@
+Mon Oct 28 17:53:17 UTC 2013 - ft...@geeko.jp
+
+- Fix typed password is shown on GNOME lock screen bnc#847718
+ * Add support-input-purpose.patch
+- Fix config button is disabled on GNOME Control Center rh#904625
+- Change initial input mode of ibus-mozc to direct input Issue#201
+ * Add fix-initial-input-mode.patch
+- Enables keyboard layout variations for ibus-mozc
+ * Add ibus-provide-layout-variations.patch
+ * Supplements the fix above
+
+---
New:
fix-initial-input-mode.patch
ibus-provide-layout-variations.patch
ibus-setup-mozc-jp.desktop.in
support-input-purpose.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.ncb3f0/_old 2013-11-04 15:38:09.0 +0100
+++ /var/tmp/diff_new_pack.ncb3f0/_new 2013-11-04 15:38:09.0 +0100
@@ -40,19 +40,27 @@
Source0:%{name}-%{version}.tar.bz2
Source1:README.SUSE
Source2:fcitx-mozc-icons.tar.gz
-%if %{with_fcitx}
-# PATCH-FEATURE-UPSTREAM i...@marguerite.su - add fcitx as mozc module
-Patch0: fcitx-mozc-1.11.1522.102.1.patch
-%endif
# gyp is not included from 1.11.1522.102
# License: BSD-3-Clause
# svn export http://gyp.googlecode.com/svn/trunk/@r1665 gyp
Source3:gyp-r1665.tar.bz2
+Source4:ibus-setup-mozc-jp.desktop.in
+%if %{with_fcitx}
+# PATCH-FEATURE-UPSTREAM i...@marguerite.su - add fcitx as mozc module
+Patch0: fcitx-mozc-1.11.1522.102.1.patch
+%endif
+# PATCH-FIX-UPSTREAM ft...@geeko.jp bnc#847718
+Patch1: support-input-purpose.patch
+# PATCH-FIX-UPSTREAM ft...@geeko.jp
+Patch2: fix-initial-input-mode.patch
+# PATCH-FEATURE-OPENSUSE ft...@geeko.jp
+Patch3: ibus-provide-layout-variations.patch
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
BuildRequires: protobuf-devel
BuildRequires: python
+BuildRequires: update-desktop-files
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -119,6 +127,10 @@
%patch0 -p2
%endif
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+
cp %{SOURCE1} .
# extract gyp
@@ -126,6 +138,8 @@
tar xvf %{SOURCE3}
popd
+sed -e 's|@libdir@|%{_libdir}|g' %{SOURCE4} ibus-setup-mozc-jp.desktop
+
%build
%define target Release
export QTDIR=%{_libdir}/qt4
@@ -169,6 +183,18 @@
install -m644 data/images/unix/ui-alpha_half.png
%{buildroot}%{_datadir}/ibus-mozc/alpha_half.png
install -m644 data/images/unix/ui-alpha_full.png
%{buildroot}%{_datadir}/ibus-mozc/alpha_full.png
+install -m755 -d %{buildroot}%{_datadir}/applications
+install -m644 ibus-setup-mozc-jp.desktop
%{buildroot}%{_datadir}/applications/ibus-setup-mozc-jp.desktop
+%suse_update_desktop_file ibus-setup-mozc-jp System Utility settings
+
+# for provide-layout-variations patch
+ln -s ibus-setup-mozc-jp.desktop
%{buildroot}%{_datadir}/applications/ibus-setup-mozc-jp-jp.desktop
+%suse_update_desktop_file ibus-setup-mozc-jp-jp System Utility settings
+ln -s ibus-setup-mozc-jp.desktop
%{buildroot}%{_datadir}/applications/ibus-setup-mozc-us.desktop
+%suse_update_desktop_file ibus-setup-mozc-us System Utility settings
+ln -s ibus-setup-mozc-jp.desktop
%{buildroot}%{_datadir}/applications/ibus-setup-mozc-dv.desktop
+%suse_update_desktop_file ibus-setup-mozc-dv System Utility settings
+
%if %{with_fcitx}
# Install Fcitx module
for mofile in out_linux/Release/obj/gen/unix/fcitx/po/*.mo
@@ -240,6 +266,10 @@
%defattr(-, root, root)
%dir %{_libdir}/ibus-mozc/
%{_libdir}/ibus-mozc/ibus-engine-mozc
+%{_datadir}/applications/ibus-setup-mozc-jp.desktop
+%{_datadir}/applications/ibus-setup-mozc-jp-jp.desktop
+%{_datadir}/applications/ibus-setup-mozc-us.desktop
+%{_datadir}/applications/ibus-setup-mozc-dv.desktop
%dir %{_datadir}/ibus/component/
%{_datadir}/ibus/component/mozc.xml
%dir %{_datadir}/ibus-mozc/
++ fix-initial-input-mode.patch ++
diff -ru unix.org/ibus/property_handler.cc unix/ibus/property_handler.cc
--- unix.org/ibus/property_handler.cc 2013-10-29 02:17:24.898870371 +0900
+++ unix/ibus/property_handler.cc 2013-10-29 02:48:55.617344149 +0900
@@ -84,8 +84,27 @@
client_(client),
translator_(translator),
original_composition_mode_(kMozcEngineInitialCompositionMode),
+#if
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2013-09-02 15:00:33
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.changes2013-07-23
22:23:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-09-02
15:00:35.0 +0200
@@ -1,0 +2,12 @@
+Sun Sep 1 05:41:09 UTC 2013 - ft...@geeko.jp
+
+- Upstream update to 1.11.1522.102
+ * Enable to customize ibus-mozc
+ * Add session command for ConvertPrevPage and ConvertNextPage
+- Update fcitx-mozc
+ * Support usage of conversion candidates
+ * Support paging
+- Add a source archive of gyp removed from the Mozc tree
+- Clean up the spec file
+
+---
Old:
fcitx-mozc-1.11.1502.102.1.patch
mozc-1.11.1502.102.tar.bz2
New:
fcitx-mozc-1.11.1522.102.1.patch
gyp-r1665.tar.bz2
mozc-1.11.1522.102.tar.bz2
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.gBf9gB/_old 2013-09-02 15:00:38.0 +0200
+++ /var/tmp/diff_new_pack.gBf9gB/_new 2013-09-02 15:00:38.0 +0200
@@ -24,8 +24,13 @@
%define fcitx_lib_dir %{_libdir}/fcitx/
%endif
+%define ibus_mozc_path %{_libdir}/ibus-mozc/ibus-engine-mozc
+%define ibus_mozc_icon_path %{_datadir}/ibus-mozc/product_icon.png
+%define document_dir %{_docdir}/ibus-mozc
+%define zinnia_model_path %{_datadir}/zinnia/model/tomoe/handwriting-ja.model
+
Name: mozc
-Version:1.11.1502.102
+Version:1.11.1522.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License:BSD-3-Clause
@@ -37,8 +42,12 @@
Source2:fcitx-mozc-icons.tar.gz
%if %{with_fcitx}
# PATCH-FEATURE-UPSTREAM i...@marguerite.su - add fcitx as mozc module
-Patch0: fcitx-mozc-1.11.1502.102.1.patch
+Patch0: fcitx-mozc-1.11.1522.102.1.patch
%endif
+# gyp is not included from 1.11.1522.102
+# License: BSD-3-Clause
+# svn export http://gyp.googlecode.com/svn/trunk/@r1665 gyp
+Source3:gyp-r1665.tar.bz2
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
@@ -110,11 +119,13 @@
%patch0 -p2
%endif
-cmp handwriting/zinnia_handwriting.cc handwriting/zinnia_handwriting.cc.back
exit 1 || true
-cmp base/util.cc base/util.cc.back exit 1 || true
-
cp %{SOURCE1} .
+# extract gyp
+pushd third_party
+tar xvf %{SOURCE3}
+popd
+
%build
%define target Release
export QTDIR=%{_libdir}/qt4
@@ -122,7 +133,8 @@
# -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp.
# gyp inserts -Wall to the head of release_extra_flags.
flags=${RPM_OPT_FLAGS/-Wall/}
-export GYP_DEFINES='use_libprotobuf=1 document_dir=%{_docdir}/%{name}
zinnia_model_file=%{_datadir}/zinnia/model/tomoe/handwriting-ja.model
release_extra_cflags='$flags''
+
+export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path}
ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=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_tools -c %{target} %{?_smp_mflags}
@@ -143,11 +155,7 @@
install -m755 -d %{buildroot}%{_libdir}/ibus-mozc
install -m755 %{output_dir}/ibus_mozc
%{buildroot}%{_libdir}/ibus-mozc/ibus-engine-mozc
install -m755 -d %{buildroot}%{_datadir}/ibus/component
-
-sed -i.back -e
's|/usr/libexec/ibus-engine-mozc|%{_libdir}/ibus-mozc/ibus-engine-mozc|'
%{output_dir}/obj/gen/unix/ibus/mozc.xml
-cmp %{output_dir}/obj/gen/unix/ibus/mozc.xml
%{output_dir}/obj/gen/unix/ibus/mozc.xml.back exit 1 || true
install -m644 %{output_dir}/obj/gen/unix/ibus/mozc.xml
%{buildroot}%{_datadir}/ibus/component/mozc.xml
-
install -m755 -d %{buildroot}%{_datadir}/ibus-mozc
#{__install} -m755 -d %{buildroot}%{_datadir}/ibus-mozc/setup
install -m644 data/images/unix/ime_product_icon_opensource-32.png
%{buildroot}%{_datadir}/ibus-mozc/product_icon.png
++ fcitx-mozc-1.11.1502.102.1.patch - fcitx-mozc-1.11.1522.102.1.patch
++
704 lines (skipped)
between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-1.11.1502.102.1.patch
and /work/SRC/openSUSE:Factory/.mozc.new/fcitx-mozc-1.11.1522.102.1.patch
++ mozc-1.11.1502.102.tar.bz2 - mozc-1.11.1522.102.tar.bz2 ++
/work/SRC/openSUSE:Factory/mozc/mozc-1.11.1502.102.tar.bz2
/work/SRC/openSUSE:Factory/.mozc.new/mozc-1.11.1522.102.tar.bz2 differ: char
11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2013-07-23 22:23:34
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.changes2013-06-25
17:15:43.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-07-23
22:23:37.0 +0200
@@ -1,0 +2,18 @@
+Sun Jul 21 15:07:02 UTC 2013 - ft...@geeko.jp
+
+- Upstream update to 1.11.1502.102
+ * Fixes cursor movement issue on Emacs 24
+ * Support numpad keys in mozc.el
+ * Support GCC 4.8.0
+ * Fix build failure when use_libprotobuf=1 is specified
+ * Support Emacs 24 in mozc.el
+ * Support surrounding text
+ * Enable to configure document directory and/or Zinnia model file path
+ * Update dictionary
+- Update fcitx-mozc
+ * Add Germany translation
+- Drop patches merged by upstream
+ * mozc-gcc48.patch
+ * fix-use_libprotobuf.patch
+
+---
Old:
fcitx-mozc-1.10.1390.102.2.patch
fix-use_libprotobuf.patch
mozc-1.10.1390.102.tar.bz2
mozc-gcc48.patch
New:
fcitx-mozc-1.11.1502.102.1.patch
mozc-1.11.1502.102.tar.bz2
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.x2w3sn/_old 2013-07-23 22:23:39.0 +0200
+++ /var/tmp/diff_new_pack.x2w3sn/_new 2013-07-23 22:23:39.0 +0200
@@ -25,7 +25,7 @@
%endif
Name: mozc
-Version:1.10.1390.102
+Version:1.11.1502.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License:BSD-3-Clause
@@ -37,13 +37,8 @@
Source2:fcitx-mozc-icons.tar.gz
%if %{with_fcitx}
# PATCH-FEATURE-UPSTREAM i...@marguerite.su - add fcitx as mozc module
-Patch0: fcitx-mozc-1.10.1390.102.2.patch
+Patch0: fcitx-mozc-1.11.1502.102.1.patch
%endif
-# PATCH-FIX-UPSTREAM ft...@geeko.jp - absolute path of protobuf, or mozc can't
recognize.
-Patch1: fix-use_libprotobuf.patch
-# PATCH-FIX-UPSTREAM nevertheless they want to turn off -Werror, sent mail
with this patch
-# on to cabezon.hashim...@gmail.com, nob...@ubuntu.com, d...@debian.org,
yuk...@google.com; pgaj...@suse.com
-Patch2: mozc-gcc48.patch
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
@@ -115,13 +110,6 @@
%patch0 -p2
%endif
-%patch1 -p1
-%patch2 -p1
-
-# thease modification should be done by patches?
-sed -i.back -e
's|/usr/share/tegaki/models/zinnia/handwriting-ja.model|%{_datadir}/zinnia/model/tomoe/handwriting-ja.model|'
handwriting/zinnia_handwriting.cc
-sed -i.back -e 's|Util::JoinPath(Util::GetServerDirectory(),
documents)|%{_docdir}/%{name}|' base/system_util.cc
-
cmp handwriting/zinnia_handwriting.cc handwriting/zinnia_handwriting.cc.back
exit 1 || true
cmp base/util.cc base/util.cc.back exit 1 || true
@@ -134,7 +122,7 @@
# -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp.
# gyp inserts -Wall to the head of release_extra_flags.
flags=${RPM_OPT_FLAGS/-Wall/}
-export GYP_DEFINES='use_libprotobuf=1 release_extra_cflags='$flags''
+export GYP_DEFINES='use_libprotobuf=1 document_dir=%{_docdir}/%{name}
zinnia_model_file=%{_datadir}/zinnia/model/tomoe/handwriting-ja.model
release_extra_cflags='$flags''
python build_mozc.py gyp --server_dir=%{_libdir}/mozc
python build_mozc.py build_tools -c %{target} %{?_smp_mflags}
++ fcitx-mozc-1.10.1390.102.2.patch - fcitx-mozc-1.11.1502.102.1.patch
++
925 lines (skipped)
between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-1.10.1390.102.2.patch
and /work/SRC/openSUSE:Factory/.mozc.new/fcitx-mozc-1.11.1502.102.1.patch
++ mozc-1.10.1390.102.tar.bz2 - mozc-1.11.1502.102.tar.bz2 ++
/work/SRC/openSUSE:Factory/mozc/mozc-1.10.1390.102.tar.bz2
/work/SRC/openSUSE:Factory/.mozc.new/mozc-1.11.1502.102.tar.bz2 differ: char
11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2013-06-25 17:14:55
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.changes2013-04-22
14:12:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-06-25
17:15:43.0 +0200
@@ -1,0 +2,6 @@
+Tue Jun 25 12:37:57 UTC 2013 - pgaj...@suse.com
+
+- fixed build with gcc 4.8
+ * mozc-gcc48.patch
+
+---
New:
mozc-gcc48.patch
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.RohZme/_old 2013-06-25 17:15:44.0 +0200
+++ /var/tmp/diff_new_pack.RohZme/_new 2013-06-25 17:15:44.0 +0200
@@ -41,6 +41,9 @@
%endif
# PATCH-FIX-UPSTREAM ft...@geeko.jp - absolute path of protobuf, or mozc can't
recognize.
Patch1: fix-use_libprotobuf.patch
+# PATCH-FIX-UPSTREAM nevertheless they want to turn off -Werror, sent mail
with this patch
+# on to cabezon.hashim...@gmail.com, nob...@ubuntu.com, d...@debian.org,
yuk...@google.com; pgaj...@suse.com
+Patch2: mozc-gcc48.patch
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
@@ -113,6 +116,7 @@
%endif
%patch1 -p1
+%patch2 -p1
# thease modification should be done by patches?
sed -i.back -e
's|/usr/share/tegaki/models/zinnia/handwriting-ja.model|%{_datadir}/zinnia/model/tomoe/handwriting-ja.model|'
handwriting/zinnia_handwriting.cc
++ mozc-gcc48.patch ++
Index: mozc-1.10.1390.102/base/port.h
===
--- mozc-1.10.1390.102.orig/base/port.h
+++ mozc-1.10.1390.102/base/port.h
@@ -174,7 +174,7 @@ template bool
struct CompileAssert {
};
#define COMPILE_ASSERT(expr, msg) \
- typedef CompileAssert(bool(expr)) msg[bool(expr) ? 1 : -1]
+ typedef CompileAssert(bool(expr)) msg[bool(expr) ? 1 : -1]
__attribute__((unused))
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2013-04-22 14:12:34
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new (New)
Package is mozc, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/mozc/mozc.changes2013-01-14
22:23:20.0 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-04-22
14:12:40.0 +0200
@@ -1,0 +2,17 @@
+Sun Apr 14 12:25:21 UTC 2013 - ft...@geeko.jp
+
+- upstream update to 1.10.1390.102
+ * mozc_renderer now checks physycal monitor area
+ * add missing properties for gnome-shell
+- update fcitx-mozc
+ * bug fixes and usability improvement
+ * new patch: fix-use_libprotobuf.patch
+absolute path of protobuf, or mozc can't recognize
+
+---
+Thu Mar 28 18:42:12 UTC 2013 - i...@marguerite.su
+
+- fix fcitx mozc icons.
+ * Defaults look too ugly that even lose face for openSUSE.
+
+---
Old:
fcitx-mozc-1.6.1187.102.3.patch
mozc-1.6.1187.102.tar.bz2
New:
fcitx-mozc-1.10.1390.102.2.patch
fcitx-mozc-icons.tar.gz
fix-use_libprotobuf.patch
mozc-1.10.1390.102.tar.bz2
Other differences:
--
++ mozc.spec ++
--- /var/tmp/diff_new_pack.BCAelJ/_old 2013-04-22 14:12:54.0 +0200
+++ /var/tmp/diff_new_pack.BCAelJ/_new 2013-04-22 14:12:54.0 +0200
@@ -25,7 +25,7 @@
%endif
Name: mozc
-Version:1.6.1187.102
+Version:1.10.1390.102
Release:0
Summary:Mozc - Japanese Input Method for Chromium OS, Mac and Linux
License:BSD-3-Clause
@@ -34,10 +34,13 @@
Url:http://code.google.com/p/mozc
Source0:%{name}-%{version}.tar.bz2
Source1:README.SUSE
+Source2:fcitx-mozc-icons.tar.gz
%if %{with_fcitx}
# PATCH-FEATURE-UPSTREAM i...@marguerite.su - add fcitx as mozc module
-Patch0: fcitx-mozc-1.6.1187.102.3.patch
+Patch0: fcitx-mozc-1.10.1390.102.2.patch
%endif
+# PATCH-FIX-UPSTREAM ft...@geeko.jp - absolute path of protobuf, or mozc can't
recognize.
+Patch1: fix-use_libprotobuf.patch
BuildRequires: libopenssl-devel
BuildRequires: pkgconfig
@@ -109,9 +112,11 @@
%patch0 -p2
%endif
+%patch1 -p1
+
# thease modification should be done by patches?
sed -i.back -e
's|/usr/share/tegaki/models/zinnia/handwriting-ja.model|%{_datadir}/zinnia/model/tomoe/handwriting-ja.model|'
handwriting/zinnia_handwriting.cc
-sed -i.back -e 's|Util::JoinPath(Util::GetServerDirectory(),
documents)|%{_docdir}/%{name}|' base/util.cc
+sed -i.back -e 's|Util::JoinPath(Util::GetServerDirectory(),
documents)|%{_docdir}/%{name}|' base/system_util.cc
cmp handwriting/zinnia_handwriting.cc handwriting/zinnia_handwriting.cc.back
exit 1 || true
cmp base/util.cc base/util.cc.back exit 1 || true
@@ -128,8 +133,8 @@
export GYP_DEFINES='use_libprotobuf=1 release_extra_cflags='$flags''
python build_mozc.py gyp --server_dir=%{_libdir}/mozc
-python build_mozc.py build_tools -c %{target}
-python build_mozc.py build -c %{target} \
+python build_mozc.py build_tools -c %{target} %{?_smp_mflags}
+python build_mozc.py build -c %{target} %{?_smp_mflags} \
unix/ibus/ibus.gyp:ibus_mozc \
%if %{with_fcitx}
unix/fcitx/fcitx.gyp:fcitx-mozc \
@@ -189,6 +194,14 @@
install -m 644 data/images/unix/ui-dictionary.png
%{buildroot}%{fcitx_icon_dir}/mozc-dictionary.png
install -m 644 data/images/unix/ui-properties.png
%{buildroot}%{fcitx_icon_dir}/mozc-properties.png
install -m 644 data/images/unix/ui-tool.png
%{buildroot}%{fcitx_icon_dir}/mozc-tool.png
+
+# fix mozc icons. they're too ugly that even lose face for openSUSE.
+cp -r %{SOURCE2} ./
+tar -xzf fcitx-mozc-icons.tar.gz
+cp -r fcitx-mozc-icons/* %{buildroot}%{fcitx_icon_dir}/
+rm -rf fcitx-mozc-icons
+rm -rf fcitx-mozc-icons.tar.gz
+
%endif
install -m755 -d %{buildroot}%{_libdir}/mozc
++ fcitx-mozc-1.6.1187.102.3.patch - fcitx-mozc-1.10.1390.102.2.patch
++
817 lines (skipped)
between /work/SRC/openSUSE:Factory/mozc/fcitx-mozc-1.6.1187.102.3.patch
and /work/SRC/openSUSE:Factory/.mozc.new/fcitx-mozc-1.10.1390.102.2.patch
++ fix-use_libprotobuf.patch ++
diff -ru mozc-1.10.1390.102.org/protobuf/genproto.gypi
mozc-1.10.1390.102/protobuf/genproto.gypi
--- mozc-1.10.1390.102.org/protobuf/genproto.gypi 2013-04-14
21:01:50.264276273 +0900
+++ mozc-1.10.1390.102/protobuf/genproto.gypi 2013-04-14 21:05:48.939025395
+0900
@@ -33,7 +33,7 @@
'wrapper_path': '(DEPTH)/build_tools/protoc_wrapper.py',
},
'conditions': [
-['target_platform!=linux', {
+
commit mozc for openSUSE:Factory
Hello community,
here is the log from the commit of package mozc for openSUSE:Factory checked in
at 2013-01-14 22:23:18
Comparing /work/SRC/openSUSE:Factory/mozc (Old)
and /work/SRC/openSUSE:Factory/.mozc.new (New)
Package is mozc, Maintainer is
Changes:
New Changes file:
--- /dev/null 2013-01-09 19:40:42.352580873 +0100
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2013-01-14
22:23:20.0 +0100
@@ -0,0 +1,149 @@
+---
+Sat Jan 12 16:31:32 UTC 2013 - ft...@geeko.jp
+
+- update fcitx-mozc patch to 1.6.1187.102.3
+ * The license of the patch is changed to BSD-3-Clause (bnc#797954)
+ * Note: the license of Fcitx have exception that add-ons of Fcitx
+need not obey GPL
+ * update translation
+ * update key translate
+
+---
+Thu Jan 10 00:29:15 UTC 2013 - jeng...@inai.de
+
+- Wrap description at 70 cols
+- Remove unnecessary ldconfig call for fcitx-mozc (it is a plugin
+ without any SONAME links)
+
+---
+Wed Jan 9 05:11:28 UTC 2013 - ft...@geeko.jp
+
+- add provides locale to make ibus-mozc and fcitx-mozc default
+ packages for Japanese
+
+---
+Wed Dec 19 12:36:04 UTC 2012 - ft...@geeko.jp
+
+- clean up the spec file
+- add Recommends ibus-mozc-candidate-window
+
+---
+Sat Sep 1 14:41:35 UTC 2012 - ft...@geeko.jp
+
+- update to version 1.6.1187.102
+ * scim_mozc is removed
+ * 'Preference' button is added on the setup dialog of IBus
+ * minor updates and refactoring
+
+---
+Mon Jun 4 17:19:04 UTC 2012 - ft...@geeko.jp
+
+- activate mozc_renderer and add new package ibus-mozc-candidate-window
+- remove unneeded BuildRequires
+
+---
+Sun Jun 3 13:21:42 UTC 2012 - i...@marguerite.su
+
+- update to version 1.5.1090.102
+ * Add a workaround against QTBUG-25536 ( Issue 158 )
+ * 'mozc_renderer' on Linux (a.k.a. 'gtk_renderer') ( Issue 145 ):
+ * Experimental option (--enable_gtk_renderer) has been deprecated
+and 'mozc_renderer' is now enabled by default on Linux.
+You can still remove the dependencies to mozc_renderer as follows.
+GYP_DEFINES=enable_gtk_renderer=0 python build_mozc.py gyp
+
+---
+Mon May 7 00:07:14 UTC 2012 - i...@marguerite.su
+
+- update to version 1.5.1053.102
+ * 'libcurl4-openssl-dev' is replaced with 'libssl-dev' in the build
+dependencies on Linux.
+ * 'emacs-mozc' now works correctly even when the Homonym dictionary is
+enabled. ( Issue 146 )
+ * 'mozc_renderer' on Linux (a.k.a. 'gtk_renderer') (Issue 145):
+- 'libgtk2.0-dev' is now required to build 'mozc_renderer' on Linux.
+- 'ibus-mozc' now checks if 'mozc_renderer' exists along with 'mozc_server'
+ or not. If 'mozc_renderer' does not exist, 'ibus-mozc' behaves as if
+ --enable_gtk_renderer was not specified.
+- Now 'mozc_renderer' can be built with GLib =2.31.0.
+- Now 'mozc_renderer' automatically adjusts its window location on the edge
+ of the display.
+- Now 'mozc_renderer' uses custom font settings of IBus-panel if available.
+- The position of candidate window no longer be disturbed by some
background
+ applications such as GNU Emacs23, which periodically issue
+ set_cursor_position message even when they are background.
+- Now 'ibus-mozc' uses IBus candidate window if the application does not
+ have the capability to show preedit string such as Emacs23 or xterm.
+
+---
+Tue Apr 24 13:56:19 UTC 2012 - ft...@geeko.jp
+
+- clean up the spec file
+- remove an unnecessary patch
+
+---
+Tue Apr 17 13:28:57 UTC 2012 - i...@marguerite.su
+
+- Upstream update (1.4.1033.102)
+ * supports Hiragana and Katakana key
+ * mozc.el supports PageUp and PageDown key
+- add fcitx im framework support.
+ * %if %{with_fcitx} makes it conditional.
+
+---
+Sun Mar 11 08:36:44 UTC 2012 - ft...@geeko.jp
+
+- Upstream update (1.4.1003.102)
+ * support IBus 1.4.1
+ * fix some minor bugs
+
+---
+Thu Feb 23 13:44:12 UTC 2012 - ft...@geeko.jp
+
+- Upstream update (1.3.975.102)
+ * fix bug IME_ON/OFF are not displayed on a key map window
+ * fix crash bugs triggered by commit
+
