[arch-commits] Commit in qscintilla/trunk (PKGBUILD)
Andrea Scarpino
andrea at archlinux.org
Wed Jun 27 19:56:07 UTC 2012
Date: Wednesday, June 27, 2012 @ 15:56:06
Author: andrea
Revision: 162669
Upstream release; remove the python3 dependence from the python2 bindings package
Modified:
qscintilla/trunk/PKGBUILD
----------+
PKGBUILD | 41 +++++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-06-27 19:36:01 UTC (rev 162668)
+++ PKGBUILD 2012-06-27 19:56:06 UTC (rev 162669)
@@ -4,38 +4,39 @@
# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla')
-pkgver=2.6.1
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.6.2
pkgrel=1
license=('GPL')
arch=('i686' 'x86_64')
url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'chrpath')
+makedepends=('python2-pyqt' 'pyqt' 'chrpath')
source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz"
'configure.py-objdir-support.diff')
-md5sums=('39a1d0567a20b416177eb1a8afe225a7'
+md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
'8cf9c06252e2f11ab00e62848e322fd3')
build() {
cd "${srcdir}/QScintilla-gpl-${pkgver}"
patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
- cd Qt4
+ cd Qt4Qt5
qmake qscintilla.pro
make
cd ../designer-Qt4
- qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4
+ qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
make
cd ../
cp -rf Python Python2
cd Python
- python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+ python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
make
cd ../Python2
- python2 configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+ python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
make
}
@@ -43,16 +44,27 @@
pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
depends=('qt')
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4"
+ cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
}
+package_python-qscintilla-common() {
+ pkgdest="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
+ depends=('qscintilla')
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla
+ rm "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so"
+}
+
package_python-qscintilla() {
- pkgdesc="Python 3 bindings for QScintilla2"
- depends=('pyqt' 'qscintilla')
+ pkgdesc="Python 3.x bindings for QScintilla2"
+ depends=('python-qscintilla-common' 'pyqt')
cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
install -Dm755 Qsci.so \
@@ -60,9 +72,10 @@
}
package_python2-qscintilla() {
- pkgdesc="Python 2 bindings for QScintilla2"
- depends=('python-qscintilla' 'python2-pyqt')
+ pkgdesc="Python 2.x bindings for QScintilla2"
+ depends=('python-qscintilla-common' 'python2-pyqt')
cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+ install -Dm755 Qsci.so \
+ "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
}
More information about the arch-commits
mailing list