[arch-commits] Commit in qscintilla-qt5/trunk (ChangeLog PKGBUILD configure.py.patch)

[Evgeniy Alekseev]

    Date: Sunday, April 26, 2015 @ 21:03:56
  Author: arcanis
Revision: 132280

upgpkg: qscintilla-qt5 2.9-1

Modified:
  qscintilla-qt5/trunk/ChangeLog
  qscintilla-qt5/trunk/PKGBUILD
  qscintilla-qt5/trunk/configure.py.patch

--------------------+
 ChangeLog          |    3 +++
 PKGBUILD           |    8 ++++----
 configure.py.patch |   27 +++++++++++----------------
 3 files changed, 18 insertions(+), 20 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-04-26 18:40:30 UTC (rev 132279)
+++ ChangeLog	2015-04-26 19:03:56 UTC (rev 132280)
@@ -1,3 +1,6 @@
+2.9-1:
+upstream update
+
 2.8.4-2:
 remov conflict with qsctintilla
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-26 18:40:30 UTC (rev 132279)
+++ PKGBUILD	2015-04-26 19:03:56 UTC (rev 132280)
@@ -5,8 +5,8 @@
 pkgbase=qscintilla-qt5
 pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
          'python-qscintilla-qt5-common')
-pkgver=2.8.4
-pkgrel=2
+pkgver=2.9
+pkgrel=1
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -16,8 +16,8 @@
         'configure.py.patch'
         'libname.patch')
 changelog=ChangeLog
-md5sums=('28aec903ff48ae541295a4fb9c96f8ea'
-         'ea1d11d0a87341d2e55ebef6beeb5663'
+md5sums=('24659879edf9786f41a9b9268ce3c817'
+         '196ba01efe8bf18f3f2e10826c577a11'
          '1ac0fea53f72b0146e0820912ae8c48c')
 
 prepare() {

Modified: configure.py.patch
===================================================================
--- configure.py.patch	2015-04-26 18:40:30 UTC (rev 132279)
+++ configure.py.patch	2015-04-26 19:03:56 UTC (rev 132280)
@@ -1,14 +1,14 @@
---- QScintilla-gpl-2.8.3/Python/configure.py~	2013-08-11 08:09:00.678704222 +0000
-+++ QScintilla-gpl-2.8.3/Python/configure.py	2013-08-11 08:11:48.860880852 +0000
-@@ -30,6 +30,7 @@
+--- QScintilla-gpl-2.9/Python/configure.py.orig	2015-04-20 17:38:24.000000000 +0300
++++ QScintilla-gpl-2.9/Python/configure.py	2015-04-26 21:54:18.000000000 +0300
+@@ -31,6 +31,7 @@
  import os
- import glob
  import optparse
+ import sys
 +src_dir = os.path.dirname(os.path.abspath(__file__))
  
- try:
-     import sysconfig
-@@ -210,6 +212,8 @@
+ 
+ ###############################################################################
+@@ -206,6 +207,8 @@
                      "The QScintilla version number could not be determined by "
                      "reading %s." % sciglobal)
  
@@ -17,21 +17,16 @@
          lib_dir = target_configuration.qsci_lib_dir
          if lib_dir is None:
              lib_dir = target_configuration.qt_lib_dir
-@@ -264,7 +265,12 @@
+@@ -260,7 +263,7 @@
          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'
++        return os.path.join(src_dir, 'sip/qscimod5.sip') if target_configuration.pyqt_package == 'PyQt5' else os.path.join(src_dir, 'sip/qscimod4.sip')
  
      def get_sip_installs(self, target_configuration):
          """ Return a tuple of the installation directory of the module's .sip
-@@ -1413,6 +1423,7 @@
+@@ -1411,6 +1414,7 @@
      includepath = qmake_config.get('INCLUDEPATH')
      if includepath:
          pro.write('INCLUDEPATH += %s\n' % includepath)
@@ -39,7 +34,7 @@
  
      # Make sure the SIP include directory is searched before the Python include
      # directory if they are different.
-@@ -1422,7 +1433,10 @@
+@@ -1420,7 +1424,10 @@
  
      libs = qmake_config.get('LIBS')
      if libs: