Hello community,
here is the log from the commit of package qscintilla for openSUSE:Factory
checked in at 2017-04-29 10:53:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla (Old)
and /work/SRC/openSUSE:Factory/.qscintilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla"
Sat Apr 29 10:53:03 2017 rev:48 rq:490794 version:2.10
Changes:
--------
--- /work/SRC/openSUSE:Factory/qscintilla/python-qscintilla.changes
2017-02-22 13:54:13.290451596 +0100
+++ /work/SRC/openSUSE:Factory/.qscintilla.new/python-qscintilla.changes
2017-04-29 10:53:05.351915912 +0200
@@ -1,0 +2,66 @@
+Sat Apr 8 12:24:06 UTC 2017 - h...@urpla.net
+
+- 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).
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2017-04-17
10:25:24.241923063 +0200
+++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes
2017-04-29 10:53:05.579883708 +0200
@@ -1,0 +2,69 @@
+Sat Apr 8 12:22:26 UTC 2017 - h...@urpla.net
+
+- 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).
+
+- force -std=c++11 to compile with Leap 42.1
+- cope with renamed libs: upstream added _qt4 to libname
+
+-------------------------------------------------------------------
Old:
----
QScintilla_gpl-2.9.4.tar.gz
New:
----
QScintilla_gpl-2.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.mp9bwX/_old 2017-04-29 10:53:06.743719294 +0200
+++ /var/tmp/diff_new_pack.mp9bwX/_new 2017-04-29 10:53:06.747718729 +0200
@@ -18,19 +18,19 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-qscintilla
-Version: 2.9.4
+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-devel
-BuildRequires: python-rpm-macros
BuildRequires: %{python_module devel}
BuildRequires: %{python_module qt4-devel}
BuildRequires: %{python_module sip-devel >= 4.19.1}
+BuildRequires: libdrm-devel
+BuildRequires: libqscintilla_qt4-devel
+BuildRequires: python-rpm-macros
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-sip = %{version}
%ifpython2
@@ -70,7 +70,6 @@
%prep
%setup -q -n QScintilla_gpl-%{version}
-
%build
%{python_expand cp -r Python Python_%{$python_bin_suffix}
pushd Python_%{$python_bin_suffix}
@@ -83,7 +82,6 @@
}
-
%install
%{python_expand pushd Python_%{$python_bin_suffix}
@@ -95,7 +93,6 @@
}
-
%files %{python_files}
%defattr(-,root,root)
%doc NEWS README LICENSE
@@ -106,10 +103,8 @@
%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
++++++ qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.mp9bwX/_old 2017-04-29 10:53:06.775714774 +0200
+++ /var/tmp/diff_new_pack.mp9bwX/_new 2017-04-29 10:53:06.779714209 +0200
@@ -16,10 +16,10 @@
#
-%define sonum 12
-%define debug_package_requires libqscintilla2-%{sonum} = %{version}-%{release}
+%define sonum 13
+%define debug_package_requires libqscintilla2_qt4-%{sonum} =
%{version}-%{release}
Name: qscintilla
-Version: 2.9.4
+Version: 2.10
Release: 0
Summary: C++ Editor Class Library
License: GPL-3.0
@@ -39,12 +39,15 @@
This package is mainly used by eric, the Python IDE.
-%package -n libqscintilla2-%{sonum}
+%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-%{sonum}
+%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
@@ -52,16 +55,19 @@
This package is mainly used by eric, the Python IDE.
-%package -n libqscintilla-devel
+%package -n libqscintilla_qt4-devel
Summary: C++ Editor Class Library Development Files
Group: Development/Libraries/C and C++
-Requires: libqscintilla2-%{sonum} = %{version}
+Requires: libqscintilla2_qt4-%{sonum} = %{version}
# openSUSE 10.3
Provides: qscintilla-devel = %{version}
Obsoletes: qscintilla-devel < %{version}
%requires_ge libqt4-devel
+# since version 2.10
+Provides: libqscintilla-devel = %{version}
+Obsoletes: libqscintilla-devel < %{version}
-%description -n libqscintilla-devel
+%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
@@ -75,11 +81,11 @@
%build
pushd Qt4Qt5
-qmake
+qmake QMAKE_CXXFLAGS+=-std=c++11
make %{?_smp_mflags}
popd
pushd designer-Qt4Qt5
-qmake
+qmake QMAKE_CXXFLAGS+=-std=c++11
make %{?_smp_mflags}
popd
@@ -91,22 +97,22 @@
make INSTALL_ROOT=%{buildroot} install
popd
-%post -n libqscintilla2-%{sonum} -p /sbin/ldconfig
+%post -n libqscintilla2_qt4-%{sonum} -p /sbin/ldconfig
-%postun -n libqscintilla2-%{sonum} -p /sbin/ldconfig
+%postun -n libqscintilla2_qt4-%{sonum} -p /sbin/ldconfig
-%files -n libqscintilla2-%{sonum}
+%files -n libqscintilla2_qt4-%{sonum}
%defattr(-,root,root)
%doc NEWS README LICENSE
%{_datadir}/qt4/qsci
%{_datadir}/qt4/translations/qscintilla_*.qm
-%{_libdir}/libqscintilla2.so.%{sonum}*
+%{_libdir}/libqscintilla2_qt4.so.%{sonum}*
-%files -n libqscintilla-devel
+%files -n libqscintilla_qt4-devel
%defattr(-,root,root)
%{_includedir}/Qsci
%{_includedir}/Qsci/*
-%{_libdir}/libqscintilla2.so
+%{_libdir}/libqscintilla2_qt4.so
%{_libdir}/qt4/plugins/designer/libqscintillaplugin.so
%{_datadir}/qt4/mkspecs/features/qscintilla2.prf
++++++ QScintilla_gpl-2.9.4.tar.gz -> QScintilla_gpl-2.10.tar.gz ++++++
++++ 92362 lines of diff (skipped)
++++++ qscintilla.diff ++++++
--- /var/tmp/diff_new_pack.mp9bwX/_old 2017-04-29 10:53:07.451619290 +0200
+++ /var/tmp/diff_new_pack.mp9bwX/_new 2017-04-29 10:53:07.455618725 +0200
@@ -6,6 +6,6 @@
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
+
-+LIBS += -L../Qt4Qt5 -lqscintilla2
++LIBS += -L../Qt4Qt5 -lqscintilla2_qt4
+INCLUDEPATH += ../Qt4Qt5
