diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /staging/qscintilla | |
parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'staging/qscintilla')
-rw-r--r-- | staging/qscintilla/PKGBUILD | 80 | ||||
-rw-r--r-- | staging/qscintilla/configure.py-objdir-support.diff | 39 |
2 files changed, 0 insertions, 119 deletions
diff --git a/staging/qscintilla/PKGBUILD b/staging/qscintilla/PKGBUILD deleted file mode 100644 index acb9eadfd..000000000 --- a/staging/qscintilla/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 167919 2012-10-03 20:22:14Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -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" -} diff --git a/staging/qscintilla/configure.py-objdir-support.diff b/staging/qscintilla/configure.py-objdir-support.diff deleted file mode 100644 index b595de18c..000000000 --- a/staging/qscintilla/configure.py-objdir-support.diff +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_configure.dpatch by Torsten Marek <shlomme@debian.org> -## -## 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.000000000 +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 -@@ -162,7 +163,7 @@ - if os.access(sciglobal, os.F_OK): - # Get the QScintilla version string. - _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR") -- -+ return # Debian: do not check for the installed version, we're good this way. - if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")): - # Because we include the Python bindings with the C++ code we can - # reasonably force the same version to be used and not bother about -@@ -232,9 +233,9 @@ - argv.append(buildfile) - - if pyqt.pyqt_version >= 0x040000: -- argv.append("sip/qscimod4.sip") -+ argv.append(os.path.join(src_dir, "sip/qscimod4.sip")) - else: -- argv.append("sip/qscimod3.sip") -+ argv.append(os.path.join(src_dir, "sip/qscimod3.sip")) - - os.system(" ".join(argv)) - |