[arch-commits] Commit in qscintilla/repos (6 files)

2015-12-06 Thread Evangelos Foutras
Date: Sunday, December 6, 2015 @ 23:47:14
  Author: foutrelis
Revision: 253059

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qscintilla/repos/staging-i686/
  qscintilla/repos/staging-i686/PKGBUILD
(from rev 253058, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-i686/configure.py-objdir-support.diff
(from rev 253058, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/staging-x86_64/
  qscintilla/repos/staging-x86_64/PKGBUILD
(from rev 253058, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff
(from rev 253058, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 staging-i686/PKGBUILD   |   84 ++
 staging-i686/configure.py-objdir-support.diff   |   41 ++
 staging-x86_64/PKGBUILD |   84 ++
 staging-x86_64/configure.py-objdir-support.diff |   41 ++
 4 files changed, 250 insertions(+)

Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 253058, 
qscintilla/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-12-06 22:47:14 UTC (rev 253059)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.9
+pkgrel=3
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
+options=('!buildflags') # Fix Qt Designer plugin
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('24659879edf9786f41a9b9268ce3c817'
+ '0a952497a52c85bf5c09dd2ee091e763')
+
+prepare() {
+  cd QScintilla-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
+}
+
+build() {
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+qmake-qt4 qscintilla.pro
+make
+
+cd ../designer-Qt4Qt5
+QMAKEFEATURES=../Qt4Qt5/features qmake-qt4 designer.pro 
INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+QMAKEFEATURES=../Qt4Qt5/features python configure.py -n ../Qt4Qt5/ -o 
../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+make
+
+cd ../Python2
+QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o 
../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('qt4')
+
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+cd ../designer-Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-common() {
+pkgdesc="Common python qscintilla bindings files shared between 
python-qscintilla and python2-qscintilla"
+depends=('qscintilla')
+
+cd QScintilla-gpl-${pkgver}/Python
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+# Provided by python-qscintilla
+rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+}
+
+package_python-qscintilla() {
+pkgdesc="Python 3.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+}
+
+package_python2-qscintilla() {
+pkgdesc="Python 2.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python2
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+}

Copied: qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from 
rev 253058, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- staging-i686/configure.py-objdir-support.diff   
(rev 0)
+++ staging-i686/configure.py-objdir-support.diff   2015-12-06 22:47:14 UTC 
(rev 253059)
@@ -0,0 +1,41 @@
+02_configure.dpatch by Torsten Marek 
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+
+patch the configure script for the Python bindings to support object dir
+builds
+Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+===
+--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py2014-07-05 
10:02:02.318834374 -0400
 qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-05 10:02:02.306834375 
-0400
+@@ -31,6 +31,8 @@
+ import optparse
+ import sys
+ 
++src_dir = os.path.d

[arch-commits] Commit in qscintilla/repos (6 files)

2015-09-19 Thread Felix Yan
Date: Sunday, September 20, 2015 @ 05:30:52
  Author: fyan
Revision: 246723

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qscintilla/repos/staging-i686/
  qscintilla/repos/staging-i686/PKGBUILD
(from rev 246722, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-i686/configure.py-objdir-support.diff
(from rev 246722, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/staging-x86_64/
  qscintilla/repos/staging-x86_64/PKGBUILD
(from rev 246722, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff
(from rev 246722, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 staging-i686/PKGBUILD   |   84 ++
 staging-i686/configure.py-objdir-support.diff   |   41 ++
 staging-x86_64/PKGBUILD |   84 ++
 staging-x86_64/configure.py-objdir-support.diff |   41 ++
 4 files changed, 250 insertions(+)

Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 246722, 
qscintilla/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-09-20 03:30:52 UTC (rev 246723)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.9
+pkgrel=2
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
+options=('!buildflags') # Fix Qt Designer plugin
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('24659879edf9786f41a9b9268ce3c817'
+ '0a952497a52c85bf5c09dd2ee091e763')
+
+prepare() {
+  cd QScintilla-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
+}
+
+build() {
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+qmake-qt4 qscintilla.pro
+make
+
+cd ../designer-Qt4Qt5
+QMAKEFEATURES=../Qt4Qt5/features qmake-qt4 designer.pro 
INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+QMAKEFEATURES=../Qt4Qt5/features python configure.py -n ../Qt4Qt5/ -o 
../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+make
+
+cd ../Python2
+QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o 
../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('qt4')
+
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+cd ../designer-Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-common() {
+pkgdesc="Common python qscintilla bindings files shared between 
python-qscintilla and python2-qscintilla"
+depends=('qscintilla')
+
+cd QScintilla-gpl-${pkgver}/Python
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+# Provided by python-qscintilla
+rm "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+}
+
+package_python-qscintilla() {
+pkgdesc="Python 3.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python3.5/site-packages/PyQt4/Qsci.so
+}
+
+package_python2-qscintilla() {
+pkgdesc="Python 2.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python2
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+}

Copied: qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from 
rev 246722, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- staging-i686/configure.py-objdir-support.diff   
(rev 0)
+++ staging-i686/configure.py-objdir-support.diff   2015-09-20 03:30:52 UTC 
(rev 246723)
@@ -0,0 +1,41 @@
+02_configure.dpatch by Torsten Marek 
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+
+patch the configure script for the Python bindings to support object dir
+builds
+Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+===
+--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py2014-07-05 
10:02:02.318834374 -0400
 qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-05 10:02:02.306834375 
-0400
+@@ -31,6 +31,8 @@
+ import optparse
+ import sys
+ 
++src_dir = os.path.dirn

[arch-commits] Commit in qscintilla/repos (6 files)

2015-04-29 Thread Felix Yan
Date: Wednesday, April 29, 2015 @ 11:27:52
  Author: fyan
Revision: 238243

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qscintilla/repos/staging-i686/
  qscintilla/repos/staging-i686/PKGBUILD
(from rev 238242, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-i686/configure.py-objdir-support.diff
(from rev 238242, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/staging-x86_64/
  qscintilla/repos/staging-x86_64/PKGBUILD
(from rev 238242, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff
(from rev 238242, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 staging-i686/PKGBUILD   |   84 ++
 staging-i686/configure.py-objdir-support.diff   |   41 ++
 staging-x86_64/PKGBUILD |   84 ++
 staging-x86_64/configure.py-objdir-support.diff |   41 ++
 4 files changed, 250 insertions(+)

Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 238242, 
qscintilla/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2015-04-29 09:27:52 UTC (rev 238243)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Felix Yan 
+# Contributor: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.9
+pkgrel=1
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
+options=('!buildflags') # Fix Qt Designer plugin
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('24659879edf9786f41a9b9268ce3c817'
+ '0a952497a52c85bf5c09dd2ee091e763')
+
+prepare() {
+  cd QScintilla-gpl-${pkgver}
+  patch -p1 -i "${srcdir}"/configure.py-objdir-support.diff
+}
+
+build() {
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+qmake-qt4 qscintilla.pro
+make
+
+cd ../designer-Qt4Qt5
+QMAKEFEATURES=../Qt4Qt5/features qmake-qt4 designer.pro 
INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+QMAKEFEATURES=../Qt4Qt5/features python configure.py -n ../Qt4Qt5/ -o 
../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+make
+
+cd ../Python2
+QMAKEFEATURES=../Qt4Qt5/features python2 configure.py -n ../Qt4Qt5/ -o 
../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('qt4')
+
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+cd ../designer-Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-common() {
+pkgdesc="Common python qscintilla bindings files shared between 
python-qscintilla and python2-qscintilla"
+depends=('qscintilla')
+
+cd QScintilla-gpl-${pkgver}/Python
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+# Provided by python-qscintilla
+rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python-qscintilla() {
+pkgdesc="Python 3.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python2-qscintilla() {
+pkgdesc="Python 2.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python2
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+}

Copied: qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from 
rev 238242, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- staging-i686/configure.py-objdir-support.diff   
(rev 0)
+++ staging-i686/configure.py-objdir-support.diff   2015-04-29 09:27:52 UTC 
(rev 238243)
@@ -0,0 +1,41 @@
+02_configure.dpatch by Torsten Marek 
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+
+patch the configure script for the Python bindings to support object dir
+builds
+Index: qscintilla2-2.8.3+dfsg/Python/configure.py
+===
+--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py2014-07-05 
10:02:02.318834374 -0400
 qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-05 10:02:02.306834375 
-0400
+@@ -31,6 +31,8 @@
+ import optparse
+ import sys
+ 
++src_dir = os.path.dirna

[arch-commits] Commit in qscintilla/repos (6 files)

2014-07-03 Thread Andrea Scarpino
Date: Thursday, July 3, 2014 @ 22:26:05
  Author: andrea
Revision: 216434

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  qscintilla/repos/extra-i686/PKGBUILD
(from rev 216433, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-x86_64/PKGBUILD
(from rev 216433, qscintilla/trunk/PKGBUILD)
Deleted:
  qscintilla/repos/extra-i686/PKGBUILD
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
  qscintilla/repos/extra-x86_64/PKGBUILD
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff

---+
 /PKGBUILD |  152 
 extra-i686/PKGBUILD   |   83 -
 extra-i686/configure.py-objdir-support.diff   |   21 ---
 extra-x86_64/PKGBUILD |   83 -
 extra-x86_64/configure.py-objdir-support.diff |   21 ---
 5 files changed, 152 insertions(+), 208 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2014-07-03 20:25:54 UTC (rev 216433)
+++ extra-i686/PKGBUILD 2014-07-03 20:26:05 UTC (rev 216434)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino 
-# Contributor: Douglas Soares de Andrade 
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
- 'python-qscintilla-common')
-pkgver=2.8.1
-pkgrel=2
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
-makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
-options=('!buildflags')
-source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
-'configure.py-objdir-support.diff')
-md5sums=('bbf4725583ee9817f89413dca6cd38d2'
- 'eae1bd23117c5f1f7f172a1c1e11f600')
-
-prepare() {
-cd QScintilla-gpl-${pkgver}
-patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-}
-
-build() {
-cd QScintilla-gpl-${pkgver}/Qt4Qt5
-qmake-qt4 qscintilla.pro
-make
-
-cd ../designer-Qt4Qt5
-qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-make
-
-cd ../
-cp -rf Python Python2
-cd Python
-python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake 
/usr/bin/qmake-qt4
-make
-
-cd ../Python2
-python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake 
/usr/bin/qmake-qt4
-make
-}
-
-package_qscintilla() {
-pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-depends=('qt4')
-
-cd QScintilla-gpl-${pkgver}/Qt4Qt5
-make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-cd ../designer-Qt4Qt5
-make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-common() {
-pkgdesc="Common python qscintilla bindings files shared between 
python-qscintilla and python2-qscintilla"
-depends=('qscintilla')
-
-cd QScintilla-gpl-${pkgver}/Python
-make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-# Provided by python-qscintilla
-rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
-}
-
-package_python-qscintilla() {
-pkgdesc="Python 3.x bindings for QScintilla2"
-depends=('python-qscintilla-common' 'python-pyqt4')
-
-cd QScintilla-gpl-${pkgver}/Python
-install -Dm755 Qsci.so \
-  "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
-}
-
-package_python2-qscintilla() {
-pkgdesc="Python 2.x bindings for QScintilla2"
-depends=('python-qscintilla-common' 'python2-pyqt4')
-
-cd QScintilla-gpl-${pkgver}/Python2
-install -Dm755 Qsci.so \
-  "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
-}

Copied: qscintilla/repos/extra-i686/PKGBUILD (from rev 216433, 
qscintilla/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-07-03 20:26:05 UTC (rev 216434)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.8.3
+pkgrel=1
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
+options=('!buildflags')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";)
+md5sums=('bbf6944a9d3b089a79763ca4e6486b9d')
+
+build() {
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+qmake-qt4 qscintilla.pro
+make
+
+cd ../designer-Qt4Qt5
+qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake 
/usr/bin/qmake-qt4
+make
+
+cd ../Python2
+python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c

[arch-commits] Commit in qscintilla/repos (6 files)

2014-04-14 Thread Andrea Scarpino
Date: Monday, April 14, 2014 @ 09:20:51
  Author: andrea
Revision: 210311

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  qscintilla/repos/testing-i686/
  qscintilla/repos/testing-i686/PKGBUILD
(from rev 210310, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/testing-i686/configure.py-objdir-support.diff
(from rev 210310, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/testing-x86_64/
  qscintilla/repos/testing-x86_64/PKGBUILD
(from rev 210310, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/testing-x86_64/configure.py-objdir-support.diff
(from rev 210310, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 testing-i686/PKGBUILD   |   83 ++
 testing-i686/configure.py-objdir-support.diff   |   21 +
 testing-x86_64/PKGBUILD |   83 ++
 testing-x86_64/configure.py-objdir-support.diff |   21 +
 4 files changed, 208 insertions(+)

Copied: qscintilla/repos/testing-i686/PKGBUILD (from rev 210310, 
qscintilla/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD   (rev 0)
+++ testing-i686/PKGBUILD   2014-04-14 07:20:51 UTC (rev 210311)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.8.1
+pkgrel=2
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
+options=('!buildflags')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('bbf4725583ee9817f89413dca6cd38d2'
+ 'eae1bd23117c5f1f7f172a1c1e11f600')
+
+prepare() {
+cd QScintilla-gpl-${pkgver}
+patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+}
+
+build() {
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+qmake-qt4 qscintilla.pro
+make
+
+cd ../designer-Qt4Qt5
+qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake 
/usr/bin/qmake-qt4
+make
+
+cd ../Python2
+python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake 
/usr/bin/qmake-qt4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('qt4')
+
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+cd ../designer-Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-common() {
+pkgdesc="Common python qscintilla bindings files shared between 
python-qscintilla and python2-qscintilla"
+depends=('qscintilla')
+
+cd QScintilla-gpl-${pkgver}/Python
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+# Provided by python-qscintilla
+rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python-qscintilla() {
+pkgdesc="Python 3.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python2-qscintilla() {
+pkgdesc="Python 2.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python2
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+}

Copied: qscintilla/repos/testing-i686/configure.py-objdir-support.diff (from 
rev 210310, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- testing-i686/configure.py-objdir-support.diff   
(rev 0)
+++ testing-i686/configure.py-objdir-support.diff   2014-04-14 07:20:51 UTC 
(rev 210311)
@@ -0,0 +1,21 @@
+--- QScintilla-gpl-2.7.1/Python/configure.py~  2013-03-07 08:09:00.678704222 
+
 QScintilla-gpl-2.7.1/Python/configure.py   2013-03-07 08:11:48.860880852 
+
+@@ -29,6 +29,8 @@
+ import glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+ import sysconfig
+ except ImportError:
+@@ -455,6 +457,9 @@
+ 
+ # Get the QScintilla version string.
+ sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR')
++
++return # Debian: do not check for the installed version, we're good this 
way.
++
+ if sciversstr is None:
+ error(
+ "The QScintilla version number could not be determined by "

Copied: qscintilla/repos/testing-x86_64

[arch-commits] Commit in qscintilla/repos (6 files)

2014-03-17 Thread Andrea Scarpino
Date: Monday, March 17, 2014 @ 15:13:02
  Author: andrea
Revision: 208068

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qscintilla/repos/staging-i686/
  qscintilla/repos/staging-i686/PKGBUILD
(from rev 208067, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-i686/configure.py-objdir-support.diff
(from rev 208067, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/staging-x86_64/
  qscintilla/repos/staging-x86_64/PKGBUILD
(from rev 208067, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff
(from rev 208067, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 staging-i686/PKGBUILD   |   82 ++
 staging-i686/configure.py-objdir-support.diff   |   21 +
 staging-x86_64/PKGBUILD |   82 ++
 staging-x86_64/configure.py-objdir-support.diff |   21 +
 4 files changed, 206 insertions(+)

Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 208067, 
qscintilla/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2014-03-17 14:13:02 UTC (rev 208068)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.8.1
+pkgrel=1
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('bbf4725583ee9817f89413dca6cd38d2'
+ 'eae1bd23117c5f1f7f172a1c1e11f600')
+
+prepare() {
+cd QScintilla-gpl-${pkgver}
+patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+}
+
+build() {
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+qmake-qt4 qscintilla.pro
+make
+
+cd ../designer-Qt4Qt5
+qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake 
/usr/bin/qmake-qt4
+make
+
+cd ../Python2
+python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake 
/usr/bin/qmake-qt4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('qt4')
+
+cd QScintilla-gpl-${pkgver}/Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+cd ../designer-Qt4Qt5
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-common() {
+pkgdesc="Common python qscintilla bindings files shared between 
python-qscintilla and python2-qscintilla"
+depends=('qscintilla')
+
+cd QScintilla-gpl-${pkgver}/Python
+make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+# Provided by python-qscintilla
+rm "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python-qscintilla() {
+pkgdesc="Python 3.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python3.4/site-packages/PyQt4/Qsci.so
+}
+
+package_python2-qscintilla() {
+pkgdesc="Python 2.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt4')
+
+cd QScintilla-gpl-${pkgver}/Python2
+install -Dm755 Qsci.so \
+  "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
+}

Copied: qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from 
rev 208067, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- staging-i686/configure.py-objdir-support.diff   
(rev 0)
+++ staging-i686/configure.py-objdir-support.diff   2014-03-17 14:13:02 UTC 
(rev 208068)
@@ -0,0 +1,21 @@
+--- QScintilla-gpl-2.7.1/Python/configure.py~  2013-03-07 08:09:00.678704222 
+
 QScintilla-gpl-2.7.1/Python/configure.py   2013-03-07 08:11:48.860880852 
+
+@@ -29,6 +29,8 @@
+ import glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
++
+ try:
+ import sysconfig
+ except ImportError:
+@@ -455,6 +457,9 @@
+ 
+ # Get the QScintilla version string.
+ sciversstr = read_define(sciglobal, 'QSCINTILLA_VERSION_STR')
++
++return # Debian: do not check for the installed version, we're good this 
way.
++
+ if sciversstr is None:
+ error(
+ "The QScintilla version number could not be determined by "

Copied: qscintilla/repos/staging-x86_64/PKGBUILD (from rev 20806

[arch-commits] Commit in qscintilla/repos (6 files)

2013-02-26 Thread Andrea Scarpino
Date: Tuesday, February 26, 2013 @ 11:25:15
  Author: andrea
Revision: 178696

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qscintilla/repos/staging-i686/
  qscintilla/repos/staging-i686/PKGBUILD
(from rev 178695, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-i686/configure.py-objdir-support.diff
(from rev 178695, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/staging-x86_64/
  qscintilla/repos/staging-x86_64/PKGBUILD
(from rev 178695, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff
(from rev 178695, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 staging-i686/PKGBUILD   |   82 ++
 staging-i686/configure.py-objdir-support.diff   |   39 ++
 staging-x86_64/PKGBUILD |   82 ++
 staging-x86_64/configure.py-objdir-support.diff |   39 ++
 4 files changed, 242 insertions(+)

Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 178695, 
qscintilla/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2013-02-26 10:25:15 UTC (rev 178696)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.7
+pkgrel=2
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt' 'pyqt' 'chrpath')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('a3857d75a2b332e0460131e0aa4cc4b5'
+ '8cf9c06252e2f11ab00e62848e322fd3')
+
+build() {
+. /etc/profile.d/qt4.sh
+
+cd "${srcdir}/QScintilla-gpl-${pkgver}"
+patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+cd Qt4Qt5
+qmake qscintilla.pro
+make
+
+cd ../designer-Qt4
+qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+make
+
+cd ../Python2
+python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('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() {
+pkgdesc="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.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python-qscintilla() {
+pkgdesc="Python 3.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'pyqt')
+
+cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
+install -Dm755 Qsci.so \
+  "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python2-qscintilla() {
+pkgdesc="Python 2.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt')
+
+cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
+install -Dm755 Qsci.so \
+  "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
+}

Copied: qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from 
rev 178695, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- staging-i686/configure.py-objdir-support.diff   
(rev 0)
+++ staging-i686/configure.py-objdir-support.diff   2013-02-26 10:25:15 UTC 
(rev 178696)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek 
+##
+## DP: patch the configure script for the Python bindings to support object 
dir builds
+
+@DPATCH@
+Index: qscintilla2-2.4.2/Python/configure.py
+===
+--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.0 
+0100
 qscintilla2-2.4.2/Python/configure.py  2010-01-27 22:54:35.603870417 
+0100
+@@ -33,6 +33,7 @@
+ import glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
+ 
+ # Import SIP's configuration module so that we have access to the error
+ # reporting.  Then try and import the configuration modu

[arch-commits] Commit in qscintilla/repos (6 files)

2012-10-03 Thread Andrea Scarpino
Date: Wednesday, October 3, 2012 @ 16:22:14
  Author: andrea
Revision: 167919

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qscintilla/repos/staging-i686/
  qscintilla/repos/staging-i686/PKGBUILD
(from rev 167918, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-i686/configure.py-objdir-support.diff
(from rev 167918, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/staging-x86_64/
  qscintilla/repos/staging-x86_64/PKGBUILD
(from rev 167918, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff
(from rev 167918, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 staging-i686/PKGBUILD   |   80 ++
 staging-i686/configure.py-objdir-support.diff   |   39 ++
 staging-x86_64/PKGBUILD |   80 ++
 staging-x86_64/configure.py-objdir-support.diff |   39 ++
 4 files changed, 238 insertions(+)

Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 167918, 
qscintilla/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-10-03 20:22:14 UTC (rev 167919)
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
+ 'python-qscintilla-common')
+pkgver=2.6.2
+pkgrel=3
+license=('GPL')
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
+makedepends=('python2-pyqt' 'pyqt' 'chrpath')
+source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
+ '8cf9c06252e2f11ab00e62848e322fd3')
+
+build() {
+cd "${srcdir}/QScintilla-gpl-${pkgver}" 
+patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+cd Qt4Qt5
+qmake qscintilla.pro
+make
+
+cd ../designer-Qt4
+qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+make
+
+cd ../Python2
+python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('qt')
+
+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() {
+pkgdesc="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.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python-qscintilla() {
+pkgdesc="Python 3.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'pyqt')
+
+cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
+install -Dm755 Qsci.so \
+  "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+}
+
+package_python2-qscintilla() {
+pkgdesc="Python 2.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt')
+
+cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
+install -Dm755 Qsci.so \
+  "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
+}

Copied: qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from 
rev 167918, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- staging-i686/configure.py-objdir-support.diff   
(rev 0)
+++ staging-i686/configure.py-objdir-support.diff   2012-10-03 20:22:14 UTC 
(rev 167919)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek 
+##
+## DP: patch the configure script for the Python bindings to support object 
dir builds
+
+@DPATCH@
+Index: qscintilla2-2.4.2/Python/configure.py
+===
+--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.0 
+0100
 qscintilla2-2.4.2/Python/configure.py  2010-01-27 22:54:35.603870417 
+0100
+@@ -33,6 +33,7 @@
+ import glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
+ 
+ # Import SIP's configuration module so that we have access to the error
+ # reporting.  Then try and import the configuration modules for both PyQt3 and
+@@ -1

[arch-commits] Commit in qscintilla/repos (6 files)

2012-06-27 Thread Andrea Scarpino
Date: Wednesday, June 27, 2012 @ 16:02:58
  Author: andrea
Revision: 162672

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  qscintilla/repos/staging-i686/
  qscintilla/repos/staging-i686/PKGBUILD
(from rev 162671, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-i686/configure.py-objdir-support.diff
(from rev 162671, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/staging-x86_64/
  qscintilla/repos/staging-x86_64/PKGBUILD
(from rev 162671, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/staging-x86_64/configure.py-objdir-support.diff
(from rev 162671, qscintilla/trunk/configure.py-objdir-support.diff)

-+
 staging-i686/PKGBUILD   |   81 ++
 staging-i686/configure.py-objdir-support.diff   |   39 ++
 staging-x86_64/PKGBUILD |   81 ++
 staging-x86_64/configure.py-objdir-support.diff |   39 ++
 4 files changed, 240 insertions(+)

Copied: qscintilla/repos/staging-i686/PKGBUILD (from rev 162671, 
qscintilla/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD   (rev 0)
+++ staging-i686/PKGBUILD   2012-06-27 20:02:58 UTC (rev 162672)
@@ -0,0 +1,81 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino 
+# Contributor: Douglas Soares de Andrade 
+
+pkgbase=qscintilla
+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' 'pyqt' 'chrpath')
+source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz";
+'configure.py-objdir-support.diff')
+md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
+ '8cf9c06252e2f11ab00e62848e322fd3')
+
+build() {
+cd "${srcdir}/QScintilla-gpl-${pkgver}" 
+patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+cd Qt4Qt5
+qmake qscintilla.pro
+make
+
+cd ../designer-Qt4
+qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+make
+
+cd ../
+cp -rf Python Python2
+cd Python
+python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+make
+
+cd ../Python2
+python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+make
+}
+
+package_qscintilla() {
+pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+depends=('qt')
+
+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.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'pyqt')
+
+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.x bindings for QScintilla2"
+depends=('python-qscintilla-common' 'python2-pyqt')
+
+cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
+install -Dm755 Qsci.so \
+  "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
+}

Copied: qscintilla/repos/staging-i686/configure.py-objdir-support.diff (from 
rev 162671, qscintilla/trunk/configure.py-objdir-support.diff)
===
--- staging-i686/configure.py-objdir-support.diff   
(rev 0)
+++ staging-i686/configure.py-objdir-support.diff   2012-06-27 20:02:58 UTC 
(rev 162672)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek 
+##
+## DP: patch the configure script for the Python bindings to support object 
dir builds
+
+@DPATCH@
+Index: qscintilla2-2.4.2/Python/configure.py
+===
+--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.0 
+0100
 qscintilla2-2.4.2/Python/configure.py  2010-01-27 22:54:35.603870417 
+0100
+@@ -33,6 +33,7 @@
+ import glob
+ import optparse
+ 
++src_dir = os.path.dirname(os.path.abspath(__file__))
+ 
+ # Import SIP's configuration module so that we have access to the error
+ # reporting.  Then try and import the configuration