From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 30 Nov 2014 19:56:17 +0000 (+0100)
Subject: - fix failure to link python* packages to the lib (Closes: debian #751239)
X-Git-Tag: auto/th/qscintilla2-2.8.4-3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=23821e39e01f15e379efc9d00c9e0b4dd9919ef0;p=packages%2Fqscintilla2.git

- fix failure to link python* packages to the lib (Closes: debian #751239)
- rel 3
---

diff --git a/qscintilla2-link.patch b/qscintilla2-link.patch
new file mode 100644
index 0000000..999b229
--- /dev/null
+++ b/qscintilla2-link.patch
@@ -0,0 +1,16 @@
+Index: qscintilla2-2.8.4+dfsg/Python/configure.py
+===================================================================
+--- qscintilla2-2.8.4+dfsg.orig/Python/configure.py	2014-09-21 22:26:07.110346928 -0400
++++ qscintilla2-2.8.4+dfsg/Python/configure.py	2014-09-21 22:26:07.106346928 -0400
+@@ -1440,7 +1440,10 @@
+ 
+     libs = qmake_config.get('LIBS')
+     if libs:
+-        pro.write('LIBS += %s\n' % libs)
++        if target_config.pyqt_package == 'PyQt5':
++            pro.write('LIBS += %s -lqscintilla2-qt5\n' % libs)
++        else:
++            pro.write('LIBS += %s -lqscintilla2-qt4\n' % libs)
+ 
+     if not opts.static:
+         pro.write('''
diff --git a/qscintilla2.spec b/qscintilla2.spec
index 3c06a9c..e6d90e9 100644
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -18,7 +18,7 @@ Summary:	QScintilla2 - a port to Qt of the Scintilla editing component
 Summary(pl.UTF-8):	QScintilla2 - port komponentu edytora Scintilla dla biblioteki Qt
 Name:		qscintilla2
 Version:	2.8.4
-Release:	2
+Release:	3
 License:	GPL v2 or GPL v3 with Riverbank GPL Exception v1.1
 Group:		X11/Libraries
 Source0:	http://downloads.sourceforge.net/pyqt/QScintilla-gpl-%{version}.tar.gz
@@ -29,6 +29,7 @@ Patch2:		%{name}-make.patch
 Patch3:		%{name}-outoftree.patch
 Patch4:		%{name}-qt5.patch
 Patch5:		%{name}-mkspecs-dir.patch
+Patch6:		%{name}-link.patch
 URL:		http://www.riverbankcomputing.co.uk/software/qscintilla/
 %if %{with python2}
 BuildRequires:	python-sip-devel >= 2:%{sip_ver}
@@ -292,6 +293,7 @@ Wiązania Pythona 3 dla komponentu QScintilla2 (wersja dla PyQt5).
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 for qt in %{?with_qt4:qt4} %{?with_qt5:qt5} ; do