From a192a65cf803a4b5944486dde579e0b2e5d70756 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Mon, 27 Feb 2017 15:49:34 +0300 Subject: [PATCH 1/2] qtermwidget5:fixed action.py --- desktop/toolkit/qtermwidget5/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/toolkit/qtermwidget5/actions.py b/desktop/toolkit/qtermwidget5/actions.py index dda5bf6cff..7e6a9e10c3 100644 --- a/desktop/toolkit/qtermwidget5/actions.py +++ b/desktop/toolkit/qtermwidget5/actions.py @@ -27,4 +27,4 @@ def install(): pisitools.removeDir("/usr/lib64") shelltools.cd("..") - pisitools.dodoc("AUTHORS", "README", "COPYING") \ No newline at end of file + pisitools.dodoc("AUTHORS", "README") From a94db26908eab18f5263ace295b217f3933a19ea Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Wed, 1 Mar 2017 12:01:23 +0300 Subject: [PATCH 2/2] qtermwidget5:fixed conflict --- desktop/toolkit/qtermwidget5/actions.py | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 desktop/toolkit/qtermwidget5/actions.py diff --git a/desktop/toolkit/qtermwidget5/actions.py b/desktop/toolkit/qtermwidget5/actions.py new file mode 100644 index 0000000000..b88fb4c5d5 --- /dev/null +++ b/desktop/toolkit/qtermwidget5/actions.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# +# Licensed under the GNU General Public License, version 3. +# See the file http://www.gnu.org/licenses/gpl.txt + +from pisi.actionsapi import cmaketools +from pisi.actionsapi import pisitools +from pisi.actionsapi import get +from pisi.actionsapi import shelltools + +def setup(): + shelltools.makedirs("build") + shelltools.cd("build") + cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_DESIGNER_PLUGIN=0 \ + -DUSE_QT5=true", sourceDir="..") + +def build(): + shelltools.cd("build") + cmaketools.make() + +def install(): + shelltools.cd("build") + cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) + pisitools.domove("/usr/lib64/*", "usr/lib/") + pisitools.removeDir("/usr/lib64") + + shelltools.cd("..") + pisitools.dodoc("LICENSE", "AUTHORS", "README.md", "CHANGELOG")