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

Merge pull request #3131 from suvari/master

Browse Source 
qt5-webengine: build with new protobuf
This commit is contained in:
Ayhan YALÇINSOY
2017-03-08 21:09:55 +03:00
committed by GitHub
parent 3abf537509 454cecdf64
commit efbc942b2d
2 changed files with 5 additions and 5 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 WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro")
shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs WEBENGINE_CONFIG+=use_system_icu WEBENGINE_CONFIG+=use_system_protobuf WEBENGINE_CONFIG+=use_system_ffmpeg qtwebengine.pro")
#pisitools.ldflags.add("-Wl,--no-keep-memory ")
qt5.configure()
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+4 -4
View File
@@ -141,11 +141,11 @@
<History>
<Update release="3">
<Date>2017-02-20</Date>
<Date>2017-03-08</Date>
<Version>5.7.1</Version>
<Comment>Release bump.</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2016-12-27</Date>
@@ -162,4 +162,4 @@
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>