[arch-commits] Commit in qscintilla/repos (6 files)
Felix Yan
fyan at archlinux.org
Wed Apr 29 09:27:53 UTC 2015
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 <felixonmars at archlinux.org>
+# Contributor: 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.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 <shlomme at debian.org>
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+<scott at kitterman.com>
+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.py 2014-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.dirname(os.path.abspath(__file__))
++
+
+ ###############################################################################
+ # You shouldn't need to modify anything above this line.
+@@ -210,6 +212,8 @@
+ "The QScintilla version number could not be determined by "
+ "reading %s." % sciglobal)
+
++ return # Debian: do not check for the installed version, we're good this way.
++
+ lib_dir = target_configuration.qsci_lib_dir
+ if lib_dir is None:
+ lib_dir = target_configuration.qt_lib_dir
+@@ -264,7 +268,12 @@
+ the target configuration.
+ """
+
+- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
++ if target_configuration.pyqt_package == 'PyQt5':
++ return os.path.join(src_dir, 'sip/qscimod5.sip')
++ else:
++ return os.path.join(src_dir, 'sip/qscimod4.sip')
++
++ #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
+
+ def get_sip_installs(self, target_configuration):
+ """ Return a tuple of the installation directory of the module's .sip
Copied: qscintilla/repos/staging-x86_64/PKGBUILD (from rev 238242, qscintilla/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-04-29 09:27:52 UTC (rev 238243)
@@ -0,0 +1,84 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: 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.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-x86_64/configure.py-objdir-support.diff (from rev 238242, 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 2015-04-29 09:27:52 UTC (rev 238243)
@@ -0,0 +1,41 @@
+02_configure.dpatch by Torsten Marek <shlomme at debian.org>
+Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
+<scott at kitterman.com>
+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.py 2014-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.dirname(os.path.abspath(__file__))
++
+
+ ###############################################################################
+ # You shouldn't need to modify anything above this line.
+@@ -210,6 +212,8 @@
+ "The QScintilla version number could not be determined by "
+ "reading %s." % sciglobal)
+
++ return # Debian: do not check for the installed version, we're good this way.
++
+ lib_dir = target_configuration.qsci_lib_dir
+ if lib_dir is None:
+ lib_dir = target_configuration.qt_lib_dir
+@@ -264,7 +268,12 @@
+ the target configuration.
+ """
+
+- return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
++ if target_configuration.pyqt_package == 'PyQt5':
++ return os.path.join(src_dir, 'sip/qscimod5.sip')
++ else:
++ return os.path.join(src_dir, 'sip/qscimod4.sip')
++
++ #return 'sip/qscimod5.sip' if target_configuration.pyqt_package == 'PyQt5' else 'sip/qscimod4.sip'
+
+ def get_sip_installs(self, target_configuration):
+ """ Return a tuple of the installation directory of the module's .sip
More information about the arch-commits
mailing list