From 58db748d522185a3697f6cc8689175933dd4a728 Mon Sep 17 00:00:00 2001 From: ayhanyalcinsoy Date: Sun, 22 May 2016 23:40:21 +0300 Subject: [PATCH] qtcreator:version bump to 4.0.0 and fixed prefix path --- desktop/toolkit/qtcreator/actions.py | 12 +++---- .../toolkit/qtcreator/files/80-qtcreator.conf | 1 - .../qtcreator/files/qt-creator_rpath.patch | 15 -------- desktop/toolkit/qtcreator/pspec.xml | 35 ++++++++++--------- 4 files changed, 24 insertions(+), 39 deletions(-) delete mode 100644 desktop/toolkit/qtcreator/files/80-qtcreator.conf delete mode 100644 desktop/toolkit/qtcreator/files/qt-creator_rpath.patch diff --git a/desktop/toolkit/qtcreator/actions.py b/desktop/toolkit/qtcreator/actions.py index 466b15cb15..a4921a6182 100644 --- a/desktop/toolkit/qtcreator/actions.py +++ b/desktop/toolkit/qtcreator/actions.py @@ -8,18 +8,16 @@ from pisi.actionsapi import shelltools from pisi.actionsapi import pisitools from pisi.actionsapi import get - +WorkDir="qt-creator-opensource-src-%s" % get.srcVERSION() def setup(): - qt5.configure() + + shelltools.system("qmake-qt5 qtcreator.pro CONFIG+=release QTC_PREFIX=/usr") + def build(): qt5.make() def install(): - pisitools.dodir("/usr") qt5.install() - pisitools.domove("/share", "/usr") - pisitools.domove("/lib", "/usr") - pisitools.domove("/bin", "/usr") pisitools.rename("/usr/bin/qtcreator", "qtcreator-bin") - pisitools.domove("/usr/share/qtcreator/debugger/LGPL_EXCEPTION.TXT", "/usr/share/licenses/qtcreator") + pisitools.domove("/usr/share/qtcreator/debugger/LICENSE.GPL3-EXCEPT", "/usr/share/licenses/qtcreator") diff --git a/desktop/toolkit/qtcreator/files/80-qtcreator.conf b/desktop/toolkit/qtcreator/files/80-qtcreator.conf deleted file mode 100644 index 122ee9810b..0000000000 --- a/desktop/toolkit/qtcreator/files/80-qtcreator.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/qtcreator \ No newline at end of file diff --git a/desktop/toolkit/qtcreator/files/qt-creator_rpath.patch b/desktop/toolkit/qtcreator/files/qt-creator_rpath.patch deleted file mode 100644 index 498f37d459..0000000000 --- a/desktop/toolkit/qtcreator/files/qt-creator_rpath.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -rupN qt-creator-opensource-src-3.3.1/src/rpath.pri qt-creator-opensource-src-3.3.1-new/src/rpath.pri ---- qt-creator-opensource-src-3.3.1/src/rpath.pri 2015-02-19 11:16:46.000000000 +0100 -+++ src/rpath.pri 2015-02-24 19:06:30.603703530 +0100 -@@ -3,9 +3,8 @@ macx { - } else:linux-* { - #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var -- QMAKE_RPATHDIR += \$\$ORIGIN -- QMAKE_RPATHDIR += \$\$ORIGIN/.. -- QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator -+ QMAKE_RPATHDIR += $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator -+ QMAKE_RPATHDIR += $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") - - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' diff --git a/desktop/toolkit/qtcreator/pspec.xml b/desktop/toolkit/qtcreator/pspec.xml index da8d6464f6..cc74938b83 100644 --- a/desktop/toolkit/qtcreator/pspec.xml +++ b/desktop/toolkit/qtcreator/pspec.xml @@ -11,7 +11,7 @@ app:gui Lightweight, cross-platform integrated development environment Lightweight, cross-platform integrated development environment - http://download.qt.io/official_releases/qtcreator/3.6/3.6.1/qt-creator-opensource-src-3.6.1.tar.gz + http://download.qt.io/official_releases/qtcreator/4.0/4.0.0/qt-creator-opensource-src-4.0.0.tar.gz libgcc libX11-devel @@ -22,7 +22,6 @@ qt5-base-devel qt5-declarative-devel qt5-linguist - qt5-quick1-devel qt5-quickcontrols2 qt5-svg-devel qt5-xmlpatterns @@ -35,25 +34,21 @@ llvm-clang-devel llvm - - - + qtcreator Lightweight, cross-platform integrated development environment - libX11 libgcc - qt5-svg + qt5-svg qt5-base - qt5-quick1 - qt5-script - qt5-webkit - qt5-designer - qt5-assistant - qt5-x11extras - qt5-declarative + qt5-base-devel + qt5-script + qt5-webkit + qt5-designer + qt5-assistant + qt5-declarative /usr/bin @@ -68,10 +63,18 @@ qtcreator.desktop qtcreator.sh - 80-qtcreator.conf + + + + 2016-05-22 + 4.0.0 + version bump and fixed prefix path + Ayhan Yalçınsoy + ayhanyalcinsoy@pisilinux.org + 2016-04-21 3.6.1 @@ -80,4 +83,4 @@ yusuf.aydemir@pisilinux.org - \ No newline at end of file +