qscintilla: update to latest.

1 files changed, 30 insertions, 22 deletions

diff --git a/abs/extra/qscintilla/PKGBUILD b/abs/extra/qscintilla/PKGBUILD
index 9ba5a39..f002166 100644
--- a/abs/extra/qscintilla/PKGBUILD
+++ b/abs/extra/qscintilla/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 46926 2009-07-22 04:56:17Z pierre $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Michal Krenek <mikos@sg1.cz>
-# Contributor: DaNiMoTh <jjdanimoth.aur@gmail.com>
 
 pkgbase=qscintilla
-pkgname=(qscintilla python-qscintilla)
-pkgver=2.4.5
-pkgrel=4
+pkgname=('qscintilla' 'python2-qscintilla')
+pkgver=2.5.1
+pkgrel=2
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('pyqt')
-source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz
-        configure.py-objdir-support.diff)
-md5sums=('8063f8f933513959432c27c5ffecf56b'
+makedepends=('python2-pyqt')
+source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
+        'configure.py-objdir-support.diff')
+md5sums=('dd7edef5ff674d307057a3c12dbd8fce'
          '8cf9c06252e2f11ab00e62848e322fd3')
 
 
 build() {
-    cd $srcdir/QScintilla-gpl-$pkgver
+    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
     patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
 
     cd Qt4
@@ -30,31 +28,41 @@ build() {
     qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4
     make
 
-    cd ../Python
-    python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+    cd ../
+    cp -rf Python Python2
+    cd Python
+    python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
     make
+
+    cd ../Python2
+    python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+    make    
 }
 
 package_qscintilla() {
     pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    provides=('qscintilla2')
-    conflicts=('qscintilla2')
-    replaces=('qscintilla2' 'qscintilla')
     depends=('qt')
 
-    cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
-    cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }
 
 package_python-qscintilla() {
-    pkgdesc="Python bindings for QScintilla2"
-    conflicts=('python-qscintilla2')
-    replaces=('python-qscintilla2')
-    depends=('qscintilla' 'pyqt')
+    pkgdesc="Python 3 bindings for QScintilla2"
+    depends=('pyqt' 'qscintilla')
 
     cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
+    install -Dm755 Qsci.so \
+      "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+}
+
+package_python2-qscintilla() {
+    pkgdesc="Python 2 bindings for QScintilla2"
+    depends=('python-qscintilla' 'python2-pyqt')
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 }