Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=51d11bb59d704b4bbcfa2ce29ef771cf13b85f0b
commit 51d11bb59d704b4bbcfa2ce29ef771cf13b85f0b Author: Melko <[email protected]> Date: Wed May 30 20:59:06 2012 +0200 calligra-2.4.2-1-i686 * version bump diff --git a/source/kde-extra/calligra/FrugalBuild b/source/kde-extra/calligra/FrugalBuild index 0ca6cbf..875871d 100644 --- a/source/kde-extra/calligra/FrugalBuild +++ b/source/kde-extra/calligra/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Melko <[email protected]> pkgname=calligra -pkgver=2.4.1 -pkgrel=2 +pkgver=2.4.2 +pkgrel=1 pkgdesc="An integrated Office suite for KDE" url="http://www.calligra-suite.org"; _F_kde_dirname="stable/$pkgname-latest" @@ -19,9 +19,7 @@ provides=("${replaces[@]}") conflicts=("${replaces[@]}") archs=('i686' 'x86_64') up2date="Flasttar $_F_kde_mirror/$_F_kde_dirname" -source=(${source[@]} fix-colors.patch) -sha1sums=('f5be221d50088ac4537931811272392846cd7363' \ - '56786e36fad7a105ca1fdec3d2a359d8a1fc3050') +sha1sums=('d44a6b321b0b90122b86e074785546f4a2b0d066') subpkgs=("${subpkgs[@]}" "braindump") diff --git a/source/kde-extra/calligra/fix-colors.patch b/source/kde-extra/calligra/fix-colors.patch deleted file mode 100644 index 51eb1e1..0000000 --- a/source/kde-extra/calligra/fix-colors.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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
