From 8999fa1750304fb2367fb7743e49e013405e88be Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sat, 25 Jun 2011 23:07:08 +0000
Subject: Sat Jun 25 23:07:08 UTC 2011

---
 community/qtcreator/PKGBUILD | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'community/qtcreator/PKGBUILD')

diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 6e3619898..866bff343 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 49861 2011-06-21 12:55:45Z svenstaro $
+# $Id: PKGBUILD 50079 2011-06-24 08:49:19Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -11,34 +11,33 @@ pkgbase=qtcreator
 #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin')
 pkgname=('qtcreator' 'qtcreator-todo-plugin')
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/products/developer-tools'
 license=('LGPL')
 depends=('qt>=4.7.3')
-makedepends=('qt-private-headers>=4.7.3')
+makedepends=('qt-private-headers>=4.7.3' 'git')
 options=('docs')
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
 	    'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip'
-	    "https://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin/archive-tarball/88f8fc50"
         'qtcreator.desktop')
 md5sums=('35d74837e48b12ee58379e1c029a9a6c'
          '4dab1bb07ba5c39ae4c975a333d32ec1'
-         '734a6f375e595de796f9802087845dfe'
          '2c3ffbd66845b37be9804f2966815a10')
 
 build() {
   cd ${srcdir}
-  mkdir build
-  cd build
+  [[ -d build ]] && rm -r build
+  mkdir build && cd build
 
   qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
   make --quiet
   
   # Building TODO plugin
+  git clone git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git $srcdir/qt-creator-todo-plugin
   msg "Starting TODO plugin build...."
-  cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
+  cd $srcdir/qt-creator-todo-plugin
   sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro
   sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR  = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro
   sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec
@@ -66,12 +65,21 @@ package_qtcreator() {
 
   # qt already fixed this
   if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then
-      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.2.1)"
+      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
       return 1
   fi
   install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet"
   # remove it soon
 
+  # qt already fixed this as well
+  if [[ -f "$pkgdir/usr/lib/qmldesigner/libqtquickplugin.so" ]]; then
+      echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.3.0)"
+      return 1
+  fi
+  mkdir "$pkgdir/usr/lib/qmldesigner"
+  cp lib/qmldesigner/*.so "$pkgdir/usr/lib/qmldesigner/"
+  # remove it soon
+
   install -Dm644 ${srcdir}/qtcreator.desktop \
     ${pkgdir}/usr/share/applications/qtcreator.desktop
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
@@ -88,7 +96,7 @@ package_qtcreator-todo-plugin() {
   install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \
  o-plugin'
   
-  cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin
+  cd $srcdir/qt-creator-todo-plugin
   make INSTALL_ROOT=$pkgdir/usr/ install
 
   install -Dm644 LICENSE.BSD \
-- 
cgit v1.2.3-54-g00ecf