From bf3f787b0456f9a796be822b50a8d20c01934f13 Mon Sep 17 00:00:00 2001
From: Boris Savelev <boris@altlinux.org>
Date: Mon, 20 Jul 2009 14:48:07 +0400
Subject: [PATCH] qscintilla-2.4-alt-allinone.patch

---
 QScintilla-gpl/Python/configure.py       |   10 +++++++++-
 QScintilla-gpl/designer-Qt3/designer.pro |    7 +++++--
 QScintilla-gpl/designer-Qt4/designer.pro |    3 ++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/QScintilla-gpl/Python/configure.py b/QScintilla-gpl/Python/configure.py
index 733e725..fcf5c3c 100644
--- a/QScintilla-gpl/Python/configure.py
+++ b/QScintilla-gpl/Python/configure.py
@@ -35,6 +35,7 @@
 
 import sys
 import os
+import re
 import glob
 import optparse
 
@@ -75,6 +76,11 @@ QSCI_API_MAJOR = 5
 # Initialise the globals.
 sip_min_version = 0x040400
 
+qsci_version = None
+
+# get python version
+python_version = re.compile('^(\d\.\d).*').findall(sys.version)[0]
+
 if sys.platform == "win32":
     qsci_define = "QSCINTILLA_DLL"
 else:
@@ -292,8 +298,10 @@ def generate_code():
         makefile.extra_defines.append(qsci_define)
 
     makefile.extra_include_dirs.append(opts.qsciincdir)
-    makefile.extra_lib_dirs.append(opts.qscilibdir)
+    # do not include opt_qscilibdir to RPATH
+    makefile.LIBDIR.append(opts.qscilibdir)
     makefile.extra_libs.append("qscintilla2")
+    makefile.extra_libs.append("python%s" % python_version)
 
     makefile.generate()
 
diff --git a/QScintilla-gpl/designer-Qt3/designer.pro b/QScintilla-gpl/designer-Qt3/designer.pro
index afca518..418072d 100644
--- a/QScintilla-gpl/designer-Qt3/designer.pro
+++ b/QScintilla-gpl/designer-Qt3/designer.pro
@@ -3,10 +3,13 @@
 
 TEMPLATE = lib
 TARGET = qscintillaplugin
-DESTDIR = $(QTDIR)/plugins/designer
 
 CONFIG += qt warn_on release plugin
 
 SOURCES += qscintillaplugin.cpp
 
-LIBS += -lqscintilla2
+target.path = $$[QT_INSTALL_PLUGINS]/designer
+INSTALLS += target
+
+LIBS += -L../Qt3 -lqscintilla2
+INCPATH = ../Qt3
diff --git a/QScintilla-gpl/designer-Qt4/designer.pro b/QScintilla-gpl/designer-Qt4/designer.pro
index 18df870..6cdbeff 100644
--- a/QScintilla-gpl/designer-Qt4/designer.pro
+++ b/QScintilla-gpl/designer-Qt4/designer.pro
@@ -12,4 +12,5 @@ SOURCES = qscintillaplugin.cpp
 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS += target
 
-LIBS += -lqscintilla2
+LIBS += -L../Qt4 -lqscintilla2
+INCPATH = ../Qt4
-- 
1.6.3.3