commit koffice2 for openSUSE:Factory
Hello community, here is the log from the commit of package koffice2 for openSUSE:Factory checked in at Thu Feb 18 15:17:47 CET 2010. -------- --- KDE/koffice2/koffice2-doc.changes 2010-02-04 11:37:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/koffice2/koffice2-doc.changes 2010-02-18 15:17:13.974970000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 15 14:23:35 UTC 2010 - llunak@novell.com + +- fix build with gcc-4.5 + +------------------------------------------------------------------- koffice2.changes: same change calling whatdependson for head-i586 New: ---- gcc-45.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ koffice2-doc.spec ++++++ --- /var/tmp/diff_new_pack.YYM4Tx/_old 2010-02-18 15:17:25.000000000 +0100 +++ /var/tmp/diff_new_pack.YYM4Tx/_new 2010-02-18 15:17:25.000000000 +0100 @@ -27,7 +27,7 @@ Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org Version: 2.1.1 -Release: 2 +Release: 3 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.YYM4Tx/_old 2010-02-18 15:17:25.000000000 +0100 +++ /var/tmp/diff_new_pack.YYM4Tx/_new 2010-02-18 15:17:25.000000000 +0100 @@ -34,10 +34,11 @@ Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org Version: 2.1.1 -Release: 2 +Release: 3 Source0: koffice-%version.tar.bz2 Patch1: koffice_remove_kohyphen.diff Patch2: koffice_remove_python_shebangs.diff +Patch3: gcc-45.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires %kde4_pimlibs_requires @@ -63,6 +64,7 @@ %setup -q -n koffice-%version #%patch1 #%patch2 +%patch3 %build %cmake_kde4 -d build ++++++ gcc-45.diff ++++++ --- krita/ui/widgets/kis_curve_widget.cpp (revision 1061365) +++ krita/ui/widgets/kis_curve_widget.cpp (revision 1061366) @@ -312,11 +312,11 @@ curveY = d->m_points.at(i).y(); if (i == d->m_grab_point_index) { - p.setPen(QPen::QPen(Qt::red, 3, Qt::SolidLine)); + p.setPen(QPen(Qt::red, 3, Qt::SolidLine)); p.drawEllipse(QRectF(curveX * wWidth - 2, wHeight - 2 - curveY * wHeight, 4, 4)); } else { - p.setPen(QPen::QPen(Qt::red, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::red, 1, Qt::SolidLine)); p.drawEllipse(QRectF(curveX * wWidth - 3, wHeight - 3 - curveY * wHeight, 6, 6)); } Index: krita/ui/widgets/kis_curve_widget_p.h =================================================================== --- krita/ui/widgets/kis_curve_widget_p.h (revision 1061365) +++ krita/ui/widgets/kis_curve_widget_p.h (revision 1061366) @@ -439,7 +439,7 @@ * That is not mandatory but desirable */ - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); p.drawLine(div4_round(wWidth), 0, div4_round(wWidth), wHeight); p.drawLine(div2_round(wWidth), 0, div2_round(wWidth), wHeight); p.drawLine(div4_round(3*wWidth), 0, div4_round(3*wWidth), wHeight); --- krita/plugins/filters/levelfilter/kis_level_filter.cpp.sav 2010-01-08 11:39:44.000000000 +0100 +++ krita/plugins/filters/levelfilter/kis_level_filter.cpp 2010-02-15 16:16:15.533476767 +0100 @@ -178,7 +178,7 @@ void KisLevelConfigWidget::slotDrawHisto pix.fill(); QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); double highest = (double)histogram->calculations().getHighest(); qint32 bins = histogram->producer()->numberOfBins(); --- krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp.sav 2010-01-08 11:39:12.000000000 +0100 +++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp 2010-02-15 16:15:57.899351886 +0100 @@ -249,7 +249,7 @@ KisBrightnessContrastConfigWidget::KisBr // Create the horizontal gradient label QPixmap hgradientpix(256, 1); QPainter hgp(&hgradientpix); - hgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + hgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); for (i = 0; i < 256; ++i) { hgp.setPen(QColor(i, i, i)); hgp.drawPoint(i, 0); @@ -259,7 +259,7 @@ KisBrightnessContrastConfigWidget::KisBr // Create the vertical gradient label QPixmap vgradientpix(1, 256); QPainter vgp(&vgradientpix); - vgp.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + vgp.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); for (i = 0; i < 256; ++i) { vgp.setPen(QColor(i, i, i)); vgp.drawPoint(0, 255 - i); @@ -271,7 +271,7 @@ KisBrightnessContrastConfigWidget::KisBr QPixmap pix(256, height); pix.fill(); QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); double highest = (double)histogram.calculations().getHighest(); qint32 bins = histogram.producer()->numberOfBins(); --- krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp.sav 2010-01-08 11:39:12.000000000 +0100 +++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp 2010-02-15 16:16:02.149351723 +0100 @@ -121,7 +121,7 @@ inline QPixmap KisPerChannelConfigWidget QPixmap gradientpix(width, height); QPainter p(&gradientpix); - p.setPen(QPen::QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); + p.setPen(QPen(QColor(0, 0, 0), 1, Qt::SolidLine)); for (; *i < 256; (*i)++, col += inc) { p.setPen(QColor(col, col, col)); p.drawPoint(x, y); @@ -136,7 +136,7 @@ inline QPixmap KisPerChannelConfigWidget QPixmap pix(256, height); pix.fill(); QPainter p(&pix); - p.setPen(QPen::QPen(Qt::gray, 1, Qt::SolidLine)); + p.setPen(QPen(Qt::gray, 1, Qt::SolidLine)); m_histogram->setChannel(m_activeCh); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de