[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Wednesday, April 29, 2015 @ 11:27:33
Author: fyan
Revision: 238242
upgpkg: qscintilla 2.9-1
Modified:
qscintilla/trunk/PKGBUILD
qscintilla/trunk/configure.py-objdir-support.diff
--+
PKGBUILD | 11 ++-
configure.py-objdir-support.diff |8
2 files changed, 10 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-29 08:52:14 UTC (rev 238241)
+++ PKGBUILD2015-04-29 09:27:33 UTC (rev 238242)
@@ -1,12 +1,13 @@
# $Id$
-# Maintainer: Andrea Scarpino and...@archlinux.org
+# Maintainer: Felix Yan felixonm...@archlinux.org
+# Contributor: Andrea Scarpino and...@archlinux.org
# Contributor: Douglas Soares de Andrade d...@aur.archlinux.org
pkgbase=qscintilla
pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
'python-qscintilla-common')
-pkgver=2.8.4
-pkgrel=3
+pkgver=2.9
+pkgrel=1
license=('GPL')
arch=('i686' 'x86_64')
url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
@@ -14,8 +15,8 @@
options=('!buildflags') # Fix Qt Designer plugin
source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz;
'configure.py-objdir-support.diff')
-md5sums=('28aec903ff48ae541295a4fb9c96f8ea'
- 'e304f8cd5e3e7ded61eda15bf56613a8')
+md5sums=('24659879edf9786f41a9b9268ce3c817'
+ '0a952497a52c85bf5c09dd2ee091e763')
prepare() {
cd QScintilla-gpl-${pkgver}
Modified: configure.py-objdir-support.diff
===
--- configure.py-objdir-support.diff2015-04-29 08:52:14 UTC (rev 238241)
+++ configure.py-objdir-support.diff2015-04-29 09:27:33 UTC (rev 238242)
@@ -8,14 +8,14 @@
--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py2014-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 glob
import optparse
+ import sys
+src_dir = os.path.dirname(os.path.abspath(__file__))
+
- try:
- import sysconfig
- except ImportError:
+
+
###
+ # 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)
[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Thursday, July 3, 2014 @ 22:25:54
Author: andrea
Revision: 216433
upgpkg: qscintilla 2.8.3-1
Upstream release
Modified:
qscintilla/trunk/PKGBUILD
Deleted:
qscintilla/trunk/configure.py-objdir-support.diff
--+
PKGBUILD | 15 ---
configure.py-objdir-support.diff | 21 -
2 files changed, 4 insertions(+), 32 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-07-03 20:25:44 UTC (rev 216432)
+++ PKGBUILD2014-07-03 20:25:54 UTC (rev 216433)
@@ -5,23 +5,16 @@
pkgbase=qscintilla
pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
'python-qscintilla-common')
-pkgver=2.8.1
-pkgrel=2
+pkgver=2.8.3
+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')
-source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz;
-'configure.py-objdir-support.diff')
-md5sums=('bbf4725583ee9817f89413dca6cd38d2'
- 'eae1bd23117c5f1f7f172a1c1e11f600')
+source=(http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz;)
+md5sums=('bbf6944a9d3b089a79763ca4e6486b9d')
-prepare() {
-cd QScintilla-gpl-${pkgver}
-patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff
-}
-
build() {
cd QScintilla-gpl-${pkgver}/Qt4Qt5
qmake-qt4 qscintilla.pro
Deleted: configure.py-objdir-support.diff
===
--- configure.py-objdir-support.diff2014-07-03 20:25:44 UTC (rev 216432)
+++ configure.py-objdir-support.diff2014-07-03 20:25:54 UTC (rev 216433)
@@ -1,21 +0,0 @@
QScintilla-gpl-2.7.1/Python/configure.py~ 2013-03-07 08:09:00.678704222
+
-+++ QScintilla-gpl-2.7.1/Python/configure.py 2013-03-07 08:11:48.860880852
+
-@@ -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
[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Thursday, March 7, 2013 @ 09:19:38
Author: andrea
Revision: 179561
upgpkg: qscintilla 2.7.1-1
Upstream release
Modified:
qscintilla/trunk/PKGBUILD
qscintilla/trunk/configure.py-objdir-support.diff
--+
PKGBUILD | 18 +
configure.py-objdir-support.diff | 50 +++--
2 files changed, 24 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-07 08:19:05 UTC (rev 179560)
+++ PKGBUILD2013-03-07 08:19:38 UTC (rev 179561)
@@ -5,20 +5,18 @@
pkgbase=qscintilla
pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
'python-qscintilla-common')
-pkgver=2.7
-pkgrel=2
+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=('a3857d75a2b332e0460131e0aa4cc4b5'
- '8cf9c06252e2f11ab00e62848e322fd3')
+md5sums=('da8939b5679a075e30c6632e54dc5abf'
+ 'eae1bd23117c5f1f7f172a1c1e11f600')
build() {
-. /etc/profile.d/qt4.sh
-
cd ${srcdir}/QScintilla-gpl-${pkgver}
patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff
@@ -26,18 +24,18 @@
qmake qscintilla.pro
make
-cd ../designer-Qt4
+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 -p 4
+python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
make
cd ../Python2
-python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
+python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c
make
}
@@ -48,7 +46,7 @@
cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5
make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
-cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4
+cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5
make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
}
Modified: configure.py-objdir-support.diff
===
--- configure.py-objdir-support.diff2013-03-07 08:19:05 UTC (rev 179560)
+++ configure.py-objdir-support.diff2013-03-07 08:19:38 UTC (rev 179561)
@@ -1,39 +1,21 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek shlo...@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.0
+0100
-+++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417
+0100
-@@ -33,6 +33,7 @@
+--- QScintilla-gpl-2.7.1/Python/configure.py~ 2013-03-07 08:09:00.678704222
+
QScintilla-gpl-2.7.1/Python/configure.py 2013-03-07 08:11:48.860880852
+
+@@ -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 @@
- # 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 = 0x04:
--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))
-
+ # 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
[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)
Date: Wednesday, July 14, 2010 @ 09:39:20
Author: jgc
Revision: 85482
Add patch from Debian to build python-qscintilla and qscintilla from one
PKGBUILD. Clean up build and use INSTALL_ROOT instead of copying and hacking
things around. Changes qsci.path due to the removed sed operations, the old one
was invalid
Added:
qscintilla/trunk/configure.py-objdir-support.diff
Modified:
qscintilla/trunk/PKGBUILD
--+
PKGBUILD | 63 -
configure.py-objdir-support.diff | 39 ++
2 files changed, 74 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-07-14 10:52:35 UTC (rev 85481)
+++ PKGBUILD2010-07-14 13:39:20 UTC (rev 85482)
@@ -4,48 +4,55 @@
# Contributor: Michal Krenek mi...@sg1.cz
# Contributor: DaNiMoTh jjdanimoth@gmail.com
-pkgname=qscintilla
+pkgbase=qscintilla
+pkgname=(qscintilla python-qscintilla)
pkgver=2.4.4
-pkgrel=1
+pkgrel=2
license=('GPL')
-pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class
arch=('i686' 'x86_64')
url=http://www.riverbankcomputing.co.uk/software/qscintilla/intro;
-depends=('qt')
-provides=('qscintilla2')
-conflicts=('qscintilla2')
-replaces=('qscintilla2')
-source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz;)
-md5sums=('db5f21723ea976ddd78c4c3662a21f9c')
+makedepends=('qt' 'pyqt')
+source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz
+configure.py-objdir-support.diff)
+md5sums=('db5f21723ea976ddd78c4c3662a21f9c'
+ '8cf9c06252e2f11ab00e62848e322fd3')
build() {
-cd $srcdir/QScintilla-gpl-$pkgver/Qt4
-sed -i s|header.path = .*|header.path = $pkgdir/usr/include|g
qscintilla.pro
-sed -i s|trans.path = .*|trans.path =
$pkgdir/usr/share/qt/translations|g qscintilla.pro
-sed -i s|qsci.path = .*|qsci.path = $pkgdir/usr/share/qt/translations|g
qscintilla.pro
+cd $srcdir/QScintilla-gpl-$pkgver
+patch -Np1 -i ${srcdir}/configure.py-objdir-support.diff
+cd Qt4
qmake qscintilla.pro
-sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile
make
-# Qt4 designer qscintilla2 plugin
cd ../designer-Qt4
-install -d ${pkgdir}/usr/lib/qt/plugins/designer
-echo INCPATH += ../Qt4 designer.pro
-sed -i s|LIBS.*|LIBS += -L../Qt4 -lqscintilla2|g designer.pro
-qmake designer.pro
+qmake designer.pro INCLUDEPATH+=../Qt4 QMAKE_LIBDIR+=../Qt4
make
+
+cd ../Python
+python configure.py -n ../Qt4/ -o ../Qt4 -c -p 4
+make
}
-package() {
- cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4
- make DESTDIR=${pkgdir} install
- cp libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/
- ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so
- ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so.5
- ln -s libqscintilla2.so.5.4.0 ${pkgdir}/usr/lib/libqscintilla2.so.5.4
+package_qscintilla() {
+pkgdesc=A port to Qt4 of Neil Hodgson's Scintilla C++ editor class
+provides=('qscintilla2')
+conflicts=('qscintilla2')
+replaces=('qscintilla2')
+depends=('qt')
- cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4
- cp libqscintillaplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/
+cd ${srcdir}/QScintilla-gpl-${pkgver}/Qt4
+make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+
+cd ${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4
+make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
}
+
+package_python-qscintilla() {
+pkgdesc=Python bindings for QScintilla2
+depends=('qscintilla' 'pyqt')
+
+cd ${srcdir}/QScintilla-gpl-${pkgver}/Python
+make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+}
Added: configure.py-objdir-support.diff
===
--- configure.py-objdir-support.diff(rev 0)
+++ configure.py-objdir-support.diff2010-07-14 13:39:20 UTC (rev 85482)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek shlo...@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.0
+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.
+
