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

Andrea Scarpino andrea at nymeria.archlinux.org
Mon Jun 17 18:07:30 UTC 2013


    Date: Monday, June 17, 2013 @ 20:07:30
  Author: andrea
Revision: 188680

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

Added:
  qscintilla/repos/extra-i686/PKGBUILD
    (from rev 188679, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-i686/configure.py-objdir-support.diff
    (from rev 188679, qscintilla/trunk/configure.py-objdir-support.diff)
  qscintilla/repos/extra-x86_64/PKGBUILD
    (from rev 188679, qscintilla/trunk/PKGBUILD)
  qscintilla/repos/extra-x86_64/configure.py-objdir-support.diff
    (from rev 188679, qscintilla/trunk/configure.py-objdir-support.diff)
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                                     |  160 ++++++++++++++++++++++++
 /configure.py-objdir-support.diff             |   42 ++++++
 extra-i686/PKGBUILD                           |   80 ------------
 extra-i686/configure.py-objdir-support.diff   |   21 ---
 extra-x86_64/PKGBUILD                         |   80 ------------
 extra-x86_64/configure.py-objdir-support.diff |   21 ---
 6 files changed, 202 insertions(+), 202 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-06-17 18:07:01 UTC (rev 188679)
+++ extra-i686/PKGBUILD	2013-06-17 18:07:30 UTC (rev 188680)
@@ -1,80 +0,0 @@
-# $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.7.1
-pkgrel=1
-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=('da8939b5679a075e30c6632e54dc5abf'
-         'eae1bd23117c5f1f7f172a1c1e11f600')
-
-build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}"
-    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
-    cd Qt4Qt5
-    qmake qscintilla.pro
-    make
-    
-    cd ../designer-Qt4Qt5
-    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-    make
-
-    cd ../
-    cp -rf Python Python2
-    cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
-    make
-
-    cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
-    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-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 "${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/extra-i686/PKGBUILD (from rev 188679, qscintilla/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-06-17 18:07:30 UTC (rev 188680)
@@ -0,0 +1,80 @@
+# $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.7.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://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
+        'configure.py-objdir-support.diff')
+md5sums=('0fbfb06078f206a241a62c94861cce21'
+         'eae1bd23117c5f1f7f172a1c1e11f600')
+
+build() {
+    cd "${srcdir}/QScintilla-gpl-${pkgver}"
+    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+    cd 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 "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/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 "${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"
+}

Deleted: extra-i686/configure.py-objdir-support.diff
===================================================================
--- extra-i686/configure.py-objdir-support.diff	2013-06-17 18:07:01 UTC (rev 188679)
+++ extra-i686/configure.py-objdir-support.diff	2013-06-17 18:07:30 UTC (rev 188680)
@@ -1,21 +0,0 @@
---- 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/extra-i686/configure.py-objdir-support.diff (from rev 188679, qscintilla/trunk/configure.py-objdir-support.diff)
===================================================================
--- extra-i686/configure.py-objdir-support.diff	                        (rev 0)
+++ extra-i686/configure.py-objdir-support.diff	2013-06-17 18:07:30 UTC (rev 188680)
@@ -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 "

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-06-17 18:07:01 UTC (rev 188679)
+++ extra-x86_64/PKGBUILD	2013-06-17 18:07:30 UTC (rev 188680)
@@ -1,80 +0,0 @@
-# $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.7.1
-pkgrel=1
-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=('da8939b5679a075e30c6632e54dc5abf'
-         'eae1bd23117c5f1f7f172a1c1e11f600')
-
-build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}"
-    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
-    cd Qt4Qt5
-    qmake qscintilla.pro
-    make
-    
-    cd ../designer-Qt4Qt5
-    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-    make
-
-    cd ../
-    cp -rf Python Python2
-    cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
-    make
-
-    cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
-    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-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 "${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/extra-x86_64/PKGBUILD (from rev 188679, qscintilla/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-06-17 18:07:30 UTC (rev 188680)
@@ -0,0 +1,80 @@
+# $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.7.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://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
+        'configure.py-objdir-support.diff')
+md5sums=('0fbfb06078f206a241a62c94861cce21'
+         'eae1bd23117c5f1f7f172a1c1e11f600')
+
+build() {
+    cd "${srcdir}/QScintilla-gpl-${pkgver}"
+    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+
+    cd 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 "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    cd "${srcdir}/QScintilla-gpl-${pkgver}/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 "${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"
+}

Deleted: extra-x86_64/configure.py-objdir-support.diff
===================================================================
--- extra-x86_64/configure.py-objdir-support.diff	2013-06-17 18:07:01 UTC (rev 188679)
+++ extra-x86_64/configure.py-objdir-support.diff	2013-06-17 18:07:30 UTC (rev 188680)
@@ -1,21 +0,0 @@
---- 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/extra-x86_64/configure.py-objdir-support.diff (from rev 188679, qscintilla/trunk/configure.py-objdir-support.diff)
===================================================================
--- extra-x86_64/configure.py-objdir-support.diff	                        (rev 0)
+++ extra-x86_64/configure.py-objdir-support.diff	2013-06-17 18:07:30 UTC (rev 188680)
@@ -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