From 9fc9e8e8b873040d7bea2048f63086bd3f6219d3 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Wed, 1 Feb 2012 19:37:16 +0000
Subject: [PATCH] calibre & qtcreator updates, need building on qt 4.8

---
 calibre/PKGBUILD            |  8 +++---
 qtcreator/PKGBUILD          | 51 +++++++++++++++++++++----------------
 qtcreator/qtcreator.desktop |  4 +--
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/calibre/PKGBUILD b/calibre/PKGBUILD
index 13b044ab0..8d5ece3b8 100644
--- a/calibre/PKGBUILD
+++ b/calibre/PKGBUILD
@@ -7,7 +7,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=calibre
-pkgver=0.8.21
+pkgver=0.8.37
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
@@ -20,9 +20,9 @@ depends=('python2' 'python-imaging' 'libusb' 'pyqt' 'python-mechanize'
 makedepends=('python-pycountry')
 optdepends=('ipython: to use calibre-debug')
 install=calibre.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz
         desktop_integration.patch)
-md5sums=('46317b1f4bd6f1cd5279a5f8a1d712ae'
+md5sums=('7e313e9bf84e046d5ccfa0e9e4c06b26'
          'f4b80e3b34e34bce68b3f052ff52dee8')
 
 build() {
@@ -34,7 +34,7 @@ build() {
     $(find . -regex ".*.py\|.*.recipe")
 
   python setup.py build 
-  python setup.py resources
+  #python setup.py resources
   python setup.py translations
 }
 
diff --git a/qtcreator/PKGBUILD b/qtcreator/PKGBUILD
index 1b0cdb26e..e77c2771d 100644
--- a/qtcreator/PKGBUILD
+++ b/qtcreator/PKGBUILD
@@ -5,43 +5,50 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=qtcreator
-pkgver=2.3.0
+pkgver=2.4.1
 pkgrel=1
-_qtver=4.7.1
-pkgdesc="Lightweight, cross-platform integrated development environment"
+_qtver=4.8.0
+pkgdesc="Lightweight, cross-platform integrated development environment."
 arch=('i686' 'x86_64')
 url="http://trolltech.com/developer/qt-creator"
 license=('LGPL')
-makedepends=('qt-private-headers>=4.7.4' 'git')
-depends=('qt>=4.7.4')
+makedepends=('qt-private-headers>=4.8.0' 'git')
+depends=('qt>=4.8.0')
 optdepends=('qt-docs: for the integrated Qt documentation'
-            'gdb: for the debugger')
+            'gdb: for the debugger'
+            'qt-doc: for the integrated Qt documentation'
+            'cmake: for cmake project suppport'
+            'openssh-askpass: for ssh support'
+            'git: for git support'
+            'mercurial: for mercurial support'
+            'bzr: for bazaar support')
 options=(docs)
 source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz"
-        'qtcreator.desktop')
-md5sums=('b7ee1b779f9afe9190c5c72fb207650c'
-         '2c3ffbd66845b37be9804f2966815a10')
+        qtcreator.desktop)
+
+md5sums=('e3a95b86df5ce9151b40cfbb2b8bbf3b'
+         '457956849ca2658072a6ce4c56ed1b36')
          
 
 build() {
-  cd ${srcdir}
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
+  cd "${srcdir}"
+  [ -d build ] && rm -r build
+  mkdir build
+  cd build
 
-  qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro
-  make
+  qmake "${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro"
+  make 
 }
 
 package() {
-  cd ${srcdir}/build
+  cd "${srcdir}/build"
 
-  make INSTALL_ROOT="${pkgdir}/usr/" install
+  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
+  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"
 }
 
-
-
+# vim:set ts=2 sw=2 et:
diff --git a/qtcreator/qtcreator.desktop b/qtcreator/qtcreator.desktop
index d74def4ce..aeec00729 100644
--- a/qtcreator/qtcreator.desktop
+++ b/qtcreator/qtcreator.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=/usr/bin/qtcreator
-Name=Qt-Creator
+Name=Qt Creator
 GenericName=C++ IDE
 X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/48x48/apps/qtcreator.png
+Icon=/usr/share/icons/hicolor/512x512/apps/qtcreator.png
 Terminal=false
 Type=Application
 Categories=Qt;Development
-- 
GitLab