Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=850ba6866397969c13e857024fdb4585844c6a79
commit 850ba6866397969c13e857024fdb4585844c6a79 Author: Marius Cirsta <[email protected]> Date: Wed May 2 23:17:26 2012 +0000 calligra-2.4.1-2-x86_64 * add patch to fix a crash diff --git a/source/kde-extra/calligra/FrugalBuild b/source/kde-extra/calligra/FrugalBuild index 36485fd..3f1f173 100644 --- a/source/kde-extra/calligra/FrugalBuild +++ b/source/kde-extra/calligra/FrugalBuild @@ -19,7 +19,9 @@ provides=("${replaces[@]}") conflicts=("${replaces[@]}") archs=('i686' 'x86_64') up2date="Flasttar $_F_kde_mirror/$_F_kde_dirname" -sha1sums=('f5be221d50088ac4537931811272392846cd7363') +source=(${source[@]} fix-colors.patch) +sha1sums=('f5be221d50088ac4537931811272392846cd7363' \ + '56786e36fad7a105ca1fdec3d2a359d8a1fc3050') subpkgs=("${subpkgs[@]}" "braindump") diff --git a/source/kde-extra/calligra/fix-colors.patch b/source/kde-extra/calligra/fix-colors.patch new file mode 100644 index 0000000..51eb1e1 --- /dev/null +++ b/source/kde-extra/calligra/fix-colors.patch @@ -0,0 +1,44 @@ +--- a/libs/widgets/KoColorPopupAction.cpp ++++ b/libs/widgets/KoColorPopupAction.cpp +@@ -45,7 +45,7 @@ + class KoColorPopupAction::KoColorPopupActionPrivate + { + public: +- KoColorPopupActionPrivate() ++ KoColorPopupActionPrivate() + : colorSetWidget(0), colorChooser(0), opacitySlider(0), menu(0), checkerPainter(4) + , showFilter(true), applyMode(true) + {} +@@ -81,7 +81,9 @@ KoColorPopupAction::KoColorPopupAction(Q + + KoResourceServer<KoColorSet>* srv = KoResourceServerProvider::instance()->paletteServer(); + QList<KoColorSet*> palettes = srv->resources(); +- d->colorSetWidget->setColorSet(palettes.first()); ++ if (palettes.size() > 0) { ++ d->colorSetWidget->setColorSet(palettes.first()); ++ } + + d->colorChooser = new KoTriangleColorSelector( widget ); + // prevent mouse release on color selector from closing popup +@@ -109,9 +111,9 @@ KoColorPopupAction::KoColorPopupAction(Q + + connect(d->colorSetWidget, SIGNAL(colorChanged(const KoColor &, bool)), this, SLOT(colorWasSelected(const KoColor &, bool))); + +- connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ), ++ connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ), + this, SLOT( colorWasEdited( const QColor &) ) ); +- connect( d->opacitySlider, SIGNAL(valueChanged(int)), ++ connect( d->opacitySlider, SIGNAL(valueChanged(int)), + this, SLOT(opacityWasChanged(int))); + } + +@@ -169,7 +171,7 @@ void KoColorPopupAction::updateIcon( ) + { + pm = QImage(iconSize, QImage::Format_ARGB32_Premultiplied); + pm.fill(Qt::transparent); +- // there was no icon set so we assume ++ // there was no icon set so we assume + // that we create an icon from the current color + d->applyMode = false; + } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
