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.changes 2016-07-05
09:53:04.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2016-07-30
00:27:49.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.Mzjir1/_new 2016-07-30 00:27:51.000000000 +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.000000000
+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', '<!(which ar)'],
- ['CC', '<!(which clang)'],
- ['CXX', '<!(which clang++)'],
+ ['CC', '<!(which gcc)'],
+ ['CXX', '<!(which g++)'],
['LD', '<!(which ld)'],
['NM', '<!(which nm)'],
['READELF', '<!(which readelf)'],
