commit koffice2 for openSUSE:Factory
Hello community, here is the log from the commit of package koffice2 for openSUSE:Factory checked in at Sat Apr 3 00:24:30 CEST 2010. -------- --- KDE/koffice2/koffice2-doc.changes 2010-04-01 18:14:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/koffice2/koffice2-doc.changes 2010-04-03 00:23:31.560616000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 2 11:28:07 UTC 2010 - llunak@novell.com + +- readd fixes for 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.eo6jMl/_old 2010-04-03 00:23:42.000000000 +0200 +++ /var/tmp/diff_new_pack.eo6jMl/_new 2010-04-03 00:23:42.000000000 +0200 @@ -27,7 +27,7 @@ Summary: Documentation of the KDE Office Suite Url: http://www.koffice.org Version: 2.1.2 -Release: 1 +Release: 2 Source0: koffice-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ koffice2.spec ++++++ --- /var/tmp/diff_new_pack.eo6jMl/_old 2010-04-03 00:23:42.000000000 +0200 +++ /var/tmp/diff_new_pack.eo6jMl/_new 2010-04-03 00:23:42.000000000 +0200 @@ -34,10 +34,11 @@ Summary: Libraries and Base Files for the KDE Office Suite Url: http://www.koffice.org Version: 2.1.2 -Release: 1 +Release: 2 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 ++++++ --- filters/kword/msword-odf/texthandler.cpp.sav 2010-03-29 15:05:58.000000000 +0200 +++ filters/kword/msword-odf/texthandler.cpp 2010-04-02 13:21:15.996518869 +0200 @@ -863,7 +863,7 @@ bool KWordTextHandler::writeListInfo(KoX unsigned int code = text[0].unicode(); if ( (code & 0xFF00) == 0xF000 ) // see wv2 code &= 0x00FF; - listStyleWriter.addAttribute( "text:bullet-char", QString::QString( code ).toUtf8() ); + listStyleWriter.addAttribute( "text:bullet-char", QString( code ).toUtf8() ); } else kWarning(30513) << "Bullet with more than one character, not supported"; --- krita/plugins/filters/levelfilter/kis_level_filter.cpp.sav 2010-03-29 15:06:23.000000000 +0200 +++ krita/plugins/filters/levelfilter/kis_level_filter.cpp 2010-04-02 13:21:15.995519666 +0200 @@ -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-03-29 15:06:06.000000000 +0200 +++ krita/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp 2010-04-02 13:21:15.996518869 +0200 @@ -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-03-29 15:06:06.000000000 +0200 +++ krita/plugins/filters/colorsfilters/kis_perchannel_filter.cpp 2010-04-02 13:21:15.996518869 +0200 @@ -123,7 +123,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); @@ -138,7 +138,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)); if(m_histogram) { --- krita/ui/widgets/kis_curve_widget_p.h.sav 2010-03-29 15:07:17.000000000 +0200 +++ krita/ui/widgets/kis_curve_widget_p.h 2010-04-02 13:21:15.992559120 +0200 @@ -439,7 +439,7 @@ void KisCurveWidget::Private::drawGrid(Q * 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/ui/widgets/kis_curve_widget.cpp.sav 2010-03-29 15:07:17.000000000 +0200 +++ krita/ui/widgets/kis_curve_widget.cpp 2010-04-02 13:21:15.992559120 +0200 @@ -312,11 +312,11 @@ void KisCurveWidget::paintEvent(QPaintEv 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)); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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