[arch-commits] Commit in qscintilla/trunk (PKGBUILD qscintilla-sip-5.3.patch)

[Antonio Rojas]

    Date: Wednesday, June 10, 2020 @ 06:48:44
  Author: arojas
Revision: 388711

Fix build with sip 5.3 (FS#66951)

Added:
  qscintilla/trunk/qscintilla-sip-5.3.patch
Modified:
  qscintilla/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   15 +++++++++++----
 qscintilla-sip-5.3.patch |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-10 06:32:01 UTC (rev 388710)
+++ PKGBUILD	2020-06-10 06:48:44 UTC (rev 388711)
@@ -6,16 +6,23 @@
 pkgbase=qscintilla
 pkgname=('qscintilla-qt5' 'python-qscintilla-qt5')
 pkgver=2.11.4
-pkgrel=2
+pkgrel=3
 license=('GPL')
 arch=('x86_64')
 url="https://www.riverbankcomputing.com/software/qscintilla/intro"
 makedepends=('python-pyqt5' 'qt5-tools' 'sip5' 'pyqt-builder')
-source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz")
-sha256sums=('723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20')
+source=("https://www.riverbankcomputing.com/static/Downloads/QScintilla/$pkgver/QScintilla-$pkgver.tar.gz"
+         qscintilla-sip-5.3.patch)
+sha256sums=('723f8f1d1686d9fc8f204cd855347e984322dd5cd727891d324d0d7d187bee20'
+            '917b57158deaf83682d8d383a2295e46c5510a629de8f3df775b941f3ab8b023')
 
+prepare() {
+  cd QScintilla-$pkgver
+  patch -p1 -i ../qscintilla-sip-5.3.patch # Fix build with sip 5.3
+}
+
 build() {
-  cd "$srcdir"/QScintilla-${pkgver}
+  cd QScintilla-${pkgver}
   export QMAKEFEATURES=$PWD/Qt4Qt5/features/
 
   cd Qt4Qt5

Added: qscintilla-sip-5.3.patch
===================================================================
--- qscintilla-sip-5.3.patch	                        (rev 0)
+++ qscintilla-sip-5.3.patch	2020-06-10 06:48:44 UTC (rev 388711)
@@ -0,0 +1,24 @@
+diff -ru QScintilla-2.11.5.dev2005091235/Python/sip/qsciabstractapis.sip QScintilla-2.11.5.dev2006091431/Python/sip/qsciabstractapis.sip
+--- QScintilla-2.11.5.dev2005091235/Python/sip/qsciabstractapis.sip	2020-06-09 03:34:50.000000000 +0200
++++ QScintilla-2.11.5.dev2006091431/Python/sip/qsciabstractapis.sip	2020-06-10 03:34:31.000000000 +0200
+@@ -25,7 +25,7 @@
+ %End
+ 
+ public:
+-    QsciAbstractAPIs(QsciLexer *lexer /TransferThis/ = 0);
++    QsciAbstractAPIs(QsciLexer *lexer /TransferThis/);
+     virtual ~QsciAbstractAPIs();
+ 
+     QsciLexer *lexer() const;
+diff -ru QScintilla-2.11.5.dev2005091235/Python/sip/qsciapis.sip QScintilla-2.11.5.dev2006091431/Python/sip/qsciapis.sip
+--- QScintilla-2.11.5.dev2005091235/Python/sip/qsciapis.sip	2020-06-09 03:34:50.000000000 +0200
++++ QScintilla-2.11.5.dev2006091431/Python/sip/qsciapis.sip	2020-06-10 03:34:31.000000000 +0200
+@@ -25,7 +25,7 @@
+ %End
+ 
+ public:
+-    QsciAPIs(QsciLexer *lexer /TransferThis/ = 0);
++    QsciAPIs(QsciLexer *lexer /TransferThis/);
+     virtual ~QsciAPIs();
+ 
+     void add(const QString &entry);