From 7762d7512ee9ab09f7ded0b605bd7b5a9f77abb1 Mon Sep 17 00:00:00 2001
From: groni <groni@pisilinux.org>
Date: Wed, 22 Feb 2017 14:42:58 +0100
Subject: [PATCH] qt5-webengine add version from to dependencies

---
 desktop/toolkit/qt5/qt5-webengine/actions.py | 2 +-
 desktop/toolkit/qt5/qt5-webengine/pspec.xml  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py
index 62d86fd0e2..7ec95408ec 100644
--- a/desktop/toolkit/qt5/qt5-webengine/actions.py
+++ b/desktop/toolkit/qt5/qt5-webengine/actions.py
@@ -14,7 +14,7 @@ def setup():
     shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
     shelltools.export("QT5DIR", "/usr/lib/qt5")
     shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.16.2" % get.CFLAGS())
-    shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs  qtwebengine.pro")
+    shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro")
     
 def build():
     qt5.make()
diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
index 200448e086..2705681504 100644
--- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
@@ -20,7 +20,7 @@
             <Dependency versionFrom="5.7.1">qt5-sensors-devel</Dependency>
             <Dependency versionFrom="5.7.1">qt5-webchannel-devel</Dependency>
             <Dependency>bison</Dependency>
-            <Dependency>ninja</Dependency>
+            <Dependency versionFrom="1.7.1">ninja</Dependency>
             <Dependency>gperf</Dependency>
             <Dependency>snappy-devel</Dependency>
             <Dependency>gobject-introspection-devel</Dependency>
@@ -64,12 +64,13 @@
             <Dependency>libjpeg-turbo-devel</Dependency>
             <Dependency>x264-devel</Dependency>
             <Dependency>minizip-devel</Dependency>
-            <Dependency>ffmpeg-devel</Dependency>
+            <Dependency versionFrom="58.2">icu4c-devel</Dependency>
+            <Dependency versionFrom="3.2.4">ffmpeg-devel</Dependency>
             <Dependency>git</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">qt5-webengine-nss.patch</Patch>
-            <!--<Patch level="1">qtwebengine-5.7.0-icu58.patch</Patch>-->
+            <!--<Patch level="1">qt5-webengine-fno-delete-null-pointer-checks.patch</Patch>-->
         </Patches>
     </Source>