Hello community,
here is the log from the commit of package qscintilla-qt5 for openSUSE:Factory
checked in at 2017-06-15 11:19:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla-qt5 (Old)
and /work/SRC/openSUSE:Factory/.qscintilla-qt5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla-qt5"
Thu Jun 15 11:19:03 2017 rev:3 rq:498496 version:2.10
Changes:
--------
New Changes file:
--- /dev/null 2017-03-01 00:40:19.279048016 +0100
+++
/work/SRC/openSUSE:Factory/.qscintilla-qt5.new/python-qscintilla-qt4.changes
2017-06-15 11:19:09.167334493 +0200
@@ -0,0 +1,547 @@
+-------------------------------------------------------------------
+Thu May 25 11:44:23 UTC 2017 - [email protected]
+
+- Fix python Requires, Provides, and Obsoletes.
+ This pulls in proper dependencies and avoids conflicts.
+
+-------------------------------------------------------------------
+Wed Apr 19 13:51:09 UTC 2017 - [email protected]
+
+- Add qt4 versions as subpackages.
+- Rename qt4 versions to use -qt4 suffix.
+
+-------------------------------------------------------------------
+Sat Apr 1 14:31:57 UTC 2017 - [email protected]
+
+- force -std=c++11 to compile with Leap 42.1
+
+-------------------------------------------------------------------
+Sun Mar 12 16:15:39 UTC 2017 - [email protected]
+
+- Implement single-spec python version
+
+-------------------------------------------------------------------
+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.
+
+-------------------------------------------------------------------
+Tue Jul 26 19:42:21 UTC 2016 - [email protected]
+
+- Update to 2.9.3
+ - Bug fixes
+- Update to 2.9.2
+ - Added support for a PEP 484 stub file for the Python extension module.
+
+-------------------------------------------------------------------
+Fri Oct 30 18:24:38 UTC 2015 - [email protected]
+
+- Update to 2.9.1
+ - This is primarily a bug-fix release.
+
+-------------------------------------------------------------------
+Sat Jul 18 21:03:26 UTC 2015 - [email protected]
+
+- Update to 2.9
+ - Based on Scintilla v3.5.4.
+ - Added UserLiteral, InactiveUserLiteral, TaskMarker, InactiveTaskMarker,
+ EscapeSequence, InactiveEscapeSequence, setHighlightBackQuotedStrings(),
+ highlightBackQuotedStrings(), setHighlightEscapeSequences(),
+ highlightEscapeSequences(), setVerbatimStringEscapeSequencesAllowed() and
+ verbatimStringEscapeSequencesAllowed() to QsciLexerCPP.
+ - Added CommentKeyword, DeclareInputPort, DeclareOutputPort,
+ DeclareInputOutputPort, PortConnection and the inactive versions of all
+ styles to QsciLexerVerilog.
+ - Added CommentBlock to QsciLexerVHDL.
+ - Added AnnotationIndented to QsciScintilla::AnnotationDisplay.
+ - Added FullBoxIndicator, ThickCompositionIndicator, ThinCompositionIndicator
+ and TextColorIndicator to QsciScintilla::IndicatorStyle.
+ - Added setIndicatorHoverForegroundColor() and setIndicatorHoverStyle() to
+ QsciScintilla.
+ - Added Bookmark to QsciScintilla::MarkerSymbol.
+ - Added WrapWhitespace to QsciScintilla::WrapMode.
+ - Added SCLEX_AS, SCLEX_BIBTEX, SCLEX_DMAP, SCLEX_DMIS, SCLEX_IHEX,
+ SCLEX_REGISTRY, SCLEX_SREC and SCLEX_TEHEX to QsciScintillaBase.
+ - Added SCI_CHANGEINSERTION to QsciScintillaBase.
+ - Added SCI_CLEARTABSTOPS, SCI_ADDTABSTOP and SCI_GETNEXTTABSTOP to
+ QsciScintillaBase.
+ - Added SCI_GETIMEINTERACTION, SCI_SETIMEINTERACTION, SC_IME_WINDOWED and
+ SC_IME_INLINE to QsciScintillaBase.
+ - Added SC_MARK_BOOKMARK to QsciScintillaBase.
+ - Added INDIC_COMPOSITIONTHIN, INDIC_FULLBOX, INDIC_TEXTFORE, INDIC_IME,
+ INDIC_IME_MAX, SC_INDICVALUEBIT, SC_INDICVALUEMASK,
+ SC_INDICFLAG_VALUEBEFORE, SCI_INDICSETHOVERSTYLE, SCI_INDICGETHOVERSTYLE,
+ SCI_INDICSETHOVERFORE, SCI_INDICGETHOVERFORE, SCI_INDICSETFLAGS and
+ SCI_INDICGETFLAGS to QsciScintillaBase.
+ - Added SCI_SETTARGETRANGE and SCI_GETTARGETRANGE to QsciScintillaBase.
+ - Added SCFIND_CXX11REGEX to QsciScintillaBase.
+ - Added SCI_CALLTIPSETPOSSTART to QsciScintillaBase.
+ - Added SC_FOLDFLAG_LINESTATE to QsciScintillaBase.
+ - Added SC_WRAP_WHITESPACE to QsciScintillaBase.
+ - Added SC_PHASES_ONE, SC_PHASES_TWO, SC_PHASES_MULTIPLE, SCI_GETPHASESDRAW
+ and SCI_SETPHASESDRAW to QsciScintillaBase.
+ - Added SC_STATUS_OK, SC_STATUS_FAILURE, SC_STATUS_BADALLOC,
+ SC_STATUS_WARN_START and SC_STATUS_WARNREGEX to QsciScintillaBase.
+ - Added SC_MULTIAUTOC_ONCE, SC_MULTIAUTOC_EACH, SCI_AUTOCSETMULTI and
+ SCI_AUTOCGETMULTI to QsciScintillaBase.
+ - Added ANNOTATION_INDENTED to QsciScintillaBase.
+ - Added SCI_DROPSELECTIONN to QsciScintillaBase.
+ - Added SC_TECHNOLOGY_DIRECTWRITERETAIN and SC_TECHNOLOGY_DIRECTWRITEDC to
+ QsciScintillaBase.
+ - Added SC_LINE_END_TYPE_DEFAULT, SC_LINE_END_TYPE_UNICODE,
+ SCI_GETLINEENDTYPESSUPPORTED, SCI_SETLINEENDTYPESALLOWED,
+ SCI_GETLINEENDTYPESALLOWED and SCI_GETLINEENDTYPESACTIVE to
+ QsciScintillaBase.
+ - Added SCI_ALLOCATESUBSTYLES, SCI_GETSUBSTYLESSTART, SCI_GETSUBSTYLESLENGTH,
+ SCI_GETSTYLEFROMSUBSTYLE, SCI_GETPRIMARYSTYLEFROMSTYLE, SCI_FREESUBSTYLES,
+ SCI_SETIDENTIFIERS, SCI_DISTANCETOSECONDARYSTYLES and SCI_GETSUBSTYLEBASES
+ to QsciScintillaBase.
+ - Added SC_MOD_INSERTCHECK and SC_MOD_CHANGETABSTOPS to QsciScintillaBase.
+ - Qt v3 and PyQt v3 are no longer supported.
+
+-------------------------------------------------------------------
+Sat Oct 11 23:40:40 UTC 2014 - [email protected]
+
+- build for Qt5
+
+-------------------------------------------------------------------
+Sat Oct 11 18:00:02 UTC 2014 - [email protected]
+
+- Update to 2.8.4
+ - This is a minor functional release include the addition of some hotspot
+ related functions to the high-level API.
+ - run spec-cleaner
+
+-------------------------------------------------------------------
+Thu Jul 31 08:38:31 UTC 2014 - [email protected]
+
+- Run spec file through spec-cleaner
+- Various spec file cleanups
+
+-------------------------------------------------------------------
+Thu Jul 31 00:10:53 UTC 2014 - [email protected]
+
+- Update to v2.8.3
+ - Added the QsciLexerCoffeeScript class.
+ - Font sizes are now handled as floating point values rather than integers.
+ - Bug fixes.
+
+-------------------------------------------------------------------
++++ 350 more lines (skipped)
++++ between /dev/null
++++ and
/work/SRC/openSUSE:Factory/.qscintilla-qt5.new/python-qscintilla-qt4.changes
--- /work/SRC/openSUSE:Factory/qscintilla-qt5/python-qscintilla-qt5.changes
2017-04-24 09:47:36.461937750 +0200
+++
/work/SRC/openSUSE:Factory/.qscintilla-qt5.new/python-qscintilla-qt5.changes
2017-06-15 11:19:12.426873995 +0200
@@ -1,0 +2,17 @@
+Thu May 25 11:44:23 UTC 2017 - [email protected]
+
+- Fix python Requires, Provides, and Obsoletes.
+ This pulls in proper dependencies and avoids conflicts.
+
+-------------------------------------------------------------------
+Wed Apr 19 13:51:09 UTC 2017 - [email protected]
+
+- Add qt4 versions as subpackages.
+- Rename qt4 versions to use -qt4 suffix.
+
+-------------------------------------------------------------------
+Sat Apr 1 14:31:57 UTC 2017 - [email protected]
+
+- force -std=c++11 to compile with Leap 42.1
+
+-------------------------------------------------------------------
@@ -86 +102,0 @@
-
New Changes file:
--- /dev/null 2017-03-01 00:40:19.279048016 +0100
+++ /work/SRC/openSUSE:Factory/.qscintilla-qt5.new/qscintilla-qt4.changes
2017-06-15 11:19:14.366599958 +0200
@@ -0,0 +1,546 @@
+-------------------------------------------------------------------
+Thu May 25 11:44:23 UTC 2017 - [email protected]
+
+- Fix python Requires, Provides, and Obsoletes.
+ This pulls in proper dependencies and avoids conflicts.
+
+-------------------------------------------------------------------
+Wed Apr 19 13:51:09 UTC 2017 - [email protected]
+
+- Rename to qscintilla-qt4. This is only an internal spec file
+ name so it shouldn't cause any compatibility issues.
+- Put as a subpackage of qscintilla-qt5.
+- Rename patch to qscintilla-qt4.diff
+
+-------------------------------------------------------------------
+Sat Apr 8 12:24:06 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).
+
+-------------------------------------------------------------------
+Thu Feb 16 18:51:38 UTC 2017 - [email protected]
+
+- Require sip 4.19.1 for compatibility with PyQt5
+
+-------------------------------------------------------------------
+Tue Jan 3 23:45:10 UTC 2017 - [email protected]
+
+- Update to 2.9.4
+ - Added the .api file for Python v3.6.
+ - Bug fixes.
+
+-------------------------------------------------------------------
+Tue Jul 26 17:34:59 UTC 2016 - [email protected]
+
+- Update to 2.9.3
+ - Bug fixes
+
+-------------------------------------------------------------------
+Wed May 11 14:40:34 UTC 2016 - [email protected]
+
+- Update to 2.9.2
+ - This is mainly a packaging release. The Python extension module,
+ including a statically linked copy of the QScintilla library, can be
+ installed from PyPI.
+
+-------------------------------------------------------------------
+Fri Oct 30 18:24:38 UTC 2015 - [email protected]
+
+- Update to 2.9.1
+ - This is primarily a bug-fix release.
+
+-------------------------------------------------------------------
+Fri Aug 14 03:40:56 UTC 2015 - [email protected]
+
+- change required sip version to 4.16.9
+
+-------------------------------------------------------------------
+Sat Jun 13 22:45:18 UTC 2015 - [email protected]
+
+- Update to 2.9
+ - Based on Scintilla v3.5.4.
+ - Added UserLiteral, InactiveUserLiteral, TaskMarker, InactiveTaskMarker,
+ EscapeSequence, InactiveEscapeSequence, setHighlightBackQuotedStrings(),
+ highlightBackQuotedStrings(), setHighlightEscapeSequences(),
+ highlightEscapeSequences(), setVerbatimStringEscapeSequencesAllowed() and
+ verbatimStringEscapeSequencesAllowed() to QsciLexerCPP.
+ - Added CommentKeyword, DeclareInputPort, DeclareOutputPort,
+ DeclareInputOutputPort, PortConnection and the inactive versions of all
+ styles to QsciLexerVerilog.
+ - Added CommentBlock to QsciLexerVHDL.
+ - Added AnnotationIndented to QsciScintilla::AnnotationDisplay.
+ - Added FullBoxIndicator, ThickCompositionIndicator, ThinCompositionIndicator
+ and TextColorIndicator to QsciScintilla::IndicatorStyle.
+ - Added setIndicatorHoverForegroundColor() and setIndicatorHoverStyle() to
+ QsciScintilla.
+ - Added Bookmark to QsciScintilla::MarkerSymbol.
+ - Added WrapWhitespace to QsciScintilla::WrapMode.
+ - Added SCLEX_AS, SCLEX_BIBTEX, SCLEX_DMAP, SCLEX_DMIS, SCLEX_IHEX,
+ SCLEX_REGISTRY, SCLEX_SREC and SCLEX_TEHEX to QsciScintillaBase.
+ - Added SCI_CHANGEINSERTION to QsciScintillaBase.
+ - Added SCI_CLEARTABSTOPS, SCI_ADDTABSTOP and SCI_GETNEXTTABSTOP to
+ QsciScintillaBase.
+ - Added SCI_GETIMEINTERACTION, SCI_SETIMEINTERACTION, SC_IME_WINDOWED and
+ SC_IME_INLINE to QsciScintillaBase.
+ - Added SC_MARK_BOOKMARK to QsciScintillaBase.
+ - Added INDIC_COMPOSITIONTHIN, INDIC_FULLBOX, INDIC_TEXTFORE, INDIC_IME,
+ INDIC_IME_MAX, SC_INDICVALUEBIT, SC_INDICVALUEMASK,
+ SC_INDICFLAG_VALUEBEFORE, SCI_INDICSETHOVERSTYLE, SCI_INDICGETHOVERSTYLE,
+ SCI_INDICSETHOVERFORE, SCI_INDICGETHOVERFORE, SCI_INDICSETFLAGS and
+ SCI_INDICGETFLAGS to QsciScintillaBase.
+ - Added SCI_SETTARGETRANGE and SCI_GETTARGETRANGE to QsciScintillaBase.
+ - Added SCFIND_CXX11REGEX to QsciScintillaBase.
+ - Added SCI_CALLTIPSETPOSSTART to QsciScintillaBase.
+ - Added SC_FOLDFLAG_LINESTATE to QsciScintillaBase.
+ - Added SC_WRAP_WHITESPACE to QsciScintillaBase.
+ - Added SC_PHASES_ONE, SC_PHASES_TWO, SC_PHASES_MULTIPLE, SCI_GETPHASESDRAW
+ and SCI_SETPHASESDRAW to QsciScintillaBase.
+ - Added SC_STATUS_OK, SC_STATUS_FAILURE, SC_STATUS_BADALLOC,
+ SC_STATUS_WARN_START and SC_STATUS_WARNREGEX to QsciScintillaBase.
+ - Added SC_MULTIAUTOC_ONCE, SC_MULTIAUTOC_EACH, SCI_AUTOCSETMULTI and
+ SCI_AUTOCGETMULTI to QsciScintillaBase.
+ - Added ANNOTATION_INDENTED to QsciScintillaBase.
+ - Added SCI_DROPSELECTIONN to QsciScintillaBase.
+ - Added SC_TECHNOLOGY_DIRECTWRITERETAIN and SC_TECHNOLOGY_DIRECTWRITEDC to
+ QsciScintillaBase.
+ - Added SC_LINE_END_TYPE_DEFAULT, SC_LINE_END_TYPE_UNICODE,
+ SCI_GETLINEENDTYPESSUPPORTED, SCI_SETLINEENDTYPESALLOWED,
+ SCI_GETLINEENDTYPESALLOWED and SCI_GETLINEENDTYPESACTIVE to
+ QsciScintillaBase.
+ - Added SCI_ALLOCATESUBSTYLES, SCI_GETSUBSTYLESSTART, SCI_GETSUBSTYLESLENGTH,
+ SCI_GETSTYLEFROMSUBSTYLE, SCI_GETPRIMARYSTYLEFROMSTYLE, SCI_FREESUBSTYLES,
+ SCI_SETIDENTIFIERS, SCI_DISTANCETOSECONDARYSTYLES and SCI_GETSUBSTYLEBASES
+ to QsciScintillaBase.
+ - Added SC_MOD_INSERTCHECK and SC_MOD_CHANGETABSTOPS to QsciScintillaBase.
+ - Qt v3 and PyQt v3 are no longer supported.
+
+-------------------------------------------------------------------
+Sat Oct 11 18:00:02 UTC 2014 - [email protected]
+
+- Update to 2.8.4
+ - This is a minor functional release include the addition of some hotspot
+ related functions to the high-level API.
+ - run spec-cleaner
+
+-------------------------------------------------------------------
+Thu Jul 31 08:38:31 UTC 2014 - [email protected]
+
+- Update to 2.8.3
+ - Added the QsciLexerCoffeeScript class.
+ - Font sizes are now handled as floating point values rather than integers.
+ - Bug fixes.
+- Run spec file through spec-cleaner
+- Various spec file cleanups
+
+-------------------------------------------------------------------
+Thu May 29 02:33:33 UTC 2014 - [email protected]
++++ 349 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.qscintilla-qt5.new/qscintilla-qt4.changes
--- /work/SRC/openSUSE:Factory/qscintilla-qt5/qscintilla-qt5.changes
2017-04-24 09:47:36.501932093 +0200
+++ /work/SRC/openSUSE:Factory/.qscintilla-qt5.new/qscintilla-qt5.changes
2017-06-15 11:19:15.134491473 +0200
@@ -1,0 +2,16 @@
+Thu May 25 11:44:23 UTC 2017 - [email protected]
+
+- Fix python Requires, Provides, and Obsoletes.
+ This pulls in proper dependencies and avoids conflicts.
+
+-------------------------------------------------------------------
+Wed Apr 19 13:51:09 UTC 2017 - [email protected]
+
+- Add qt4 versions as subpackages.
+- Rename qt4 versions to use "_qt4" suffix.
+- Use new qt-version-specific names provided by qscintilla 2.10
+ rather than manually adding a "-qt5" suffix.
+- Use "_qt5" suffix instead of "_qt4" for library packages to
+ conform to upstream library naming.
+
+-------------------------------------------------------------------
New:
----
python-qscintilla-qt4.changes
python-qscintilla-qt4.spec
qscintilla-qt4.changes
qscintilla-qt4.diff
qscintilla-qt4.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qscintilla-qt4.spec ++++++
#
# spec file for package python-qscintilla-qt4
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define oldpython python
Name: python-qscintilla-qt4
Version: 2.10
Release: 0
Summary: Python Bindings for the C++ Editor Class Library
License: GPL-3.0
Group: Development/Libraries/C and C++
Url: http://www.riverbankcomputing.co.uk/qscintilla
Source:
http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla_gpl-%{version}.tar.gz
BuildRequires: libdrm-devel
BuildRequires: libqscintilla_qt4-devel
BuildRequires: python-rpm-macros
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt4-devel}
BuildRequires: %{python_module sip-devel >= 4.19.1}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-sip = %{version}
%requires_ge python-qt4
Requires: python-sip(api) = %{python_sip_api_ver}
%ifpython2
%requires_ge python2-qt4
Obsoletes: %{oldpython}-qscintilla < %{version}
Provides: %{oldpython}-qscintilla = %{version}
%endif
%ifpython3
Obsoletes: python3-qscintilla < %{version}
Provides: python3-qscintilla = %{version}
%endif
%requires_ge libqt4-x11
%python_subpackages
%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
%package -n %{name}-sip
Summary: sip files for PyQScintilla
Group: Development/Libraries/Python
Provides: %{python_module qscintilla-qt4-sip = %{version}}
Provides: %{python_module qscintilla-sip = %{version}}
Obsoletes: %{python_module qscintilla-sip < %{version}}
%description -n %{name}-sip
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
This package contains sip files used to generate bindings to
QScintilla.
%prep
%setup -q -n QScintilla_gpl-%{version}
%build
%{python_expand cp -r Python Python_%{$python_bin_suffix}
pushd Python_%{$python_bin_suffix}
$python configure.py
make %{?_smp_mflags}
popd
}
%install
%{python_expand pushd Python_%{$python_bin_suffix}
%make_install INSTALL_ROOT=%{buildroot}
popd
mv -T %{buildroot}%{_datadir}/qt4/qsci/api/python
%{buildroot}%{_datadir}/qt4/qsci/api/python_%{$python_bin_suffix}
}
%files %{python_files}
%defattr(-,root,root)
%doc NEWS README LICENSE
%{python_sitearch}/PyQt4/Qsci.so
%{python_sitearch}/PyQt4/Qsci.pyi
%dir %{_datadir}/qt4/qsci/
%dir %{_datadir}/qt4/qsci/api/
%dir %{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/
%{_datadir}/qt4/qsci/api/python_%{python_bin_suffix}/QScintilla2.api
%files -n %{name}-sip
%defattr(-,root,root)
%{_datadir}/sip/PyQt4/Qsci
%changelog
++++++ python-qscintilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.Z1cmsC/_old 2017-06-15 11:19:16.062360387 +0200
+++ /var/tmp/diff_new_pack.Z1cmsC/_new 2017-06-15 11:19:16.066359822 +0200
@@ -30,20 +30,17 @@
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt5-devel}
BuildRequires: %{python_module sip-devel >= 4.19.1}
-BuildRequires: libqscintilla-qt5-devel
+BuildRequires: libqscintilla_qt5-devel
BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-sip = %{version}
+%requires_ge python-qt5
+Requires: python-sip(api) = %{python_sip_api_ver}
%ifpython2
%requires_ge python2-qt5
-%{requires_python2_sip_api}
-%endif
-%ifpython3
-%requires_ge python3-qt5
-%{requires_python3_sip_api}
%endif
%python_subpackages
++++++ qscintilla-qt4.spec ++++++
#
# spec file for package qscintilla-qt4
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define sonum 13
%define debug_package_requires libqscintilla2_qt4-%{sonum} =
%{version}-%{release}
Name: qscintilla-qt4
Version: 2.10
Release: 0
Summary: C++ Editor Class Library
License: GPL-3.0
Group: Development/Libraries/C and C++
Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro
Source:
http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla_gpl-%{version}.tar.gz
#PATCH-FIX-OPENSUSE: Adapt to the SuSE Qt4 build
Patch0: qscintilla-qt4.diff
BuildRequires: libdrm-devel
BuildRequires: libqt4-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
%package -n libqscintilla2_qt4-%{sonum}
Summary: C++ Editor Class Library
Group: Development/Libraries/C and C++
Provides: qscintilla_qt4 = %{version}
# since version 2.10
Provides: qscintilla = %{version}
Obsoletes: qscintilla < %{version}
%description -n libqscintilla2_qt4-%{sonum}
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
%package -n libqscintilla_qt4-devel
Summary: C++ Editor Class Library Development Files
Group: Development/Libraries/C and C++
Requires: libqscintilla2_qt4-%{sonum} = %{version}
%requires_ge libqt4-devel
# openSUSE 10.3
Provides: qscintilla-devel = %{version}
Obsoletes: qscintilla-devel < %{version}
# since version 2.10
Provides: libqscintilla-devel = %{version}
Obsoletes: libqscintilla-devel < %{version}
%description -n libqscintilla_qt4-devel
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
This package contains the development files for %{name}.
%prep
%setup -q -n QScintilla_gpl-%{version}
%patch0
%build
pushd Qt4Qt5
qmake QMAKE_CXXFLAGS+=-std=c++11
make %{?_smp_mflags}
popd
pushd designer-Qt4Qt5
qmake QMAKE_CXXFLAGS+=-std=c++11
make %{?_smp_mflags}
popd
%install
pushd Qt4Qt5
make INSTALL_ROOT=%{buildroot} install
popd
pushd designer-Qt4Qt5
make INSTALL_ROOT=%{buildroot} install
popd
%post -n libqscintilla2_qt4-%{sonum} -p /sbin/ldconfig
%postun -n libqscintilla2_qt4-%{sonum} -p /sbin/ldconfig
%files -n libqscintilla2_qt4-%{sonum}
%defattr(-,root,root)
%doc NEWS README LICENSE
%{_datadir}/qt4/qsci
%{_datadir}/qt4/translations/qscintilla_*.qm
%{_libdir}/libqscintilla2_qt4.so.%{sonum}*
%files -n libqscintilla_qt4-devel
%defattr(-,root,root)
%{_includedir}/Qsci/
%{_libdir}/libqscintilla2_qt4.so
%{_libdir}/qt4/plugins/designer/libqscintillaplugin.so
%{_datadir}/qt4/mkspecs/features/qscintilla2.prf
%changelog
++++++ qscintilla-qt5.spec ++++++
--- /var/tmp/diff_new_pack.Z1cmsC/_old 2017-06-15 11:19:16.114353042 +0200
+++ /var/tmp/diff_new_pack.Z1cmsC/_new 2017-06-15 11:19:16.118352477 +0200
@@ -17,7 +17,7 @@
%define sonum 13
-%define debug_package_requires libqscintilla2-qt5-%{sonum} =
%{version}-%{release}
+%define debug_package_requires libqscintilla2_qt5-%{sonum} =
%{version}-%{release}
Name: qscintilla-qt5
Version: 2.10
Release: 0
@@ -26,8 +26,8 @@
Group: Development/Libraries/C and C++
Url: http://www.riverbankcomputing.co.uk/software/qscintilla/intro
Source:
http://downloads.sourceforge.net/project/pyqt/QScintilla2/QScintilla-%{version}/QScintilla_gpl-%{version}.tar.gz
-#PATCH-FIX-OPENSUSE: Adapt to the SuSE Qt5 build, rename qscintilla2 to
qscintilla2-qt5:
-Patch0: %{name}.diff
+#PATCH-FIX-OPENSUSE: Adapt to the SuSE Qt5 build
+Patch0: qscintilla-qt5.diff
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Designer)
BuildRequires: pkgconfig(Qt5PrintSupport)
@@ -42,42 +42,45 @@
This package is mainly used by eric, the Python IDE.
-%package -n libqscintilla2-qt5-%{sonum}
+%package -n libqscintilla2_qt5-%{sonum}
Summary: C++ Editor Class Library
Group: Development/Libraries/C and C++
Provides: qscintilla-qt5 = %{version}
+Provides: libqscintilla2-qt5-%{sonum} = %{version}
+# Change from "<= " to "<" in next release after 2.10
+Obsoletes: libqscintilla2-qt5-%{sonum} < %{version}
-%description -n libqscintilla2-qt5-%{sonum}
+%description -n libqscintilla2_qt5-%{sonum}
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
-This package is mainly used by eric, the Python IDE.
-
-%package -n libqscintilla-qt5-devel
+%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)
+Provides: libqscintilla-qt5-devel = %{version}
+# Change from "<= " to "<" in next release after 2.10
+Obsoletes: libqscintilla-qt5-devel <= %{version}
-%description -n libqscintilla-qt5-devel
+%description -n libqscintilla_qt5-devel
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
(http://www.scintilla.org/).
-This package is mainly used by eric, the Python IDE.
+This package contains the development files for %{name}.
%prep
%setup -q -n QScintilla_gpl-%{version}
-%patch0 -p1
+%patch0
%build
pushd Qt4Qt5
-mv features/qscintilla2.prf features/qscintilla2-qt5.prf
qmake-qt5 CONFIG+=c++11
make %{?_smp_mflags}
popd
@@ -94,26 +97,22 @@
make INSTALL_ROOT=%{buildroot} install
popd
-%post -n libqscintilla2-qt5-%{sonum} -p /sbin/ldconfig
+%post -n libqscintilla2_qt5-%{sonum} -p /sbin/ldconfig
-%postun -n libqscintilla2-qt5-%{sonum} -p /sbin/ldconfig
+%postun -n libqscintilla2_qt5-%{sonum} -p /sbin/ldconfig
-%files -n libqscintilla2-qt5-%{sonum}
+%files -n libqscintilla2_qt5-%{sonum}
%defattr(-,root,root)
%doc NEWS README LICENSE
-%{_datadir}/qt5/qsci
-%{_datadir}/qt5/translations
-%{_datadir}/qt5/translations/qscintilla_*.qm
-%{_libdir}/libqscintilla2-qt5.so.%{sonum}*
+%{_datadir}/qt5/qsci/
+%{_datadir}/qt5/translations/
+%{_libdir}/libqscintilla2_qt5.so.%{sonum}*
-%files -n libqscintilla-qt5-devel
+%files -n libqscintilla_qt5-devel
%defattr(-,root,root)
-%{_includedir}/qt5/Qsci
-%{_includedir}/qt5/Qsci/*
-%{_libdir}/libqscintilla2-qt5.so
-%{_libdir}/qt5/plugins/designer/libqscintillaplugin-qt5.so
-%{_libdir}/qt5/mkspecs
-%{_libdir}/qt5/mkspecs/features
-%{_libdir}/qt5/mkspecs/features/qscintilla2-qt5.prf
+%{_includedir}/qt5/Qsci/
+%{_libdir}/libqscintilla2_qt5.so
+%{_libdir}/qt5/plugins/designer/libqscintillaplugin.so
+%{_libdir}/qt5/mkspecs/features/qscintilla2.prf
%changelog
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.Z1cmsC/_old 2017-06-15 11:19:16.154347391 +0200
+++ /var/tmp/diff_new_pack.Z1cmsC/_new 2017-06-15 11:19:16.154347391 +0200
@@ -1,5 +1,6 @@
#!/bin/bash
# This script is called automatically during autobuild checkin.
+ln -f qscintilla-qt5.changes qscintilla-qt4.changes
ln -f qscintilla-qt5.changes python-qscintilla-qt5.changes
-ln -f qscintilla-qt5.changes python3-qscintilla-qt5.changes
+ln -f qscintilla-qt5.changes python-qscintilla-qt4.changes
++++++ python-config.diff ++++++
--- /var/tmp/diff_new_pack.Z1cmsC/_old 2017-06-15 11:19:16.166345696 +0200
+++ /var/tmp/diff_new_pack.Z1cmsC/_new 2017-06-15 11:19:16.166345696 +0200
@@ -1,23 +1,5 @@
--- 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.
- """
-
-- qmake = {'CONFIG': 'qscintilla2'}
-+ qmake = {'CONFIG': 'qscintilla2-qt5'}
-
- if target_configuration.qsci_inc_dir is not None:
- qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
@@ -1415,6 +1415,9 @@
config = qmake_config.get('CONFIG')
if config:
++++++ qscintilla-qt4.diff ++++++
Index: designer-Qt4Qt5/designer.pro
===================================================================
--- designer-Qt4Qt5/designer.pro.orig 2011-11-23 01:10:02.000000000 -0500
+++ designer-Qt4Qt5/designer.pro 2011-11-23 01:11:58.000000000 -0500
@@ -22,2 +22,5 @@
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
+
+LIBS += -L../Qt4Qt5 -lqscintilla2_qt4
+INCLUDEPATH += ../Qt4Qt5
++++++ qscintilla-qt5.diff ++++++
--- /var/tmp/diff_new_pack.Z1cmsC/_old 2017-06-15 11:19:16.198341176 +0200
+++ /var/tmp/diff_new_pack.Z1cmsC/_new 2017-06-15 11:19:16.202340611 +0200
@@ -1,92 +1,11 @@
-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 @@
-
+Index: designer-Qt4Qt5/designer.pro
+===================================================================
+--- designer-Qt4Qt5/designer.pro.orig 2011-11-23 01:10:02.000000000 -0500
++++ designer-Qt4Qt5/designer.pro 2011-11-23 01:11:58.000000000 -0500
+@@ -22,2 +22,5 @@
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
+
-+LIBS += -L../Qt4Qt5 -lqscintilla2-qt5
++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-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)
-@@ -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 += -lqscintilla2_qt$${QT_MAJOR_VERSION}d
- } else {
-- LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
-+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
- }
- }
- } else {
-- LIBS += -lqscintilla2_qt$${QT_MAJOR_VERSION}
-+ LIBS += -lqscintilla2-qt$${QT_MAJOR_VERSION}
- }
-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 = 13.0.0
-
- TEMPLATE = lib
--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 @@
- features.path = $$[QT_INSTALL_DATA]/mkspecs/features
- }
- CONFIG(staticlib) {
-- features.files = $$PWD/features_staticlib/qscintilla2.prf
-+ features.files = $$PWD/features_staticlib/qscintilla2-qt5.prf
- } else {
-- features.files = $$PWD/features/qscintilla2.prf
-+ features.files = $$PWD/features/qscintilla2-qt5.prf
- }
- INSTALLS += features
-
+
