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

[Evgeniy Alekseev]

    Date: Sunday, September 20, 2015 @ 12:15:29
  Author: arcanis
Revision: 141230

upgpkg: qscintilla-qt5 2.9-3
python3.5 rebuild

Added:
  qscintilla-qt5/trunk/qtdesigner-include.patch
Modified:
  qscintilla-qt5/trunk/ChangeLog
  qscintilla-qt5/trunk/PKGBUILD

--------------------------+
 ChangeLog                |    3 +++
 PKGBUILD                 |   13 ++++++++-----
 qtdesigner-include.patch |   12 ++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2015-09-20 10:15:02 UTC (rev 141229)
+++ ChangeLog	2015-09-20 10:15:29 UTC (rev 141230)
@@ -1,3 +1,6 @@
+2.9-3:
+python3.5 rebuild
+
 2.9-2:
 rebuild againist qt-5.5
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-20 10:15:02 UTC (rev 141229)
+++ PKGBUILD	2015-09-20 10:15:29 UTC (rev 141230)
@@ -6,7 +6,7 @@
 pkgname=('qscintilla-qt5' 'python-qscintilla-qt5' 'python2-qscintilla-qt5'
          'python-qscintilla-qt5-common')
 pkgver=2.9
-pkgrel=2
+pkgrel=3
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -14,11 +14,13 @@
 options=('!buildflags')
 source=("http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-${pkgver}/QScintilla-gpl-${pkgver}.tar.gz"
         'configure.py.patch'
-        'libname.patch')
+        'libname.patch'
+        'qtdesigner-include.patch')
 changelog=ChangeLog
 md5sums=('24659879edf9786f41a9b9268ce3c817'
          '196ba01efe8bf18f3f2e10826c577a11'
-         '1ac0fea53f72b0146e0820912ae8c48c')
+         '1ac0fea53f72b0146e0820912ae8c48c'
+         'd4591875037808b87acff66bae47f7eb')
 
 prepare() {
   cd "QScintilla-gpl-${pkgver}"
@@ -25,6 +27,7 @@
 
   patch -Np1 -i "${srcdir}/configure.py.patch"
   patch -Np1 -i "${srcdir}/libname.patch"
+  patch -Np1 -i "${srcdir}/qtdesigner-include.patch"
 
   cp -r Python{,2}
   find "Python2" -name '*.py' -type f -exec \
@@ -68,7 +71,7 @@
   make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
 
   # provided by python-qscintilla
-  rm -r "${pkgdir}/usr/lib/python3.4/site-packages/PyQt5/"
+  rm -r "${pkgdir}/usr/lib/python3.5/site-packages/PyQt5/"
 }
 
 package_python-qscintilla-qt5() {
@@ -76,7 +79,7 @@
   depends=('python-qscintilla-qt5-common' 'python-pyqt5')
 
   cd "QScintilla-gpl-${pkgver}/Python"
-  install -Dm755 Qsci.so "${pkgdir}/usr/lib/python3.4/site-packages/PyQt5/Qsci.so"
+  install -Dm755 Qsci.so "${pkgdir}/usr/lib/python3.5/site-packages/PyQt5/Qsci.so"
 }
 
 package_python2-qscintilla-qt5() {

Added: qtdesigner-include.patch
===================================================================
--- qtdesigner-include.patch	                        (rev 0)
+++ qtdesigner-include.patch	2015-09-20 10:15:29 UTC (rev 141230)
@@ -0,0 +1,12 @@
+diff -ruN QScintilla-gpl-2.9.orig/designer-Qt4Qt5/qscintillaplugin.h QScintilla-gpl-2.9/designer-Qt4Qt5/qscintillaplugin.h
+--- QScintilla-gpl-2.9.orig/designer-Qt4Qt5/qscintillaplugin.h	2015-09-19 14:41:37.557741350 +0300
++++ QScintilla-gpl-2.9/designer-Qt4Qt5/qscintillaplugin.h	2015-09-19 14:41:58.393662846 +0300
+@@ -4,7 +4,7 @@
+ #ifndef _QSCINTILLAPLUGIN_H
+ #define _QSCINTILLAPLUGIN_H
+ 
+-#include <QDesignerCustomWidgetInterface>
++#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+ 
+ 
+ class QScintillaPlugin : public QObject, public QDesignerCustomWidgetInterface