Merge branch 'master' of github.com:pisilinux/main

This commit is contained in:
Ertuğrul Erata
2015-07-06 19:12:49 +03:00
5 changed files with 18 additions and 15 deletions
@@ -15,6 +15,8 @@
<BuildDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
<Dependency>qt5-tools</Dependency><!--need qhelpgenerator for build docs-->
<Dependency>qt5-sql-sqlite</Dependency>
</BuildDependencies>
</Source>
+1 -1
View File
@@ -18,7 +18,7 @@
<Dependency>pulseaudio-libs-devel</Dependency>
<Dependency>gstreamer-devel</Dependency>
<Dependency>openal-devel</Dependency>
<Dependency>pulseaudio-libs-32bit</Dependency>
<!--Dependency>pulseaudio-libs-32bit</Dependency>-->
</BuildDependencies>
</Source>
+11 -11
View File
@@ -21,6 +21,13 @@
<Package>
<Name>qt5-quick1</Name>
<RuntimeDependencies>
<Dependency>mesa</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-xmlpatterns</Dependency>
<Dependency>qt5-script</Dependency>
<!--Dependency>qt5-webkit</Dependency-->
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
<Path fileType="library">/usr/lib/qt5</Path>
@@ -28,27 +35,20 @@
<Path fileType="executable">/usr/lib/qt5/bin/</Path>
<Path fileType="executable">/usr/bin</Path>
</Files>
<RuntimeDependencies>
<Dependency>mesa</Dependency>
<Dependency>qt5-base</Dependency>
<Dependency>qt5-xmlpatterns</Dependency>
<Dependency>qt5-script</Dependency>
<Dependency>qt5-webkit</Dependency>
</RuntimeDependencies>
</Package>
<Package>
<Name>qt5-quick1-devel</Name>
<RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-script-devel</Dependency>
</RuntimeDependencies>
<Summary>Development file for qt5-quick1</Summary>
<Description>Development file for qt5-quick1</Description>
<Files>
<Path fileType="library">/usr/lib/pkgconfig</Path>
<Path fileType="headers">/usr/include/qt5</Path>
</Files>
<RuntimeDependencies>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-script-devel</Dependency>
</RuntimeDependencies>
</Package>
<History>
+2 -2
View File
@@ -15,11 +15,11 @@ def setup():
def build():
qt5.make()
qt5.make("docs")
#qt5.make("docs")
def install():
qt5.install("INSTALL_ROOT=%s" % get.installDIR())
qt5.install("install_docs")
#qt5.install("install_docs")
#I hope qtchooser will manage this issue
for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
+2 -1
View File
@@ -16,6 +16,7 @@
<Dependency>mesa-devel</Dependency>
<Dependency>qt5-base-devel</Dependency>
<Dependency>qt5-declarative-devel</Dependency>
<!--Dependency>qt5-webkit-devel</Dependency--><!--designer webkit plugin i için lazım-->
</BuildDependencies>
</Source>
@@ -24,7 +25,7 @@
<RuntimeDependencies>
<Dependency>qt5-base</Dependency>
<Dependency>mesa</Dependency>
<Dependency>qt5-webkit</Dependency>
<!--Dependency>qt5-webkit</Dependency-->
<Dependency>qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>