qt5-webengine:removed nss from build dep

2016-06-14 22:25:03 +03:00
parent 4bada07e08 e48ac11fa2
commit cd42ab6295
17 changed files with 30 additions and 15 deletions
@@ -14,7 +14,12 @@ 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()
@@ -22,6 +22,7 @@
            <Dependency>bison</Dependency>
            <Dependency>ninja</Dependency>
            <Dependency>gperf</Dependency>
+            <Dependency>snappy-devel</Dependency>
            <Dependency>gobject-introspection-devel</Dependency>
            <Dependency>expat-devel</Dependency>
            <Dependency>glib2-devel</Dependency>
@@ -90,6 +91,7 @@
            <Dependency>libX11</Dependency>
            <Dependency>libgcc</Dependency>
            <Dependency>libpng</Dependency>
+            <Dependency>snappy</Dependency>
            <Dependency>freetype</Dependency>
            <Dependency>libXi</Dependency>
            <Dependency>libXext</Dependency>