From c774d91f0a181d94b8e552161c470d239920219f Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 18 Jan 2020 20:11:56 +0300 Subject: [PATCH] qt5-declarative --- desktop/toolkit/qt5/qt5-declarative/actions.py | 7 +++++-- desktop/toolkit/qt5/qt5-declarative/pspec.xml | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/desktop/toolkit/qt5/qt5-declarative/actions.py b/desktop/toolkit/qt5/qt5-declarative/actions.py index dfb04e0bd3..f76a1bb38f 100755 --- a/desktop/toolkit/qt5/qt5-declarative/actions.py +++ b/desktop/toolkit/qt5/qt5-declarative/actions.py @@ -4,7 +4,7 @@ # Licensed under the GNU General Public License, version 3. # See the file http://www.gnu.org/licenses/gpl.txt -NoStrip = "/" +#NoStrip = "/" from pisi.actionsapi import shelltools from pisi.actionsapi import autotools @@ -13,6 +13,9 @@ from pisi.actionsapi import qt5 from pisi.actionsapi import get 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") qt5.configure() @@ -32,4 +35,4 @@ def install(): #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.insinto("/usr/share/licenses/qt5-declarative/", "LICENSE*") + pisitools.insinto("/usr/share/licenses/qt5-declarative/", "LICENSE*") diff --git a/desktop/toolkit/qt5/qt5-declarative/pspec.xml b/desktop/toolkit/qt5/qt5-declarative/pspec.xml index 0dd17f9342..0953a6fa99 100755 --- a/desktop/toolkit/qt5/qt5-declarative/pspec.xml +++ b/desktop/toolkit/qt5/qt5-declarative/pspec.xml @@ -13,6 +13,7 @@ LGPLv2.1-linking-exception http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz + python3 qt5-base-devel libxkbcommon-devel mesa-devel @@ -29,6 +30,7 @@ qt5-declarative libgcc + libglvnd qt5-base mesa @@ -56,7 +58,7 @@ - +