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.changes 2015-03-05 18:17:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-06-30 10:18:56.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jun 28 09:32:07 UTC 2015 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.Qb9YoS/_new 2015-06-30 10:18:57.000000000 +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 [email protected] -Patch3: ibus-provide-layout-variations.patch - +Patch1: ibus-provide-layout-variations.patch +# PATCH-FIX-UPSTREAM [email protected] +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)
