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

Merge pull request #1967 from ayhanyalcinsoy/master

Browse Source 
qt5-webengine:removed nss from build dep
This commit is contained in:
Burak Fazil Erturk
2016-06-15 22:48:44 +03:00
committed by GitHub
parent e48ac11fa2 59eb9ad614
commit e54a419e33
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-webengine/actions.py
+1 -5
View File
@@ -14,14 +14,10 @@ def setup():
shelltools.export("QT5LINK", "/usr/lib/qt5/bin") shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
shelltools.export("QT5DIR", "/usr/lib/qt5") shelltools.export("QT5DIR", "/usr/lib/qt5")
shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.11.0.0" % get.CFLAGS()) shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.11.0.0" % get.CFLAGS())
qt5.configure(parameters="WEBENGINE_CONFIG+=use_proprietary_codecs") shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
#shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
def build(): def build():
qt5.make() 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(): def install():
qt5.install("INSTALL_ROOT=%s" % get.installDIR()) qt5.install("INSTALL_ROOT=%s" % get.installDIR())
desktop/toolkit/qt5/qt5-webengine/pspec.xml
+2 -2
View File
@@ -57,7 +57,7 @@
<Dependency>alsa-lib-devel</Dependency> <Dependency>alsa-lib-devel</Dependency>
<Dependency>pciutils-devel</Dependency> <Dependency>pciutils-devel</Dependency>
<Dependency>dbus-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>perl</Dependency>
<Dependency>python-devel</Dependency> <Dependency>python-devel</Dependency>
<Dependency>libvpx-devel</Dependency> <Dependency>libvpx-devel</Dependency>
@@ -133,7 +133,7 @@
<History> <History>
<Update release="1"> <Update release="1">
<Date>2016-06-14</Date> <Date>2016-06-15</Date>
<Version>5.6.0</Version> <Version>5.6.0</Version>
<Comment>First release</Comment> <Comment>First release</Comment>
<Name>Ayhan Yalçınsoy</Name> <Name>Ayhan Yalçınsoy</Name>