Accepting request 314508 from KDE:Qt5

1

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

gcc50-fixes.diff

@@ -1,20 +1,22 @@
---- 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 @@
+Index: src/3rdparty/chromium/build/compiler_version.py
+===================================================================
+--- src/3rdparty/chromium/build/compiler_version.py.orig
++++ src/3rdparty/chromium/build/compiler_version.py
+@@ -56,7 +56,7 @@ def GetVersion(compiler, tool):
      if tool == "compiler":
        compiler = compiler + " -dumpversion"
        # 4.6
 -      version_re = re.compile(r"(\d+)\.(\d+)")
-+      version_re = re.compile(r"(\d+)")
++      version_re = re.compile(r"(\d+)(?:\.(\d+))?")
      elif tool == "assembler":
        compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
        # Unmodified: GNU assembler (GNU Binutils) 2.24
-@@ -88,7 +88,11 @@
+@@ -88,7 +88,11 @@ def GetVersion(compiler, tool):
        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":
++    if parsed_output.group(2) == None:
 +      result = parsed_output.group(1) + "1"
 +    else:
 +      result = parsed_output.group(1) + parsed_output.group(2)

libqt5-qtwebengine.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 29 15:23:43 UTC 2015 - schwab@suse.de
+
+- gyp-arm64.patch: fix support for aarch64
+- gcc50-fixes.diff: also handle gcc < 5
+
 -------------------------------------------------------------------
 Mon Jun 22 11:56:10 UTC 2015 - tittiatcoke@gmail.com
 

libqt5-qtwebengine.spec

@@ -35,6 +35,7 @@ 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
+Patch3:         gyp-arm64.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flac-devel
@@ -133,9 +134,8 @@ 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
+%patch3 -p1
 sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
 
 #pushd src/3rdparty/chromium/third_party/