[arch-commits] Commit in qscintilla/trunk (3 files)

[Antonio Rojas]

    Date: Sunday, February 10, 2019 @ 15:22:16
  Author: arojas
Revision: 345840

Update to 2.11

Modified:
  qscintilla/trunk/PKGBUILD
Deleted:
  qscintilla/trunk/QScintilla_gpl-2.9.2-qt5.patch
  qscintilla/trunk/configure.py-objdir-support.diff

----------------------------------+
 PKGBUILD                         |   10 +++++-----
 QScintilla_gpl-2.9.2-qt5.patch   |   36 ------------------------------------
 configure.py-objdir-support.diff |   32 --------------------------------
 3 files changed, 5 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-10 15:19:50 UTC (rev 345839)
+++ PKGBUILD	2019-02-10 15:22:16 UTC (rev 345840)
@@ -5,7 +5,7 @@
 pkgbase=qscintilla
 pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
          'python-qscintilla-qt5-common')
-pkgver=2.10.8
+pkgver=2.11
 pkgrel=1
 license=('GPL')
 arch=('x86_64')
@@ -12,8 +12,8 @@
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python-pyqt5' 'python2-pyqt5' 'qt5-tools' 'sip')
 options=('!buildflags') # Fix Qt Designer plugin
-source=("http://downloads.sourceforge.net/pyqt/QScintilla_gpl-${pkgver}.tar.gz")
-sha256sums=('46cd5b4e609ca5e13130ba8cc7028d44fd1dc5b037f97c492899006ed0c992eb')
+source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-$pkgver.tar.gz")
+sha256sums=('c2c0f097522c5aea16c71dc79deefc7f0416a17c091cf264cbe48846a29204a6')
 
 build() {
     cd "$srcdir"/QScintilla_gpl-${pkgver}
@@ -65,7 +65,7 @@
     depends=('python-qscintilla-qt5-common' 'python-pyqt5')
 
     cd QScintilla_gpl-${pkgver}/Python
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1
 
     # Provided by python-qscintilla-common
     rm -r "${pkgdir}"/usr/share
@@ -76,7 +76,7 @@
     depends=('python-qscintilla-qt5-common' 'python2-pyqt5')
 
     cd QScintilla_gpl-${pkgver}/Python2
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install -j1
 
     # Provided by python-qscintilla
     rm -r "${pkgdir}"/usr/share

Deleted: QScintilla_gpl-2.9.2-qt5.patch
===================================================================
--- QScintilla_gpl-2.9.2-qt5.patch	2019-02-10 15:19:50 UTC (rev 345839)
+++ QScintilla_gpl-2.9.2-qt5.patch	2019-02-10 15:22:16 UTC (rev 345840)
@@ -1,36 +0,0 @@
-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
- 

Deleted: configure.py-objdir-support.diff
===================================================================
--- configure.py-objdir-support.diff	2019-02-10 15:19:50 UTC (rev 345839)
+++ configure.py-objdir-support.diff	2019-02-10 15:22:16 UTC (rev 345840)
@@ -1,32 +0,0 @@
-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