[arch-commits] Commit in qscintilla/repos (4 files)
Antonio Rojas
arojas at archlinux.org
Sun Jul 8 19:41:00 UTC 2018
Date: Sunday, July 8, 2018 @ 19:41:00
Author: arojas
Revision: 328114
archrelease: copy trunk to testing-x86_64
Added:
qscintilla/repos/testing-x86_64/
qscintilla/repos/testing-x86_64/PKGBUILD
(from rev 328113, qscintilla/trunk/PKGBUILD)
qscintilla/repos/testing-x86_64/QScintilla_gpl-2.9.2-qt5.patch
(from rev 328113, qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch)
qscintilla/repos/testing-x86_64/configure.py-objdir-support.diff
(from rev 328113, qscintilla/trunk/configure.py-objdir-support.diff)
----------------------------------+
PKGBUILD | 164 +++++++++++++++++++++++++++++++++++++
QScintilla_gpl-2.9.2-qt5.patch | 36 ++++++++
configure.py-objdir-support.diff | 32 +++++++
3 files changed, 232 insertions(+)
Copied: qscintilla/repos/testing-x86_64/PKGBUILD (from rev 328113, qscintilla/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2018-07-08 19:41:00 UTC (rev 328114)
@@ -0,0 +1,164 @@
+# $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-qt4' 'python-qscintilla-qt4' 'python2-qscintilla-qt4'
+ 'python-qscintilla-qt4-common'
+ 'qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
+ 'python-qscintilla-qt5-common')
+pkgver=2.10.7
+pkgrel=1
+license=('GPL')
+arch=('x86_64')
+url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+makedepends=('python-pyqt4' 'python2-pyqt4' 'python-pyqt5' 'python2-pyqt5' 'qt5-tools')
+options=('!buildflags') # Fix Qt Designer plugin
+source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz")
+sha256sums=('670458de71dd4205e92d8f3b7bad9f667afece925703cde9df6d04bc23331a1a')
+
+prepare() {
+ cp -a QScintilla_gpl-${pkgver}{,-qt4}
+}
+
+build() {
+ cd "$srcdir"/QScintilla_gpl-${pkgver}
+ export QMAKEFEATURES=$PWD/Qt4Qt5/features/
+
+ cd Qt4Qt5
+ qmake-qt5
+ make
+
+ cd ../designer-Qt4Qt5
+ qmake-qt5 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+ make
+
+ cd ../
+ cp -rf Python Python2
+ cd Python
+ python configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 --no-dist-info
+ make
+
+ cd ../Python2
+ python2 configure.py --pyqt=PyQt5 -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt5 --no-dist-info
+ make
+
+ cd "$srcdir"/QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
+ qmake-qt4
+ make
+
+ cd ../designer-Qt4Qt5
+ qmake-qt4 INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
+ make
+
+ cd ../
+ cp -rf Python Python2
+ cd Python
+ python configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 --no-dist-info
+ make
+
+ cd ../Python2
+ python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4 --no-dist-info
+ make
+}
+
+package_qscintilla-qt5() {
+ pkgdesc="A port to Qt5 of Neil Hodgson's Scintilla C++ editor class"
+ depends=('qt5-base')
+
+ 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-qt5-common() {
+ pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt5 and python2-qscintilla-qt5"
+ depends=('qscintilla-qt5')
+
+ cd QScintilla_gpl-${pkgver}/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla
+ rm -r "${pkgdir}"/usr/lib
+}
+
+package_python-qscintilla-qt5() {
+ pkgdesc="Python 3.x bindings for QScintilla2"
+ depends=('python-qscintilla-qt5-common' 'python-pyqt5')
+
+ cd QScintilla_gpl-${pkgver}/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla-common
+ rm -r "${pkgdir}"/usr/share
+}
+
+package_python2-qscintilla-qt5() {
+ pkgdesc="Python 2.x bindings for QScintilla2"
+ depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
+
+ cd QScintilla_gpl-${pkgver}/Python2
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla
+ rm -r "${pkgdir}"/usr/share
+}
+
+package_qscintilla-qt4() {
+ pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
+ depends=('qt4')
+ replaces=('qscintilla<2.9.1')
+ conflicts=('qscintilla<2.9.1')
+ provides=("qscintilla=$pkgver")
+
+ cd QScintilla_gpl-${pkgver}-qt4/Qt4Qt5
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ cd ../designer-Qt4Qt5
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+}
+
+package_python-qscintilla-qt4-common() {
+ pkgdesc="Common python qscintilla bindings files shared between python-qscintilla-qt4 and python2-qscintilla-qt4"
+ depends=('qscintilla-qt4')
+ replaces=('python-qscintilla-common<2.9.1')
+ conflicts=('python-qscintilla-common<2.9.1')
+ provides=("python-qscintilla-common=$pkgver")
+
+ cd QScintilla_gpl-${pkgver}-qt4/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python-qscintilla
+ rm -r "${pkgdir}"/usr/lib
+}
+
+package_python-qscintilla-qt4() {
+ pkgdesc="Python 3.x bindings for QScintilla2"
+ depends=('python-qscintilla-qt4-common' 'python-pyqt4')
+ replaces=('python-qscintilla<2.9.1')
+ conflicts=('python-qscintilla<2.9.1')
+ provides=("python-qscintilla=$pkgver")
+
+ cd QScintilla_gpl-${pkgver}-qt4/Python
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python2-qscintilla-common
+ rm -r "${pkgdir}"/usr/share
+}
+
+package_python2-qscintilla-qt4() {
+ pkgdesc="Python 2.x bindings for QScintilla2"
+ depends=('python-qscintilla-qt4-common' 'python2-pyqt4')
+ replaces=('python2-qscintilla<2.9.1')
+ conflicts=('python2-qscintilla<2.9.1')
+ provides=("python2-qscintilla=$pkgver")
+
+ cd QScintilla_gpl-${pkgver}-qt4/Python2
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by python2-qscintilla-common
+ rm -r "${pkgdir}"/usr/share
+}
Copied: qscintilla/repos/testing-x86_64/QScintilla_gpl-2.9.2-qt5.patch (from rev 328113, qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch)
===================================================================
--- testing-x86_64/QScintilla_gpl-2.9.2-qt5.patch (rev 0)
+++ testing-x86_64/QScintilla_gpl-2.9.2-qt5.patch 2018-07-08 19:41:00 UTC (rev 328114)
@@ -0,0 +1,36 @@
+diff -up QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf
+--- QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf.qt5 2016-04-18 04:08:48.000000000 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/features/qscintilla2.prf 2016-04-18 08:13:23.935665305 -0500
+@@ -19,9 +19,17 @@ CONFIG(debug, debug|release) {
+ win32: {
+ LIBS += -lqscintilla2d
+ } else {
++ greaterThan(QT_MAJOR_VERSION, 4) {
++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++ } else {
+ LIBS += -lqscintilla2
+ }
++ }
+ }
+ } else {
++greaterThan(QT_MAJOR_VERSION, 4) {
++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+ LIBS += -lqscintilla2
+ }
++}
+diff -up QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro
+--- QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro.qt5 2016-04-18 08:13:23.951665381 -0500
++++ QScintilla_gpl-2.9.2/Qt4Qt5/qscintilla.pro 2016-04-18 08:14:20.807934597 -0500
+@@ -23,7 +23,11 @@
+ !win32:VERSION = 12.0.1
+
+ TEMPLATE = lib
++greaterThan(QT_MAJOR_VERSION, 4) {
++TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
++} else {
+ TARGET = qscintilla2
++}
+ CONFIG += qt warn_off release thread exceptions hide_symbols
+ INCLUDEPATH += . ../include ../lexlib ../src
+
Copied: qscintilla/repos/testing-x86_64/configure.py-objdir-support.diff (from rev 328113, qscintilla/trunk/configure.py-objdir-support.diff)
===================================================================
--- testing-x86_64/configure.py-objdir-support.diff (rev 0)
+++ testing-x86_64/configure.py-objdir-support.diff 2018-07-08 19:41:00 UTC (rev 328114)
@@ -0,0 +1,32 @@
+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.
+@@ -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