Accepting request 313051 from KDE:Qt5

Fix the build with gcc5

OBS-URL: https://build.opensuse.org/request/show/313051
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=4

gcc50-fixes.diff

@@ -0,0 +1,24 @@
+--- 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:

libqt5-qtwebengine.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 22 11:56:10 UTC 2015 - tittiatcoke@gmail.com
+
+- Add patch gcc50-fixes.diff to fix the detection of the GCC 5.x 
+  compiler. Patch is equal to the one used for Chromium
+
 -------------------------------------------------------------------
 Wed Jun  3 22:56:36 UTC 2015 - hrvoje.senjan@gmail.com
 

libqt5-qtwebengine.spec

@@ -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 @@ Source:         %{tar_version}.tar.xz
 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 @@ Qt is a set of libraries for developing applications.
 %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/