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

Andrea Scarpino andrea at nymeria.archlinux.org
Mon Mar 17 14:13:02 UTC 2014


    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 <andrea at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+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 +0000
++++ QScintilla-gpl-2.7.1/Python/configure.py	2013-03-07 08:11:48.860880852 +0000
+@@ -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 208067, qscintilla/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-03-17 14:13:02 UTC (rev 208068)
@@ -0,0 +1,82 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Douglas Soares de Andrade <dsa at aur.archlinux.org>
+
+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-x86_64/configure.py-objdir-support.diff (from rev 208067, qscintilla/trunk/configure.py-objdir-support.diff)
===================================================================
--- staging-x86_64/configure.py-objdir-support.diff	                        (rev 0)
+++ staging-x86_64/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 +0000
++++ QScintilla-gpl-2.7.1/Python/configure.py	2013-03-07 08:11:48.860880852 +0000
+@@ -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 "




More information about the arch-commits mailing list