Hello community,
here is the log from the commit of package libqt5-qtwebengine for
openSUSE:Factory checked in at 2015-06-23 12:00:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebengine"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes
2015-06-06 09:53:02.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new/libqt5-qtwebengine.changes
2015-06-23 12:00:07.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jun 22 11:56:10 UTC 2015 - [email protected]
+
+- Add patch gcc50-fixes.diff to fix the detection of the GCC 5.x
+ compiler. Patch is equal to the one used for Chromium
+
+-------------------------------------------------------------------
New:
----
gcc50-fixes.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebengine.spec ++++++
--- /var/tmp/diff_new_pack.3tBFfX/_old 2015-06-23 12:00:10.000000000 +0200
+++ /var/tmp/diff_new_pack.3tBFfX/_new 2015-06-23 12:00:10.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtwebengine
#
-# Copyright (c) 2015 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
@@ -33,6 +33,8 @@
Source1: baselibs.conf
Patch0: strip.diff
Patch1: gyp_conf.patch
+# PATCH-FIX-OPENSUSE gcc50-fixes.diff -- Fix the detection of the Gcc 5.x
compiler
+Patch2: gcc50-fixes.diff
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flac-devel
@@ -131,6 +133,9 @@
%prep
%setup -q -n qtwebengine-opensource-src-%{real_version}
%patch1 -p1
+%if 0%{?suse_version} > 1320
+%patch2 -p0
+%endif
sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
#pushd src/3rdparty/chromium/third_party/
++++++ gcc50-fixes.diff ++++++
--- src/3rdparty/chromium/build/compiler_version.py 2015-06-17
21:51:42.871082412 +0200
+++ src/3rdparty/chromium/build/compiler_version.py 2015-06-17
21:51:42.871082412 +0200
@@ -56,7 +56,7 @@
if tool == "compiler":
compiler = compiler + " -dumpversion"
# 4.6
- version_re = re.compile(r"(\d+)\.(\d+)")
+ version_re = re.compile(r"(\d+)")
elif tool == "assembler":
compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
# Unmodified: GNU assembler (GNU Binutils) 2.24
@@ -88,7 +88,11 @@
raise subprocess.CalledProcessError(pipe.returncode, compiler)
parsed_output = version_re.match(tool_output)
- result = parsed_output.group(1) + parsed_output.group(2)
+ if tool == "compiler":
+ result = parsed_output.group(1) + "1"
+ else:
+ result = parsed_output.group(1) + parsed_output.group(2)
+
compiler_version_cache[cache_key] = result
return result
except Exception, e:
