Hello community,
here is the log from the commit of package qscintilla-qt5 for openSUSE:Factory
checked in at 2017-04-24 09:47:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla-qt5 (Old)
and /work/SRC/openSUSE:Factory/.qscintilla-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla-qt5"
Mon Apr 24 09:47:36 2017 rev:2 rq:484372 version:2.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/qscintilla-qt5/python-qscintilla-qt5.changes
2016-10-19 13:01:28.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.qscintilla-qt5.new/python-qscintilla-qt5.changes
2017-04-24 09:47:36.461937750 +0200
@@ -1,0 +2,78 @@
+Sun Mar 12 16:15:39 UTC 2017 - [email protected]
+
+- Implement single-spec version
+
+-------------------------------------------------------------------
+Wed Mar 1 02:22:52 UTC 2017 - [email protected]
+
+- Update to 2.10
+ - Based on Scintilla v3.7.2.
+ - Added the QsciLexerJSON class.
+ - Added the QsciLexerMarkdown class.
+ - Added replaceHorizontalScrollBar() and replaceVerticalScrollBar() to
+ QsciScintillaBase.
+ - Added bytes() and a corresponding text() overload to QsciScintilla.
+ - Added EdgeMultipleLines to QsciScintilla::EdgeMode.
+ - Added addEdgeColumn() and clearEdgeColumns() to QsciScintilla.
+ - Added the marginRightClicked() signal to QsciScintilla.
+ - Added SymbolMarginColor to QsciScintilla::MarginType.
+ - Added setMarginBackgroundColor() and marginBackgroundColor() to
+ QsciScintilla.
+ - Added setMargins() and margins() to QsciScintilla.
+ - Added TriangleIndicator and TriangleCharacterIndicator to
+ QsciScintilla::IndicatorStyle.
+ - Added WsVisibleOnlyInIndent to QsciScintilla::WhitespaceVisibility.
+ - Added TabDrawMode, setTabDrawMode() and tabDrawMode() to QsciScintilla.
+ - Added InstanceProperty to QsciLexerCoffeeScript.
+ - Added EDGE_MULTILINE to QsciScintillaBase.
+ - Added INDIC_POINT and INDIC_POINTCHARACTER to QsciScintillaBase.
+ - Added SC_AC_FILLUP, SC_AC_DOUBLECLICK, SC_AC_TAB, SC_AC_NEWLINE and
+ SC_AC_COMMAND to QsciScintillaBase.
+ - Added SC_CASE_CAMEL to QsciScintillaBase.
+ - Added SC_CHARSET_CYRILLIC and SC_CHARSET_OEM866 to QsciScintillaBase.
+ - Added SC_FOLDDISPLAYTEXT_HIDDEN, SC_FOLDDISPLAYTEXT_STANDARD and
+ SC_FOLDDISPLAYTEXT_BOXED to QsciScintillaBase.
+ - Added SC_IDLESTYLING_NONE, SC_IDLESTYLING_TOVISIBLE,
+ SC_IDLESTYLING_AFTERVISIBLE and SC_IDLESTYLING_ALL to QsciScintillaBase.
+ - Added SC_MARGIN_COLOUR to QsciScintillaBase.
+ - Added SC_POPUP_NEVER, SC_POPUP_ALL and SC_POPUP_TEXT to QsciScintillaBase.
+ - Added SCI_FOLDDISPLAYTEXTSETSTYLE and SCI_TOGGLEFOLDSHOWTEXT to
+ QsciScintillaBase.
+ - Added SCI_GETIDLESTYLING and SCI_SETIDLESTYLING to QsciScintillaBase.
+ - Added SCI_GETMARGINBACKN and SCI_SETMARGINBACKN to QsciScintillaBase.
+ - Added SCI_GETMARGINS and SCI_SETMARGINS to QsciScintillaBase.
+ - Added SCI_GETMOUSEWHEELCAPTURES and SCI_SETMOUSEWHEELCAPTURES to
+ QsciScintillaBase.
+ - Added SCI_GETTABDRAWMODE and SCI_SETTABDRAWMODE to QsciScintillaBase.
+ - Added SCI_ISRANGEWORD to QsciScintillaBase.
+ - Added SCI_MULTIEDGEADDLINE and SCI_MULTIEDGECLEARALL to QsciScintillaBase.
+ - Added SCI_MULTIPLESELECTADDNEXT and SCI_MULTIPLESELECTADDEACH to
+ QsciScintillaBase.
+ - Added SCI_TARGETWHOLEDOCUMENT to QsciScintillaBase.
+ - Added SCLEX_JSON and SCLEX_EDIFACT to QsciScintillaBase.
+ - Added SCTD_LONGARROW and SCTD_STRIKEOUT to QsciScintillaBase.
+ - Added SCVS_NOWRAPLINESTART to QsciScintillaBase.
+ - Added SCWS_VISIBLEONLYININDENT to QsciScintillaBase.
+ - Added STYLE_FOLDDISPLAYTEXT to QsciScintillaBase.
+ - Added the SCN_AUTOCCOMPLETED() signal to QsciScintillaBase.
+ - Added the overloaded SCN_AUTOCSELECTION() and SCN_USERLISTSELECTION()
+ signals to QsciScintillaBase.
+ - Added the SCN_MARGINRIGHTCLICK() signal to QsciScintillaBase.
+ - Renamed SCI_GETTARGETRANGE to SCI_GETTARGETTEXT in QsciScintillaBase.
+ - Removed SCI_GETKEYSUNICODE and SCI_SETKEYSUNICODE to QsciScintillaBase.
+ - The autoCompletionFillups(), autoCompletionWordSeparators(), blockEnd(),
+ blockLookback(), blockStart(), blockStartKeyword(), braceStyle(),
+ caseSensitive(), indentationGuideView() and defaultStyle() methods of
+ QsciLexer are no longer marked as internal and are exposed to Python so
+ that they may be used by QsciLexerCustom sub-classes.
+ - The name of the library has been changed to include the major version
+ number of the version of Qt it is built against (ie. 4 or 5).
+
+-------------------------------------------------------------------
+Tue Jan 3 21:59:21 UTC 2017 - [email protected]
+
+- Update to 2.9.4
+ - Added the .api file for Python v3.6.
+ - Bug fixes.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qscintilla-qt5/qscintilla-qt5.changes
2016-10-19 13:01:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qscintilla-qt5.new/qscintilla-qt5.changes
2017-04-24 09:47:36.501932093 +0200
@@ -1,0 +2,78 @@
+Sat Apr 1 14:31:57 UTC 2017 - [email protected]
+
+- force -std=c++11 to compile with Leap 42.1
+
+-------------------------------------------------------------------
+Wed Mar 1 02:21:40 UTC 2017 - [email protected]
+
+- Update to 2.10
+ - Based on Scintilla v3.7.2.
+ - Added the QsciLexerJSON class.
+ - Added the QsciLexerMarkdown class.
+ - Added replaceHorizontalScrollBar() and replaceVerticalScrollBar() to
+ QsciScintillaBase.
+ - Added bytes() and a corresponding text() overload to QsciScintilla.
+ - Added EdgeMultipleLines to QsciScintilla::EdgeMode.
+ - Added addEdgeColumn() and clearEdgeColumns() to QsciScintilla.
+ - Added the marginRightClicked() signal to QsciScintilla.
+ - Added SymbolMarginColor to QsciScintilla::MarginType.
+ - Added setMarginBackgroundColor() and marginBackgroundColor() to
+ QsciScintilla.
+ - Added setMargins() and margins() to QsciScintilla.
+ - Added TriangleIndicator and TriangleCharacterIndicator to
+ QsciScintilla::IndicatorStyle.
+ - Added WsVisibleOnlyInIndent to QsciScintilla::WhitespaceVisibility.
+ - Added TabDrawMode, setTabDrawMode() and tabDrawMode() to QsciScintilla.
+ - Added InstanceProperty to QsciLexerCoffeeScript.
+ - Added EDGE_MULTILINE to QsciScintillaBase.
+ - Added INDIC_POINT and INDIC_POINTCHARACTER to QsciScintillaBase.
+ - Added SC_AC_FILLUP, SC_AC_DOUBLECLICK, SC_AC_TAB, SC_AC_NEWLINE and
+ SC_AC_COMMAND to QsciScintillaBase.
+ - Added SC_CASE_CAMEL to QsciScintillaBase.
+ - Added SC_CHARSET_CYRILLIC and SC_CHARSET_OEM866 to QsciScintillaBase.
+ - Added SC_FOLDDISPLAYTEXT_HIDDEN, SC_FOLDDISPLAYTEXT_STANDARD and
+ SC_FOLDDISPLAYTEXT_BOXED to QsciScintillaBase.
+ - Added SC_IDLESTYLING_NONE, SC_IDLESTYLING_TOVISIBLE,
+ SC_IDLESTYLING_AFTERVISIBLE and SC_IDLESTYLING_ALL to QsciScintillaBase.
+ - Added SC_MARGIN_COLOUR to QsciScintillaBase.
+ - Added SC_POPUP_NEVER, SC_POPUP_ALL and SC_POPUP_TEXT to QsciScintillaBase.
+ - Added SCI_FOLDDISPLAYTEXTSETSTYLE and SCI_TOGGLEFOLDSHOWTEXT to
+ QsciScintillaBase.
+ - Added SCI_GETIDLESTYLING and SCI_SETIDLESTYLING to QsciScintillaBase.
+ - Added SCI_GETMARGINBACKN and SCI_SETMARGINBACKN to QsciScintillaBase.
+ - Added SCI_GETMARGINS and SCI_SETMARGINS to QsciScintillaBase.
+ - Added SCI_GETMOUSEWHEELCAPTURES and SCI_SETMOUSEWHEELCAPTURES to
+ QsciScintillaBase.
+ - Added SCI_GETTABDRAWMODE and SCI_SETTABDRAWMODE to QsciScintillaBase.
+ - Added SCI_ISRANGEWORD to QsciScintillaBase.
+ - Added SCI_MULTIEDGEADDLINE and SCI_MULTIEDGECLEARALL to QsciScintillaBase.
+ - Added SCI_MULTIPLESELECTADDNEXT and SCI_MULTIPLESELECTADDEACH to
+ QsciScintillaBase.
+ - Added SCI_TARGETWHOLEDOCUMENT to QsciScintillaBase.
+ - Added SCLEX_JSON and SCLEX_EDIFACT to QsciScintillaBase.
+ - Added SCTD_LONGARROW and SCTD_STRIKEOUT to QsciScintillaBase.
+ - Added SCVS_NOWRAPLINESTART to QsciScintillaBase.
+ - Added SCWS_VISIBLEONLYININDENT to QsciScintillaBase.
+ - Added STYLE_FOLDDISPLAYTEXT to QsciScintillaBase.
+ - Added the SCN_AUTOCCOMPLETED() signal to QsciScintillaBase.
+ - Added the overloaded SCN_AUTOCSELECTION() and SCN_USERLISTSELECTION()
+ signals to QsciScintillaBase.
+ - Added the SCN_MARGINRIGHTCLICK() signal to QsciScintillaBase.
+ - Renamed SCI_GETTARGETRANGE to SCI_GETTARGETTEXT in QsciScintillaBase.
+ - Removed SCI_GETKEYSUNICODE and SCI_SETKEYSUNICODE to QsciScintillaBase.
+ - The autoCompletionFillups(), autoCompletionWordSeparators(), blockEnd(),
+ blockLookback(), blockStart(), blockStartKeyword(), braceStyle(),
+ caseSensitive(), indentationGuideView() and defaultStyle() methods of
+ QsciLexer are no longer marked as internal and are exposed to Python so
+ that they may be used by QsciLexerCustom sub-classes.
+ - The name of the library has been changed to include the major version
+ number of the version of Qt it is built against (ie. 4 or 5).
+
+-------------------------------------------------------------------
+Tue Jan 3 21:57:50 UTC 2017 - [email protected]
+
+- Update to 2.9.4
+ - Added the .api file for Python v3.6.
+ - Bug fixes.
+
+-------------------------------------------------------------------
Old:
----
QScintilla_gpl-2.9.3.tar.gz
python3-qscintilla-qt5.changes
python3-qscintilla-qt5.spec
New:
----
QScintilla_gpl-2.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qscintilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.e3x62O/_old 2017-04-24 09:47:37.413803121 +0200
+++ /var/tmp/diff_new_pack.e3x62O/_new 2017-04-24 09:47:37.413803121 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-qscintilla-qt5
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,9 @@
#
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-qscintilla-qt5
-Version: 2.9.3
+Version: 2.10
Release: 0
Summary: Python Bindings for the C++ Editor Class Library
License: GPL-3.0
@@ -26,18 +27,26 @@
Source:
http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla_gpl-%{version}.tar.gz
#PATCH-FIX-OPENSUSE: Rename qscintilla2 to qscintilla2-qt5:
Patch0: python-config.diff
+BuildRequires: %{python_module devel}
+BuildRequires: %{python_module qt5-devel}
+BuildRequires: %{python_module sip-devel >= 4.19.1}
BuildRequires: libqscintilla-qt5-devel
-BuildRequires: python-devel
-BuildRequires: python-qt5
-BuildRequires: python-qt5-devel
-BuildRequires: python-sip >= 4.18.1
-BuildRequires: python-sip-devel >= 4.18.1
+BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Widgets)
-Requires: python
-Requires: python-qt5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Requires: %{name}-sip = %{version}
+%ifpython2
+%requires_ge python2-qt5
+%{requires_python2_sip_api}
+%endif
+%ifpython3
+%requires_ge python3-qt5
+%{requires_python3_sip_api}
+%endif
+
+%python_subpackages
%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -47,41 +56,56 @@
This package is mainly used by eric, the Python IDE.
-%package sip
+
+%package -n %{name}-sip
Summary: Sip files for PyQScintilla
Group: Development/Libraries/Python
+Provides: %{python_module qscintilla-qt5-sip = %{version}}
-%description sip
+%description -n %{name}-sip
This package is needed to avoid conflicts between python-qscintilla and
python3-qscintilla packages. It contains sip files used to generate
bindings to QScintilla
+
%prep
%setup -q -n QScintilla_gpl-%{version}
%patch0 -p1
%build
-pushd Python
-python configure.py --pyqt=PyQt5 --qmake=%{_bindir}/qmake-qt5
+%{python_expand cp -r Python Python_%{$python_bin_suffix}
+pushd Python_%{$python_bin_suffix}
+
+$python configure.py --pyqt=PyQt5 --qmake=%{_bindir}/qmake-qt5
+
make %{?_smp_mflags}
+
popd
+}
+
%install
-pushd Python
-make DESTDIR=%{buildroot} install %{?_smp_mflags} INSTALL_ROOT=%{buildroot}
+%{python_expand pushd Python_%{$python_bin_suffix}
+
+%make_install INSTALL_ROOT=%{buildroot}
+
popd
-%files
+mv -T %{buildroot}%{_datadir}/qt5/qsci/api/python
%{buildroot}%{_datadir}/qt5/qsci/api/python_%{$python_bin_suffix}
+
+}
+
+%files %{python_files}
%defattr(-,root,root)
%doc NEWS README LICENSE
%{python_sitearch}/PyQt5/Qsci.so
%{python_sitearch}/PyQt5/Qsci.pyi
-%{_datadir}/qt5/qsci
-%{_datadir}/qt5/qsci/api
-%{_datadir}/qt5/qsci/api/python
-%{_datadir}/qt5/qsci/api/python/QScintilla2.api
+%dir %{_datadir}/qt5/qsci/
+%dir %{_datadir}/qt5/qsci/api/
+%dir %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/
+%{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/QScintilla2.api
-%files sip
+%files -n %{name}-sip
%defattr(-,root,root)
%{_datadir}/sip/PyQt5/Qsci
++++++ qscintilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.e3x62O/_old 2017-04-24 09:47:37.441799161 +0200
+++ /var/tmp/diff_new_pack.e3x62O/_new 2017-04-24 09:47:37.445798596 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qscintilla-qt5
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,10 +16,10 @@
#
-%define sonum 12
+%define sonum 13
%define debug_package_requires libqscintilla2-qt5-%{sonum} =
%{version}-%{release}
Name: qscintilla-qt5
-Version: 2.9.3
+Version: 2.10
Release: 0
Summary: C++ Editor Class Library
License: GPL-3.0
@@ -58,10 +58,10 @@
%package -n libqscintilla-qt5-devel
Summary: C++ Editor Class Library Development Files
Group: Development/Libraries/C and C++
+Requires: libqscintilla2-qt5-%{sonum} = %{version}
Requires: pkgconfig(Qt5Core)
Requires: pkgconfig(Qt5PrintSupport)
Requires: pkgconfig(Qt5Widgets)
-Requires: libqscintilla2-qt5-%{sonum} = %{version}
%description -n libqscintilla-qt5-devel
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -78,11 +78,11 @@
%build
pushd Qt4Qt5
mv features/qscintilla2.prf features/qscintilla2-qt5.prf
-qmake-qt5
+qmake-qt5 CONFIG+=c++11
make %{?_smp_mflags}
popd
pushd designer-Qt4Qt5
-qmake-qt5
+qmake-qt5 CONFIG+=c++11
make %{?_smp_mflags}
popd
++++++ QScintilla_gpl-2.9.3.tar.gz -> QScintilla_gpl-2.10.tar.gz ++++++
++++ 102653 lines of diff (skipped)
++++++ python-config.diff ++++++
--- /var/tmp/diff_new_pack.e3x62O/_old 2017-04-24 09:47:38.193692816 +0200
+++ /var/tmp/diff_new_pack.e3x62O/_new 2017-04-24 09:47:38.197692250 +0200
@@ -1,7 +1,15 @@
-diff -r -u QScintilla-gpl-2.9.orig/Python/configure.py
QScintilla-gpl-2.9/Python/configure.py
---- QScintilla-gpl-2.9.orig/Python/configure.py 2015-04-20
10:38:24.000000000 -0400
-+++ QScintilla-gpl-2.9/Python/configure.py 2015-07-19 11:18:09.111761115
-0400
-@@ -285,7 +285,7 @@
+--- QScintilla_gpl-2.10.orig/Python/configure.py 2017-02-20
07:49:30.000000000 -0500
++++ QScintilla_gpl-2.10/Python/configure.py 2017-02-28 22:46:27.978777650
-0500
+@@ -222,7 +222,7 @@
+ if lib_dir is None:
+ lib_dir = target_configuration.qt_lib_dir
+
+- if not glob.glob(os.path.join(lib_dir, '*qscintilla2_qt*')):
++ if not glob.glob(os.path.join(lib_dir, '*qscintilla2-qt*')):
+ error(
+ "The QScintilla library could not be found in %s. If "
+ "QScintilla is installed then use the --qsci-libdir "
+@@ -303,7 +303,7 @@
version of Qt. target_configuration is the target configuration.
"""
@@ -10,21 +18,13 @@
if target_configuration.qsci_inc_dir is not None:
qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
-@@ -311,7 +312,7 @@
- lib_dir = target_configuration.qt_lib_dir
-
- return os.path.join(lib_dir,
-- 'libqscintilla2.%s.dylib' % QSCI_API_MAJOR)
-+ 'libqscintilla2-qt5.%s.dylib' % QSCI_API_MAJOR)
-
-
-
###############################################################################
-@@ -1318,6 +1318,8 @@
+@@ -1415,6 +1415,9 @@
config = qmake_config.get('CONFIG')
if config:
pro.write('CONFIG += %s\n' % config)
+ pro.write('INCLUDEPATH += /usr/include/qt5/QtWidgets\n')
+ pro.write('INCLUDEPATH += /usr/include/qt5/QtPrintSupport\n')
-
++
+
# Work around QTBUG-39300.
pro.write('CONFIG -= android_install\n')
++++++ qscintilla-qt5.diff ++++++
--- /var/tmp/diff_new_pack.e3x62O/_old 2017-04-24 09:47:38.217689422 +0200
+++ /var/tmp/diff_new_pack.e3x62O/_new 2017-04-24 09:47:38.217689422 +0200
@@ -1,57 +1,81 @@
-diff -r -u QScintilla_gpl-2.9.3.orig/Python/configure.py
QScintilla_gpl-2.9.3/Python/configure.py
---- QScintilla_gpl-2.9.3.orig/Python/configure.py 2016-07-25
10:13:58.000000000 -0400
-+++ QScintilla_gpl-2.9.3/Python/configure.py 2016-07-26 14:31:01.447794110
-0400
-@@ -293,7 +293,7 @@
+diff -ru QScintilla_gpl-2.10.orig/designer-Qt4Qt5/designer.pro
QScintilla_gpl-2.10/designer-Qt4Qt5/designer.pro
+--- QScintilla_gpl-2.10.orig/designer-Qt4Qt5/designer.pro 2017-02-20
07:49:30.000000000 -0500
++++ QScintilla_gpl-2.10/designer-Qt4Qt5/designer.pro 2017-02-28
20:56:09.921686055 -0500
+@@ -2,9 +2,9 @@
+
+
+ TEMPLATE = lib
+-TARGET = qscintillaplugin
++TARGET = qscintillaplugin-qt5
+
+-CONFIG += plugin qscintilla2
++CONFIG += plugin qscintilla2-qt5
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ QT += designer
+@@ -24,3 +24,6 @@
+
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
++
++LIBS += -L../Qt4Qt5 -lqscintilla2-qt5
++INCLUDEPATH += ../Qt4Qt5
+diff -ru QScintilla_gpl-2.10.orig/example-Qt4Qt5/application.pro
QScintilla_gpl-2.10/example-Qt4Qt5/application.pro
+--- QScintilla_gpl-2.10.orig/example-Qt4Qt5/application.pro 2017-02-20
07:49:30.000000000 -0500
++++ QScintilla_gpl-2.10/example-Qt4Qt5/application.pro 2017-02-28
20:56:38.169668756 -0500
+@@ -1,4 +1,4 @@
+-CONFIG += qscintilla2
++CONFIG += qscintilla2-qt5
+
+ macx {
+ QMAKE_POST_LINK = install_name_tool -change
libqscintilla2_qt$${QT_MAJOR_VERSION}.13.dylib
$$[QT_INSTALL_LIBS]/libqscintilla2_qt$${QT_MAJOR_VERSION}.13.dylib $(TARGET)
+diff -ru QScintilla_gpl-2.10.orig/Python/configure.py
QScintilla_gpl-2.10/Python/configure.py
+--- QScintilla_gpl-2.10.orig/Python/configure.py 2017-02-20
07:49:30.000000000 -0500
++++ QScintilla_gpl-2.10/Python/configure.py 2017-02-28 20:35:34.261809703
-0500
+@@ -303,7 +303,7 @@
version of Qt. target_configuration is the target configuration.
"""
- qmake = {'CONFIG': 'qscintilla2'}
-+ qmake = {'CONFIG': 'qscintilla2-qt5'}
++ qmake = {'CONFIG': 'qscintilla2-qt%s' %
target_configuration.qt_version_str[0]}
if target_configuration.qsci_inc_dir is not None:
qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
-@@ -319,7 +319,7 @@
- lib_dir = target_configuration.qt_lib_dir
-
- return os.path.join(lib_dir,
-- 'libqscintilla2.%s.dylib' % QSCI_API_MAJOR)
-+ 'libqscintilla2-qt5.%s.dylib' % QSCI_API_MAJOR)
-
-
-
###############################################################################
-Only in QScintilla_gpl-2.9.3/Python: configure.py.orig
-diff -r -u QScintilla_gpl-2.9.3.orig/Qt4Qt5/features/qscintilla2.prf
QScintilla_gpl-2.9.3/Qt4Qt5/features/qscintilla2.prf
---- QScintilla_gpl-2.9.3.orig/Qt4Qt5/features/qscintilla2.prf 2016-07-25
10:13:58.000000000 -0400
-+++ QScintilla_gpl-2.9.3/Qt4Qt5/features/qscintilla2.prf 2016-07-26
14:31:01.447794110 -0400
-@@ -14,14 +14,14 @@
-
- CONFIG(debug, debug|release) {
- mac: {
-- LIBS += -lqscintilla2_debug
-+ LIBS += -lqscintilla2-qt5_debug
- } else {
+@@ -1415,6 +1415,9 @@
+ config = qmake_config.get('CONFIG')
+ if config:
+ pro.write('CONFIG += %s\n' % config)
++ pro.write('INCLUDEPATH += /usr/include/qt5/QtWidgets\n')
++ pro.write('INCLUDEPATH += /usr/include/qt5/QtPrintSupport\n')
++
+
+ # Work around QTBUG-39300.
+ pro.write('CONFIG -= android_install\n')
+diff -ru QScintilla_gpl-2.10.orig/Qt4Qt5/features/qscintilla2.prf
QScintilla_gpl-2.10/Qt4Qt5/features/qscintilla2.prf
+--- QScintilla_gpl-2.10.orig/Qt4Qt5/features/qscintilla2.prf 2017-02-20
07:49:30.000000000 -0500
++++ QScintilla_gpl-2.10/Qt4Qt5/features/qscintilla2.prf 2017-02-28
20:52:48.757796444 -0500
+@@ -19,9 +19,9 @@
win32: {
- LIBS += -lqscintilla2d
+ LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}d
} else {
-- LIBS += -lqscintilla2
-+ LIBS += -lqscintilla2-qt5
+- LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
}
}
} else {
-- LIBS += -lqscintilla2
-+ LIBS += -lqscintilla2-qt5
+- LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
++ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
}
-Only in QScintilla_gpl-2.9.3/Qt4Qt5/features: qscintilla2.prf.orig
-diff -r -u QScintilla_gpl-2.9.3.orig/Qt4Qt5/qscintilla.pro
QScintilla_gpl-2.9.3/Qt4Qt5/qscintilla.pro
---- QScintilla_gpl-2.9.3.orig/Qt4Qt5/qscintilla.pro 2016-07-25
10:13:58.000000000 -0400
-+++ QScintilla_gpl-2.9.3/Qt4Qt5/qscintilla.pro 2016-07-26 14:32:53.531381738
-0400
+diff -ru QScintilla_gpl-2.10.orig/Qt4Qt5/qscintilla.pro
QScintilla_gpl-2.10/Qt4Qt5/qscintilla.pro
+--- QScintilla_gpl-2.10.orig/Qt4Qt5/qscintilla.pro 2017-02-20
07:49:30.000000000 -0500
++++ QScintilla_gpl-2.10/Qt4Qt5/qscintilla.pro 2017-02-28 20:55:12.221720078
-0500
@@ -23,7 +23,7 @@
- !win32:VERSION = 12.0.2
+ !win32:VERSION = 13.0.0
TEMPLATE = lib
--TARGET = qscintilla2
-+TARGET = qscintilla2-qt5
- CONFIG += qt warn_off release thread exceptions hide_symbols
+-TARGET = qscintilla2_qt$${QT_MAJOR_VERSION}
++TARGET = qscintilla2-qt$${QT_MAJOR_VERSION}
+ CONFIG += qt warn_off thread exceptions hide_symbols
INCLUDEPATH += . ../include ../lexlib ../src
@@ -68,9 +68,9 @@
@@ -66,50 +90,3 @@
}
INSTALLS += features
-Only in QScintilla_gpl-2.9.3/Qt4Qt5: qscintilla.pro.orig
-Only in QScintilla_gpl-2.9.3/Qt4Qt5: qscintilla.pro.rej
-Only in QScintilla_gpl-2.9.3/Qt4Qt5: qscintilla.pro~
-diff -r -u QScintilla_gpl-2.9.3.orig/designer-Qt4Qt5/designer.pro
QScintilla_gpl-2.9.3/designer-Qt4Qt5/designer.pro
---- QScintilla_gpl-2.9.3.orig/designer-Qt4Qt5/designer.pro 2016-07-25
10:13:58.000000000 -0400
-+++ QScintilla_gpl-2.9.3/designer-Qt4Qt5/designer.pro 2016-07-26
14:31:01.447794110 -0400
-@@ -2,9 +2,9 @@
-
-
- TEMPLATE = lib
--TARGET = qscintillaplugin
-+TARGET = qscintillaplugin-qt5
-
--CONFIG += release plugin qscintilla2
-+CONFIG += release plugin qscintilla2-qt5
-
- greaterThan(QT_MAJOR_VERSION, 4) {
- QT += designer
-@@ -16,7 +16,7 @@
- }
-
- macx {
-- QMAKE_POST_LINK = install_name_tool -change libqscintilla2.12.dylib
$$[QT_INSTALL_LIBS]/libqscintilla2.12.dylib $(TARGET)
-+ QMAKE_POST_LINK = install_name_tool -change libqscintilla2-qt5.12.dylib
$$[QT_INSTALL_LIBS]/libqscintilla2-qt5.12.dylib $(TARGET)
- }
-
- HEADERS = qscintillaplugin.h
-@@ -24,3 +24,6 @@
-
- target.path = $$[QT_INSTALL_PLUGINS]/designer
- INSTALLS += target
-+
-+LIBS += -L../Qt4Qt5 -lqscintilla2-qt5
-+INCLUDEPATH += ../Qt4Qt5
-diff -r -u QScintilla_gpl-2.9.3.orig/example-Qt4Qt5/application.pro
QScintilla_gpl-2.9.3/example-Qt4Qt5/application.pro
---- QScintilla_gpl-2.9.3.orig/example-Qt4Qt5/application.pro 2016-07-25
10:13:58.000000000 -0400
-+++ QScintilla_gpl-2.9.3/example-Qt4Qt5/application.pro 2016-07-26
14:31:01.448794085 -0400
-@@ -1,7 +1,7 @@
--CONFIG += release qscintilla2
-+CONFIG += release qscintilla2-qt5
-
- macx {
-- QMAKE_POST_LINK = install_name_tool -change libqscintilla2.12.dylib
$$[QT_INSTALL_LIBS]/libqscintilla2.12.dylib $(TARGET)
-+ QMAKE_POST_LINK = install_name_tool -change libqscintilla2-qt5.12.dylib
$$[QT_INSTALL_LIBS]/libqscintilla2-qt5.12.dylib $(TARGET)
- }
-
- HEADERS = mainwindow.h
