Commit 9ef53a50 authored by abveritas's avatar abveritas

Version up qtreator to 2.0.1

parent 66fb2ed4
......@@ -5,53 +5,53 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=qtcreator
pkgver=1.3.1
pkgver=2.0.1
pkgrel=1
_qtver=4.6.3
_qtver=4.7.0
pkgdesc="Lightweight, cross-platform integrated development environment"
arch=('i686' 'x86_64')
url="http://trolltech.com/developer/qt-creator"
license=('LGPL')
makedepends=()
depends=('qt>=4.6.3-1')
depends=('qt>=4.7.')
optdepends=('qt-doc: for the integrated Qt documentation'
'gdb: for the debugger')
options=(docs)
source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.zip"
"ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${_qtver}.tar.gz"
paths.patch
qtcreator.desktop
qtcreator)
md5sums=('bc5d64922a292cdccb5f9e5e1a33575e'
'5c69f16d452b0bb3d44bc3c10556c072'
'68663f1fa9fe5bb3825b28ac02a41eed'
'2c3ffbd66845b37be9804f2966815a10'
'53a02595008d842ca30c828640eb8f0c')
qtcreator.desktop)
md5sums=('7b670968ec80d2d413ff22605a31a77d'
'3a2f25b9b115037277f4fb759194a7a5'
'2c3ffbd66845b37be9804f2966815a10')
build() {
cd "${srcdir}/qt-everywhere-opensource-src-${_qtver}"
touch ".qmake.cache"
cd "${srcdir}/qt-creator-${pkgver}-src"
patch -Np1 -i ${srcdir}/paths.patch
export QTDIR="${srcdir}/qt-everywhere-opensource-src-${_qtver}"
export QTCREATOR_WITH_QML=1
if [ -d ${srcdir}/build ]; then
rm -rf ${srcdir}/build
rm -rf ${srcdir}/build
fi
mkdir ${srcdir}/build
cd ${srcdir}/build
mkdir -p share/doc/qtcreator
touch share/doc/qtcreator/qtcreator.qch
qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro -o Makefile || return 1
make || return 1
make INSTALL_ROOT="${pkgdir}/usr/" install || return 1
install -Dm755 ${srcdir}/qtcreator ${pkgdir}/usr/bin/qtcreator
install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop
install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
make
}
package() {
cd ${srcdir}/build
make INSTALL_ROOT="${pkgdir}/usr/" install
install -Dm644 ${srcdir}/qtcreator.desktop \
${pkgdir}/usr/share/applications/qtcreator.desktop
install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
}
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,6 +1,6 @@
unix {
- QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
- HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
+ QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html /usr/bin/qdoc3
+ HELPGENERATOR = /usr/bin/qhelpgenerator
} else {
QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
HELPGENERATOR = $$(QTDIR)\bin\qhelpgenerator.exe
#!/bin/sh
bindir=$(dirname "$(readlink -nf $0)")
libdir=$(cd "${bindir}/../lib" ; pwd)
LD_LIBRARY_PATH="${libdir}/qtcreator:${LD_LIBRARY_PATH}" exec "${bindir}/qtcreator.bin" ${1+"$@"}
diff -rupN qt-creator-1.1.0-src/src/app/main.cpp orig/src/app/main.cpp
--- qt-creator-1.1.0-src/src/app/main.cpp 2009-04-21 16:13:13.000000000 +0200
+++ qt-creator-1.1.0-src/src/app/main.cpp 2009-05-02 16:53:57.985960034 +0200
@@ -179,11 +179,7 @@ static inline QStringList getPluginPaths
// 1) "plugins" (Win/Linux)
QString pluginPath = rootDirPath;
pluginPath += QDir::separator();
-#if defined(QT_ARCH_X86_64) && defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
- pluginPath += QLatin1String("lib64");
-#else
pluginPath += QLatin1String("lib");
-#endif
pluginPath += QDir::separator();
pluginPath += QLatin1String("qtcreator");
pluginPath += QDir::separator();
diff -rupN qt-creator-1.1.0-src/src/qworkbench.pri orig/src/qworkbench.pri
--- qt-creator-1.1.0-src/src/qworkbench.pri 2009-04-21 16:13:13.000000000 +0200
+++ qt-creator-1.1.0-src/src/qworkbench.pri 2009-05-02 16:53:59.801793855 +0200
@@ -6,11 +6,7 @@ isEmpty(TEST):CONFIG(debug, debug|releas
}
}
-linux-*-64 {
- IDE_LIBRARY_BASENAME = lib64
-} else {
- IDE_LIBRARY_BASENAME = lib
-}
+IDE_LIBRARY_BASENAME = lib
equals(TEST, 1) {
QT +=testlib
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment