Hello community, here is the log from the commit of package qscintilla for openSUSE:Factory checked in at Wed Apr 21 01:56:00 CEST 2010. -------- --- KDE/qscintilla/python-qscintilla.changes 2010-04-11 18:50:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/qscintilla/python-qscintilla.changes 2010-04-21 01:13:51.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 21 01:13:44 CEST 2010 - dmueller@suse.de + +- fix build + +------------------------------------------------------------------- qscintilla.changes: same change calling whatdependson for head-i586 New: ---- fix-build.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.n6RDRo/_old 2010-04-21 01:55:54.000000000 +0200 +++ /var/tmp/diff_new_pack.n6RDRo/_new 2010-04-21 01:55:54.000000000 +0200 @@ -29,9 +29,10 @@ Summary: Python Bindings for the C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 2.4.3 -Release: 1 +Release: 2 %define scintilla_version 2.4.3 Source: QScintilla-gpl-%scintilla_version.tar.bz2 +Patch1: fix-build.diff Requires: python-qt4 >= %( echo `rpm -q --queryformat '%{VERSION}' python-qt4`) %py_requires @@ -51,6 +52,7 @@ %prep %setup -q -n QScintilla-gpl-%scintilla_version +%patch1 %build pushd Python @@ -68,7 +70,7 @@ %files %defattr(-,root,root) -%doc NEWS README ChangeLog LICENSE.GPL2 LICENSE.GPL3 +%doc NEWS README LICENSE.GPL2 LICENSE.GPL3 %py_sitedir/PyQt4/Qsci.so /usr/share/sip/PyQt4/Qsci /usr/share/qt4/qsci/api/python/QScintilla2.api ++++++ qscintilla.spec ++++++ --- /var/tmp/diff_new_pack.n6RDRo/_old 2010-04-21 01:55:54.000000000 +0200 +++ /var/tmp/diff_new_pack.n6RDRo/_new 2010-04-21 01:55:54.000000000 +0200 @@ -27,10 +27,11 @@ Summary: C++ Editor Class Library BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 2.4.3 -Release: 1 +Release: 2 %define scintilla_version 2.4.3 Source: QScintilla-gpl-%scintilla_version.tar.bz2 Patch: %name.diff +Patch1: fix-build.diff %define debug_package_requires libqscintilla2-5 = %version-%release %description @@ -96,6 +97,7 @@ %prep %setup -q -n QScintilla-gpl-%scintilla_version %patch +%patch1 %build %define qt3_environment \ @@ -130,7 +132,7 @@ %files -n libqscintilla2-5 %defattr(-,root,root) -%doc NEWS README ChangeLog LICENSE.GPL2 LICENSE.GPL3 +%doc NEWS README LICENSE.GPL2 LICENSE.GPL3 /usr/lib/qt3/%_lib/libqscintilla2.so.5* /usr/lib/qt3/translations/qscintilla_*.qm /usr/lib/qt3/qsci ++++++ fix-build.diff ++++++ --- Qt3/PlatQt.cpp +++ Qt3/PlatQt.cpp @@ -640,7 +640,7 @@ unsigned g = (c >> 8) & 0xff; unsigned b = (c >> 16) & 0xff; - return QColor(r, g, b, alpha); + return QColor(qRgba(r, g, b, alpha)); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org