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

Merge pull request #7613 from Rmys/master

Browse Source 
qt5-declarative
This commit is contained in:
Rmys
2020-01-18 20:12:54 +03:00
committed by GitHub
parent 9e7281664a c774d91f0a
commit 05f99b3506
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qt5/qt5-declarative/actions.py
+5 -2
View File
@@ -4,7 +4,7 @@
# Licensed under the GNU General Public License, version 3. # Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt # See the file http://www.gnu.org/licenses/gpl.txt
NoStrip = "/" #NoStrip = "/"
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
from pisi.actionsapi import autotools from pisi.actionsapi import autotools
@@ -13,6 +13,9 @@ from pisi.actionsapi import qt5
from pisi.actionsapi import get from pisi.actionsapi import get
def setup(): def setup():
shelltools.system("sed -i 's/python /python3 /' qtdeclarative.pro \
src/3rdparty/masm/masm.pri")
#shelltools.system("sed -i 's/python /python3 /' qtdeclarative/src/3rdparty/masm/masm.pri")
shelltools.export("CFLAGS", "CXXFLAGS") shelltools.export("CFLAGS", "CXXFLAGS")
qt5.configure() qt5.configure()
@@ -32,4 +35,4 @@ def install():
#for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()): #for bin in shelltools.ls("%s/usr/lib/qt5/bin" % get.installDIR()):
#pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin) #pisitools.dosym("/usr/lib/qt5/bin/%s" % bin, "/usr/bin/%s-qt5" % bin)
#pisitools.insinto("/usr/share/licenses/qt5-declarative/", "LICENSE*") pisitools.insinto("/usr/share/licenses/qt5-declarative/", "LICENSE*")
desktop/toolkit/qt5/qt5-declarative/pspec.xml
+4 -2
View File
@@ -13,6 +13,7 @@
<License>LGPLv2.1-linking-exception</License> <License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="2ea4a2ffe698987423f6ee63d58fbba433fe0910" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz</Archive> <Archive sha1sum="2ea4a2ffe698987423f6ee63d58fbba433fe0910" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>python3</Dependency>
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency> <Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
<Dependency>libxkbcommon-devel</Dependency> <Dependency>libxkbcommon-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency> <Dependency versionFrom="13.0.4">mesa-devel</Dependency>
@@ -29,6 +30,7 @@
<Name>qt5-declarative</Name> <Name>qt5-declarative</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libgcc</Dependency> <Dependency>libgcc</Dependency>
<Dependency>libglvnd</Dependency>
<Dependency versionFrom="5.14.0">qt5-base</Dependency> <Dependency versionFrom="5.14.0">qt5-base</Dependency>
<Dependency versionFrom="13.0.4">mesa</Dependency> <Dependency versionFrom="13.0.4">mesa</Dependency>
<!-- <Dependency versionFrom="5.14.0">qt5-xmlpatterns</Dependency> --> <!-- <Dependency versionFrom="5.14.0">qt5-xmlpatterns</Dependency> -->
@@ -56,7 +58,7 @@
</RuntimeDependencies> </RuntimeDependencies>
</Package> </Package>
<Package> <!--Package>
<Name>qt5-declarative-docs</Name> <Name>qt5-declarative-docs</Name>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency versionFrom="5.14.0">qt5-base</Dependency> <Dependency versionFrom="5.14.0">qt5-base</Dependency>
@@ -64,7 +66,7 @@
<Files> <Files>
<Path fileType="doc">/usr/share/doc/qt5</Path> <Path fileType="doc">/usr/share/doc/qt5</Path>
</Files> </Files>
</Package> </Package-->
<History> <History>
<Update release="18"> <Update release="18">