From 93b4bf2e665f705bddcf4c39f48a6446a5edcc46 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Tue, 14 Jun 2016 00:57:39 +0300
Subject: [PATCH 1/3] qt5-webengine:fixed pspec

---
 desktop/toolkit/qt5/qt5-webengine/pspec.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
index 167a4e5528..805b4ce4a5 100644
--- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
@@ -121,7 +121,7 @@
             <Path fileType="headers">/usr/include/qt5</Path>
         </Files>
         <RuntimeDependencies>
-            <Name release="current">qt5-webengine</Name>
+            <Dependency release="current">qt5-webengine</Dependency>
             <Dependency versionFrom="5.6.0">qt5-base-devel</Dependency>
             <Dependency versionFrom="5.6.0">qt5-declarative-devel</Dependency>
             <Dependency versionFrom="5.6.0">qt5-location-devel</Dependency>

From 4bada07e08d3f264f292054e9320ee4adc1c422a Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Tue, 14 Jun 2016 22:24:16 +0300
Subject: [PATCH 2/3] qt5-webengine:removed nss from build dep

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

diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py
index 6b3891b2a5..0b402993b6 100644
--- a/desktop/toolkit/qt5/qt5-webengine/actions.py
+++ b/desktop/toolkit/qt5/qt5-webengine/actions.py
@@ -14,14 +14,10 @@ def setup():
     shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
     shelltools.export("QT5DIR", "/usr/lib/qt5")
     shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.11.0.0" % get.CFLAGS())
-    #qt5.configure()
     shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
     
-    
 def build():
     qt5.make()
-    #Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-    #shelltools.system('find "$pkgdir/usr/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;')
 
 def install():
     qt5.install("INSTALL_ROOT=%s" % get.installDIR())
diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
index 805b4ce4a5..b9a8b947c4 100644
--- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
@@ -56,7 +56,7 @@
             <Dependency>alsa-lib-devel</Dependency>
             <Dependency>pciutils-devel</Dependency>
             <Dependency>dbus-devel</Dependency>
-            <Dependency>nss-devel</Dependency>
+<!--             <Dependency>nss-devel</Dependency> --> <!--bizim nss ile derlenmiyor kendi içinde var-->
             <Dependency>perl</Dependency>
             <Dependency>python-devel</Dependency>
             <Dependency>libvpx-devel</Dependency>
@@ -131,7 +131,7 @@
 
     <History>
         <Update release="1">
-            <Date>2016-06-14</Date>
+            <Date>2016-06-15</Date>
             <Version>5.6.0</Version>
             <Comment>First release</Comment>
             <Name>Ayhan Yalçınsoy</Name>

From 59eb9ad614fae64d17ec3a5e0e3ac6cb1cf4a779 Mon Sep 17 00:00:00 2001
From: ayhanyalcinsoy <ayhanyalcinsoy@pisilinux.org>
Date: Tue, 14 Jun 2016 22:28:14 +0300
Subject: [PATCH 3/3] qt5-webengine:fixed conflict

---
 desktop/toolkit/qt5/qt5-webengine/actions.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py
index b582c1fe31..0b402993b6 100644
--- a/desktop/toolkit/qt5/qt5-webengine/actions.py
+++ b/desktop/toolkit/qt5/qt5-webengine/actions.py
@@ -14,12 +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.11.0.0" % get.CFLAGS())
-<<<<<<< HEAD
     shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
-=======
-    qt5.configure(parameters="WEBENGINE_CONFIG+=use_proprietary_codecs")
-    #shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
->>>>>>> e48ac11fa2d0a58e97e44fadb628cef95f99f432
     
 def build():
     qt5.make()