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

Merge pull request #1824 from ayhanyalcinsoy/master

Browse Source 
qtcreator:version bump to 4.0.0 and fixed prefix path
This commit is contained in:
Ertuğrul Erata
2016-05-23 00:06:30 +03:00
parent 5004febb20 58db748d52
commit 94d0f8738e
4 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qtcreator/actions.py
+5 -7
View File
@@ -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")
desktop/toolkit/qtcreator/files/80-qtcreator.conf
-1
View File
@@ -1 +0,0 @@
/usr/lib/qtcreator
desktop/toolkit/qtcreator/files/qt-creator_rpath.patch
-15
View File
@@ -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}\'
desktop/toolkit/qtcreator/pspec.xml
+19 -16
View File
@@ -11,7 +11,7 @@
<IsA>app:gui</IsA>
<Summary>Lightweight, cross-platform integrated development environment</Summary>
<Description>Lightweight, cross-platform integrated development environment</Description>
<Archive type="targz" sha1sum="3bd40b180a3c0b49eb6e3ce7945491f1be152921">http://download.qt.io/official_releases/qtcreator/3.6/3.6.1/qt-creator-opensource-src-3.6.1.tar.gz</Archive>
<Archive type="targz" sha1sum="be07f52421e5552b06bbe584fd2f957494c11aaf">http://download.qt.io/official_releases/qtcreator/4.0/4.0.0/qt-creator-opensource-src-4.0.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>libgcc</Dependency>
<Dependency>libX11-devel</Dependency>
@@ -22,7 +22,6 @@
<Dependency versionFrom="5.6.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-declarative-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-linguist</Dependency>
<Dependency>qt5-quick1-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-quickcontrols2</Dependency>
<Dependency versionFrom="5.6.0">qt5-svg-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-xmlpatterns</Dependency>
@@ -35,25 +34,21 @@
<Dependency>llvm-clang-devel</Dependency>
<Dependency>llvm</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch>qt-creator_rpath.patch</Patch> -->
</Patches>
</Source>
<Package>
<Name>qtcreator</Name>
<Summary>Lightweight, cross-platform integrated development environment</Summary>
<RuntimeDependencies>
<Dependency>libX11</Dependency>
<Dependency>libgcc</Dependency>
<Dependency>qt5-svg</Dependency>
<Dependency versionFrom="5.6.0">qt5-svg</Dependency>
<Dependency versionFrom="5.6.0">qt5-base</Dependency>
<Dependency>qt5-quick1</Dependency>
<Dependency>qt5-script</Dependency>
<Dependency>qt5-webkit</Dependency>
<Dependency>qt5-designer</Dependency>
<Dependency>qt5-assistant</Dependency>
<Dependency>qt5-x11extras</Dependency>
<Dependency>qt5-declarative</Dependency>
<Dependency versionFrom="5.6.0">qt5-base-devel</Dependency>
<Dependency versionFrom="5.6.0">qt5-script</Dependency>
<Dependency versionFrom="5.6.0">qt5-webkit</Dependency>
<Dependency versionFrom="5.6.0">qt5-designer</Dependency>
<Dependency versionFrom="5.6.0">qt5-assistant</Dependency>
<Dependency versionFrom="5.6.0">qt5-declarative</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -68,10 +63,18 @@
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/qtcreator.desktop">qtcreator.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/bin/qtcreator.sh">qtcreator.sh</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/etc/ld.so.conf.d/80-qtcreator.conf">80-qtcreator.conf</AdditionalFile>
<!-- <AdditionalFile owner="root" permission="0644" target="/etc/ld.so.conf.d/80-qtcreator.conf">80-qtcreator.conf</AdditionalFile> -->
</AdditionalFiles>
</Package>
<History>
<Update release="2">
<Date>2016-05-22</Date>
<Version>4.0.0</Version>
<Comment>version bump and fixed prefix path</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2016-04-21</Date>
<Version>3.6.1</Version>
@@ -80,4 +83,4 @@
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
</History>
</PISI>
</PISI>