Merge pull request #3569 from Rmys/master

qscintilla2-2.10:Version Bump

desktop/toolkit/qscintilla2/actions.py

@@ -62,11 +62,11 @@ def install():
     shelltools.cd("../Python3")
     #autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     qt5.install("INSTALL_ROOT=%s" % get.installDIR())
-    pisitools.insinto("/usr/lib/python3.4/site-packages/PyQt5", "Qsci.so")
+    #pisitools.insinto("/usr/lib/python3.6/site-packages/PyQt5", "Qsci.so")
     shelltools.cd("../Python")
     #autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     qt5.install("INSTALL_ROOT=%s" % get.installDIR())
-    pisitools.insinto("/usr/lib/python2.7/site-packages/PyQt5", "Qsci.so")
+    #pisitools.insinto("/usr/lib/python2.7/site-packages/PyQt5", "Qsci.so")
 
     shelltools.cd("..")
     pisitools.dohtml("doc/html-Qt4Qt5/")

desktop/toolkit/qscintilla2/files/configure.py.patch

@@ -8,41 +8,11 @@
  
  
  ###############################################################################
-@@ -206,6 +207,8 @@
-                     "The QScintilla version number could not be determined by "
-                     "reading %s." % sciglobal)
- 
-+        return # Debian: do not check for the installed version, we're good this way.
-+
-         lib_dir = target_configuration.qsci_lib_dir
-         if lib_dir is None:
-             lib_dir = target_configuration.qt_lib_dir
-@@ -260,7 +263,7 @@
-         the target configuration.
-         """
- 
--        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
 @@ -1411,6 +1414,7 @@
      includepath = qmake_config.get('INCLUDEPATH')
      if includepath:
          pro.write('INCLUDEPATH += %s\n' % includepath)
-+        pro.write('INCLUDEPATH += %s\n' % '/usr/include/qt/QtWidgets /usr/include/qt/QtPrintSupport')
++        pro.write('INCLUDEPATH += %s\n' % '/usr/include/qt5/QtWidgets /usr/include/qt5/QtPrintSupport')
  
      # Make sure the SIP include directory is searched before the Python include
      # directory if they are different.
-@@ -1420,7 +1424,10 @@
- 
-     libs = qmake_config.get('LIBS')
-     if libs:
--        pro.write('LIBS += %s\n' % libs)
-+        if target_config.pyqt_package == 'PyQt5':
-+            pro.write('LIBS += %s -lqt5scintilla2\n' % libs)
-+        else:
-+            pro.write('LIBS += %s -lqscintilla2\n' % libs)
- 
-     if not opts.static:
-         pro.write('''

desktop/toolkit/qscintilla2/pspec.xml

@@ -29,7 +29,7 @@
             <Dependency versionFrom="13.0.4">mesa-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <!--<Patch>configure.py.patch</Patch>-->
+            <Patch>configure.py.patch</Patch>
             <!--<Patch>libname.patch</Patch>-->
         </Patches>
     </Source>
@@ -111,11 +111,11 @@
 
     <History>
         <Update release="3">
-            <Date>2017-03-31</Date>
+            <Date>2017-06-02</Date>
             <Version>2.10</Version>
-            <Comment>Release Bump</Comment>
+            <Comment>Version Bump</Comment>
-            <Name>Stefan Gronewold</Name>
+            <Name>Mustafa Cinasal</Name>
-            <Email>groni@pisilinux.org</Email>
+            <Email>muscnsl@gmail.com</Email>
         </Update>
         <Update release="2">
             <Date>2016-06-09</Date>