[arch-commits] Commit in qscintilla/trunk (PKGBUILD configure.py-objdir-support.diff)

[Andrea Scarpino]

    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
===================================================================
--- PKGBUILD	2014-07-03 20:25:44 UTC (rev 216432)
+++ PKGBUILD	2014-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.diff	2014-07-03 20:25:44 UTC (rev 216432)
+++ configure.py-objdir-support.diff	2014-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 +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 "