Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e3213be331eb2736fb8ed269db9c9534f4af5e3b
commit e3213be331eb2736fb8ed269db9c9534f4af5e3b Author: Marius Cirsta <[email protected]> Date: Thu May 3 00:50:43 2012 +0000 calligra-2.4.1-2-x86_64 * fix patch diff --git a/source/kde-extra/calligra/FrugalBuild b/source/kde-extra/calligra/FrugalBuild index f1b14db..6ad03ce 100644 --- a/source/kde-extra/calligra/FrugalBuild +++ b/source/kde-extra/calligra/FrugalBuild @@ -21,7 +21,7 @@ archs=('i686' 'x86_64') up2date="Flasttar $_F_kde_mirror/$_F_kde_dirname" source=(${source[@]} fix-colors.patch) sha1sums=('f5be221d50088ac4537931811272392846cd7363' \ - 'befcf215c2a53074349499184c9cc0c5282630da') + '56786e36fad7a105ca1fdec3d2a359d8a1fc3050') subpkgs=("${subpkgs[@]}" "braindump") @@ -68,7 +68,7 @@ subreplaces=("${subreplaces[@]}" '') subpkgs=("${subpkgs[@]}" "krita") subdescs=("${subdescs[@]}" "Calligra image manipulation application.") subdepends=("${subdepends[@]}" "libthreadweaver>=$_F_kde_ver libknewstuff>=$_F_kde_ver libqtopengl>=$_F_kde_qtver \ - glew libkdcraw>=$_F_kde_ver poppler-qt4 libqtuitools>=$_F_kde_qtver openexr libqtgtl lcms2 exiv2>=0.23") + glew libkdcraw>=$_F_kde_ver poppler-qt4 libqtuitools>=$_F_kde_qtver openexr libqtgtl lcms2") subrodepends=("${subrodepends[@]}" "$pkgname-libs=$pkgver $pkgname-data=$pkgver") subgroups=("${subgroups[@]}" 'kde-extra') subarchs=("${subarchs[@]}" 'i686 x86_64') diff --git a/source/kde-extra/calligra/fix-colors.patch b/source/kde-extra/calligra/fix-colors.patch index 659e200..51eb1e1 100644 --- a/source/kde-extra/calligra/fix-colors.patch +++ b/source/kde-extra/calligra/fix-colors.patch @@ -4,7 +4,7 @@ class KoColorPopupAction::KoColorPopupActionPrivate { public: -- KoColorPopupActionPrivate() +- KoColorPopupActionPrivate() + KoColorPopupActionPrivate() : colorSetWidget(0), colorChooser(0), opacitySlider(0), menu(0), checkerPainter(4) , showFilter(true), applyMode(true) @@ -17,26 +17,26 @@ + 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 &) ), + connect( d->colorChooser, SIGNAL( colorChanged( const QColor &) ), this, SLOT( colorWasEdited( const QColor &) ) ); -- connect( d->opacitySlider, SIGNAL(valueChanged(int)), +- 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 + // 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
