summaryrefslogtreecommitdiffstats
path: root/abs/extra/qscintilla/configure.py-objdir-support.diff
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-12-02 18:13:59 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-12-02 18:13:59 (GMT)
commit066bcb38c4b416f0c380e9c8292a50f9103b72b6 (patch)
tree07de64551a26f8a292dd1fff09f006334d7e1396 /abs/extra/qscintilla/configure.py-objdir-support.diff
parentb0043b3d2e43f154d7a4d48db95ef59f2d504fdd (diff)
parentb5cb0290860bd55f2fd25238996601f2fd749615 (diff)
downloadlinhes_pkgbuild-066bcb38c4b416f0c380e9c8292a50f9103b72b6.zip
linhes_pkgbuild-066bcb38c4b416f0c380e9c8292a50f9103b72b6.tar.gz
linhes_pkgbuild-066bcb38c4b416f0c380e9c8292a50f9103b72b6.tar.bz2
Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra/qscintilla/configure.py-objdir-support.diff')
-rw-r--r--abs/extra/qscintilla/configure.py-objdir-support.diff39
1 files changed, 39 insertions, 0 deletions
diff --git a/abs/extra/qscintilla/configure.py-objdir-support.diff b/abs/extra/qscintilla/configure.py-objdir-support.diff
new file mode 100644
index 0000000..b595de1
--- /dev/null
+++ b/abs/extra/qscintilla/configure.py-objdir-support.diff
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
+##
+## DP: patch the configure script for the Python bindings to support object dir builds
+
+@DPATCH@
+Index: qscintilla2-2.4.2/Python/configure.py
+===================================================================
+--- qscintilla2-2.4.2.orig/Python/configure.py 2010-01-20 20:56:09.000000000 +0100
++++ qscintilla2-2.4.2/Python/configure.py 2010-01-27 22:54:35.603870417 +0100
+@@ -33,6 +33,7 @@
+ import glob
+ import optparse
+
++src_dir = os.path.dirname(os.path.abspath(__file__))
+
+ # Import SIP's configuration module so that we have access to the error
+ # reporting. Then try and import the configuration modules for both PyQt3 and
+@@ -162,7 +163,7 @@
+ if os.access(sciglobal, os.F_OK):
+ # Get the QScintilla version string.
+ _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
+-
++ return # Debian: do not check for the installed version, we're good this way.
+ if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
+ # Because we include the Python bindings with the C++ code we can
+ # reasonably force the same version to be used and not bother about
+@@ -232,9 +233,9 @@
+ argv.append(buildfile)
+
+ if pyqt.pyqt_version >= 0x040000:
+- argv.append("sip/qscimod4.sip")
++ argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
+ else:
+- argv.append("sip/qscimod3.sip")
++ argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
+
+ os.system(" ".join(argv))
+