configure.py-objdir-support.diff

02_configure.dpatch by Torsten Marek <shlomme@debian.org>
Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman
<scott@kitterman.com>
patch the configure script for the Python bindings to support object dir
builds
Patch-Name: configure.py-objdir-support.diff

Gbp-Pq: Name 0002-configure.py-objdir-support.diff.patch

diff --git a/Python/configure.py b/Python/configure.py
index 560e104c4a4179f0247394a34c866b01efcc0661..04b805458706e7d3166ddb551af297215363f9a8 100644 (file)
--- a/Python/configure.py
+++ b/Python/configure.py
@@ -37,6 +37,7 @@ import sys
 # You shouldn't need to modify anything above this line.
 ###############################################################################
 
+src_dir = os.path.dirname(os.path.abspath(__file__))
 
 # This must be kept in sync with Python/configure-old.py, qscintilla.pro,
 # example-Qt4Qt5/application.pro and designer-Qt4Qt5/designer.pro.
@@ -221,6 +222,8 @@ class ModuleConfiguration(object):
                     "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
@@ -279,7 +282,12 @@ class ModuleConfiguration(object):
         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'
 
     @staticmethod
     def get_sip_installs(target_configuration):