Hello community,
here is the log from the commit of package qscintilla for openSUSE:Factory
checked in at 2013-04-16 06:56:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qscintilla (Old)
and /work/SRC/openSUSE:Factory/.qscintilla.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qscintilla", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qscintilla/python-qscintilla.changes
2012-07-15 12:05:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qscintilla.new/python-qscintilla.changes
2013-04-16 06:56:43.000000000 +0200
@@ -1,0 +2,48 @@
+Fri Apr 12 03:37:01 UTC 2013 - ter...@gmail.com
+
+- update to 2.7.1
+ - v2.7.1 1st March 2013
+ - Added support for the final release of Qt v5.
+ - The build script for the Python bindings should now work with SIP v5.
+ - Bug fixes.
+
+ - v2.7 8th December 2012
+ - Based on Scintilla v3.23.
+ - Added support for Qt v5-rc1.
+ - Added HashQuotedString, InactiveHashQuotedString, PreProcessorComment,
+ InactivePreProcessorComment, setHighlightHashQuotedStrings() and
+ highlightHashQuotedStrings() to QsciLexerCpp.
+ - Added Variable, setHSSLanguage(), HSSLanguage(), setLessLanguage(),
+ LessLanguage(), setSCCSLanguage() and SCCSLanguage() to QsciLexerCSS.
+ - Added setOverwriteMode() and overwriteMode() to QsciScintilla.
+ - Added wordAtLineIndex() to QsciScintilla.
+ - Added findFirstInSelection() to QsciScintilla.
+ - Added CallTipsPosition, callTipsPosition() and setCallTipsPosition() to
+ QsciScintilla.
+ - Added WrapFlagInMargin to QsciScintilla::WrapVisualFlag.
+ - Added SquigglePixmapIndicator to QsciScintilla::IndicatorStyle.
+ - The weight of a font (rather than whether it is just bold or not) is now
+ respected.
+ - Added SCLEX_AVS, SCLEX_COFFEESCRIPT, SCLEX_ECL, SCLEX_OSCRIPT,
+ SCLEX_TCMD and SCLEX_VISUALPROLOG to QsciScintillaBase.
+ - Added SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE and
+ SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE to QsciScintillaBase.
+ - Added SC_FONT_SIZE_MULTIPLIER to QsciScintillaBase.
+ - Added SC_WEIGHT_NORMAL, SC_WEIGHT_SEMIBOLD and SC_WEIGHT_BOLD to
+ QsciScintillaBase.
+ - Added SC_WRAPVISUALFLAG_MARGIN to QsciScintillaBase.
+ - Added INDIC_SQUIGGLEPIXMAP to QsciScintillaBase.
+ - Added SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR,
+ SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR, SCI_CALLTIPSETPOSITION,
+ SCI_COUNTCHARACTERS, SCI_CREATELOADER, SCI_DELETERANGE,
+ SCI_FINDINDICATORFLASH, SCI_FINDINDICATORHIDE, SCI_FINDINDICATORSHOW,
+ SCI_GETALLLINESVISIBLE, SCI_GETGAPPOSITION, SCI_GETPUNCTUATIONCHARS,
+ SCI_GETRANGEPOINTER, SCI_GETSELECTIONEMPTY, SCI_GETTECHNOLOGY,
+ SCI_GETWHITESPACECHARS, SCI_GETWORDCHARS, SCI_RGBAIMAGESETSCALE,
+ SCI_SETPUNCTUATIONCHARS, SCI_SETTECHNOLOGY, SCI_STYLESETSIZEFRACTIONAL,
+ SCI_STYLEGETSIZEFRACTIONAL, SCI_STYLESETWEIGHT and SCI_STYLEGETWEIGHT to
+ QsciScintillaBase.
+ - Removed SCI_GETUSEPALETTE and SCI_SETUSEPALETTE from QsciScintillaBase.
+ - Bug fixes.
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qscintilla/python3-qscintilla.changes
2012-07-15 12:05:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qscintilla.new/python3-qscintilla.changes
2013-04-16 06:56:43.000000000 +0200
@@ -1,0 +2,53 @@
+Fri Apr 12 03:40:33 UTC 2013 - ter...@gmail.com
+
+- update to 2.7.1
+ - v2.7.1 1st March 2013
+ - Added support for the final release of Qt v5.
+ - The build script for the Python bindings should now work with SIP v5.
+ - Bug fixes.
+
+ - v2.7 8th December 2012
+ - Based on Scintilla v3.23.
+ - Added support for Qt v5-rc1.
+ - Added HashQuotedString, InactiveHashQuotedString, PreProcessorComment,
+ InactivePreProcessorComment, setHighlightHashQuotedStrings() and
+ highlightHashQuotedStrings() to QsciLexerCpp.
+ - Added Variable, setHSSLanguage(), HSSLanguage(), setLessLanguage(),
+ LessLanguage(), setSCCSLanguage() and SCCSLanguage() to QsciLexerCSS.
+ - Added setOverwriteMode() and overwriteMode() to QsciScintilla.
+ - Added wordAtLineIndex() to QsciScintilla.
+ - Added findFirstInSelection() to QsciScintilla.
+ - Added CallTipsPosition, callTipsPosition() and setCallTipsPosition() to
+ QsciScintilla.
+ - Added WrapFlagInMargin to QsciScintilla::WrapVisualFlag.
+ - Added SquigglePixmapIndicator to QsciScintilla::IndicatorStyle.
+ - The weight of a font (rather than whether it is just bold or not) is now
+ respected.
+ - Added SCLEX_AVS, SCLEX_COFFEESCRIPT, SCLEX_ECL, SCLEX_OSCRIPT,
+ SCLEX_TCMD and SCLEX_VISUALPROLOG to QsciScintillaBase.
+ - Added SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE and
+ SC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE to QsciScintillaBase.
+ - Added SC_FONT_SIZE_MULTIPLIER to QsciScintillaBase.
+ - Added SC_WEIGHT_NORMAL, SC_WEIGHT_SEMIBOLD and SC_WEIGHT_BOLD to
+ QsciScintillaBase.
+ - Added SC_WRAPVISUALFLAG_MARGIN to QsciScintillaBase.
+ - Added INDIC_SQUIGGLEPIXMAP to QsciScintillaBase.
+ - Added SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR,
+ SCI_AUTOCGETCASEINSENSITIVEBEHAVIOUR, SCI_CALLTIPSETPOSITION,
+ SCI_COUNTCHARACTERS, SCI_CREATELOADER, SCI_DELETERANGE,
+ SCI_FINDINDICATORFLASH, SCI_FINDINDICATORHIDE, SCI_FINDINDICATORSHOW,
+ SCI_GETALLLINESVISIBLE, SCI_GETGAPPOSITION, SCI_GETPUNCTUATIONCHARS,
+ SCI_GETRANGEPOINTER, SCI_GETSELECTIONEMPTY, SCI_GETTECHNOLOGY,
+ SCI_GETWHITESPACECHARS, SCI_GETWORDCHARS, SCI_RGBAIMAGESETSCALE,
+ SCI_SETPUNCTUATIONCHARS, SCI_SETTECHNOLOGY, SCI_STYLESETSIZEFRACTIONAL,
+ SCI_STYLEGETSIZEFRACTIONAL, SCI_STYLESETWEIGHT and SCI_STYLEGETWEIGHT to
+ QsciScintillaBase.
+ - Removed SCI_GETUSEPALETTE and SCI_SETUSEPALETTE from QsciScintillaBase.
+ - Bug fixes.
+
+-------------------------------------------------------------------
+Thu Nov 22 14:18:55 UTC 2012 - toddrme2...@gmail.com
+
+- Removed openSUSE 11.4 spec file workarounds
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/qscintilla/qscintilla.changes 2012-07-15
12:05:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qscintilla.new/qscintilla.changes
2013-04-16 06:56:43.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Apr 12 03:35:08 UTC 2013 - ter...@gmail.com
+
+ - based on Scintilla v3.23.
+
+-------------------------------------------------------------------
Old:
----
QScintilla-gpl-2.6.2.tar.gz
New:
----
QScintilla-gpl-2.7.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.NhWa3J/_old 2013-04-16 06:56:46.000000000 +0200
+++ /var/tmp/diff_new_pack.NhWa3J/_new 2013-04-16 06:56:46.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python-qscintilla
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
Name: python-qscintilla
BuildRequires: libdrm-devel
BuildRequires: libqscintilla-devel
-BuildRequires: libqscintilla2-8
+BuildRequires: libqscintilla2-9
BuildRequires: python-devel
BuildRequires: python-qt4-devel
BuildRequires: python-sip-devel
@@ -28,7 +28,7 @@
License: GPL-2.0+
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 2.6.2
+Version: 2.7.1
Release: 0
%define scintilla_version %version
Source:
http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz
@@ -65,7 +65,7 @@
%build
pushd Python
-python configure.py
+python configure-old.py
make %{?jobs:-j %jobs}
popd
++++++ python3-qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.NhWa3J/_old 2013-04-16 06:56:46.000000000 +0200
+++ /var/tmp/diff_new_pack.NhWa3J/_new 2013-04-16 06:56:46.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python3-qscintilla
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,27 +22,22 @@
License: GPL-2.0+
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 2.6.2
+Version: 2.7.1
Release: 0
%define scintilla_version %version
Source:
http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz
Requires: python3-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}'
python3-qt4`)
BuildRequires: libqscintilla-devel
-BuildRequires: libqscintilla2-8
+BuildRequires: libqscintilla2-9
BuildRequires: python3-devel
BuildRequires: python3-qt4-devel
BuildRequires: python3-sip-devel
-Requires: python3
-%if 0%{?suse_version} > 1140
-BuildRequires: python3-base
-%endif
+Requires: python(abi) = %{py3_ver}
%requires_ge python3-sip
%requires_ge libqt4-x11
-%global python3_sitearch %(python3 -c "import distutils.sysconfig;
print(distutils.sysconfig.get_python_lib(True))" 2>/dev/null || echo
PYTHON-NOT-FOUND)
-
%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -51,18 +46,12 @@
This package is mainly used by eric, the Python IDE.
-
-
-Authors:
---------
- Riverbank Computing Limited <i...@riverbankcomputing.co.uk>
-
%prep
%setup -q -n QScintilla-gpl-%scintilla_version
%build
pushd Python
-python3 configure.py
+python3 configure-old.py
make %{?_smp_mflags}
popd
++++++ qscintilla.spec ++++++
--- /var/tmp/diff_new_pack.NhWa3J/_old 2013-04-16 06:56:46.000000000 +0200
+++ /var/tmp/diff_new_pack.NhWa3J/_new 2013-04-16 06:56:46.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qscintilla
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,12 +24,12 @@
License: GPL-2.0+
Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 2.6.2
+Version: 2.7.1
Release: 0
%define scintilla_version %version
Source:
http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz
Patch: %name.diff
-%define debug_package_requires libqscintilla2-8 = %version-%release
+%define debug_package_requires libqscintilla2-9 = %version-%release
%description
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
@@ -45,12 +45,12 @@
--------
Riverbank Computing Limited <i...@riverbankcomputing.co.uk>
-%package -n libqscintilla2-8
+%package -n libqscintilla2-9
Summary: C++ Editor Class Library
Group: Development/Libraries/C and C++
Provides: qscintilla = %{version}
-%description -n libqscintilla2-8
+%description -n libqscintilla2-9
QScintilla is a Qt port of Neil Hodgson's Scintilla C++ editor class.
This is a Qt port from the original Scintilla class
@@ -67,7 +67,7 @@
%package -n libqscintilla-devel
Summary: C++ Editor Class Library Development Files
Group: Development/Libraries/C and C++
-Requires: libqscintilla2-8 = %{version}
+Requires: libqscintilla2-9 = %{version}
Requires: libqt4-devel >= %( echo `rpm -q --queryformat '%{VERSION}'
libqt4-devel`)
# openSUSE 10.3
Provides: qscintilla-devel = %{version}
@@ -96,7 +96,7 @@
qmake
make %{?jobs:-j %jobs}
popd
-pushd designer-Qt4
+pushd designer-Qt4Qt5
qmake
make %{?jobs:-j %jobs}
popd
@@ -105,23 +105,23 @@
pushd Qt4Qt5
make INSTALL_ROOT=$RPM_BUILD_ROOT install
popd
-pushd designer-Qt4
+pushd designer-Qt4Qt5
make INSTALL_ROOT=$RPM_BUILD_ROOT install
popd
-%post -n libqscintilla2-8 -p /sbin/ldconfig
+%post -n libqscintilla2-9 -p /sbin/ldconfig
-%postun -n libqscintilla2-8 -p /sbin/ldconfig
+%postun -n libqscintilla2-9 -p /sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
-%files -n libqscintilla2-8
+%files -n libqscintilla2-9
%defattr(-,root,root)
%doc NEWS README LICENSE.GPL2 LICENSE.GPL3
/usr/share/qt4/qsci
/usr/share/qt4/translations/qscintilla_*.qm
-%_libdir/libqscintilla2.so.8*
+%_libdir/libqscintilla2.so.9*
%files -n libqscintilla-devel
%defattr(-,root,root)
++++++ QScintilla-gpl-2.6.2.tar.gz -> QScintilla-gpl-2.7.1.tar.gz ++++++
++++ 57384 lines of diff (skipped)
++++++ qscintilla.diff ++++++
--- /var/tmp/diff_new_pack.NhWa3J/_old 2013-04-16 06:56:47.000000000 +0200
+++ /var/tmp/diff_new_pack.NhWa3J/_new 2013-04-16 06:56:47.000000000 +0200
@@ -24,13 +24,13 @@
INSTALLS += header trans qsci target
---- designer-Qt4/designer.pro.orig 2011-11-23 01:10:02.000000000 -0500
-+++ designer-Qt4/designer.pro 2011-11-23 01:11:58.000000000 -0500
+--- 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
@@ -12,4 +12,5 @@
target.path = $$[QT_INSTALL_PLUGINS]/designer
INSTALLS += target
--LIBS += -lqscintilla2
+-LIBS += -L$$[QT_INSTALL_LIBS] -lqscintilla2
+LIBS += -L../Qt4Qt5 -lqscintilla2
+INCLUDEPATH += ../Qt4Qt5
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
