diff --git a/qscintilla-2.8.4-python-build-from-objdir.patch b/qscintilla-2.8.4-python-build-from-objdir.patch new file mode 100644 index 0000000..6d2e708 --- /dev/null +++ b/qscintilla-2.8.4-python-build-from-objdir.patch @@ -0,0 +1,41 @@ +02_configure.dpatch by Torsten Marek +Updated for Qscintilla 2.8.2 configure.py changes by Scott Kitterman + +patch the configure script for the Python bindings to support object dir +builds +Index: qscintilla2-2.8.3+dfsg/Python/configure.py +=================================================================== +--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py 2014-07-05 10:02:02.318834374 -0400 ++++ qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-05 10:02:02.306834375 -0400 +@@ -31,6 +31,8 @@ + import glob + import optparse + ++src_dir = os.path.dirname(os.path.abspath(__file__)) ++ + try: + import sysconfig + except ImportError: +@@ -210,6 +212,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 +@@ -264,7 +268,12 @@ + 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' + + def get_sip_installs(self, target_configuration): + """ Return a tuple of the installation directory of the module's .sip diff --git a/qscintilla-2.8.4-python-qsci-link.patch b/qscintilla-2.8.4-python-qsci-link.patch new file mode 100644 index 0000000..fdc82b5 --- /dev/null +++ b/qscintilla-2.8.4-python-qsci-link.patch @@ -0,0 +1,16 @@ +Index: qscintilla2-2.8.3+dfsg/Python/configure.py +=================================================================== +--- qscintilla2-2.8.3+dfsg.orig/Python/configure.py 2014-07-05 10:05:48.614827688 -0400 ++++ qscintilla2-2.8.3+dfsg/Python/configure.py 2014-07-05 10:05:48.610827688 -0400 +@@ -1434,7 +1434,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(''' diff --git a/qscintilla.spec b/qscintilla.spec index bcb8d98..e4a0c37 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -1,6 +1,6 @@ %define pythonsip_ver %(sip -V) Name: qscintilla -Version: 2.8.1 +Version: 2.8.4 Release: 1mamba Summary: A port to Qt of Neil Hodgson's Scintilla C++ editor control Group: Development/Tools @@ -11,6 +11,8 @@ URL: http://www.riverbankcomputing.co.uk/software/qscintilla Source: http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-%{version}/QScintilla-gpl-%{version}.tar.gz Patch0: qscintilla-2.7.2-prepend-local-includes.patch Patch1: qscintilla-2.7.2-designer-prepend-local-includes.patch +Patch2: qscintilla-2.8.4-python-build-from-objdir.patch +Patch3: qscintilla-2.8.4-python-qsci-link.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -22,7 +24,7 @@ BuildRequires: libstdc++6-devel #BuildRequires: qt-designer # following build requirements are for Python bindings # WARNING: do not parametrize python-sip-devel version or it will be useless for ports -BuildRequires: python-sip-devel >= 4.15.3 +BuildRequires: python-sip-devel >= 4.16.1 BuildRequires: PyQt4-devel #BuildRequires: chrpath Requires: python-sip = %{pythonsip_ver} @@ -99,6 +101,8 @@ This package contains development files for QScintilla PyQt4 bindings. #:<< _EOF #%patch0 -p1 #%patch1 -p1 +#%patch2 -p1 +#%patch3 -p1 sed -i "s/^DESTDIR = \$(QTDIR)/DESTDIR = \$(INSTALL_ROOT)\$(QTDIR)/" */*.pro @@ -110,10 +114,8 @@ find src include -type f -exec chmod 0644 {} ';' sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTION_ADDENDUM.TXT %build -export QTDIR=%{_qt4_prefix} QTLIB=%{_qt4_libdir} - cd Qt4Qt5 -sed -i 's/INSTALLS += header trans qsci/INSTALLS += header trans qsci target/g' qscintilla.pro +#sed -i 's/INSTALLS += header trans qsci/INSTALLS += header trans qsci target/g' qscintilla.pro %{_qt4_qmake} qscintilla.pro %make cd .. @@ -121,14 +123,17 @@ cd .. cd designer-Qt4Qt5 %{_qt4_qmake} designer.pro %make LFLAGS+="-L../Qt4Qt5 -shared -Wl,-O1" +#INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 cd .. cd Python %{__python} configure.py \ - -c -j 3 \ - -n ../Qt4Qt5 \ - -o ../Qt4Qt5 -%make + -c \ + --qsci-incdir=../Qt4Qt5 \ + --qsci-libdir=../Qt4Qt5 \ + --qmake /usr/bin/qmake-qt4 + +%make CXX="c++ -I../Qt4Qt5" cd .. %install @@ -186,9 +191,12 @@ cd .. %defattr(-,root,root) %dir %{_datadir}/sip/PyQt4/Qsci %{_datadir}/sip/PyQt4/Qsci/*.sip -%{_datadir}/qt4/api/python/QScintilla2.api +#%{_datadir}/qt4/api/python/QScintilla2.api %changelog +* Fri Sep 26 2014 Silvan Calarco 2.8.4-1mamba +- update to 2.8.4 + * Tue Apr 01 2014 Automatic Build System 2.8.1-1mamba - automatic version update by autodist