Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2956 from groni/master

Browse Source 
qt5-webengine add version from to dependencies
This commit is contained in:
groni
2017-02-22 14:43:59 +01:00
committed by GitHub
parent 3a1e6382e7 7762d7512e
commit 906111fa95
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webengine/actions.py
+1 -1
View File
@@ -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()
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+4 -3
View File
@@ -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>