extra/calligra: remove patch

This commit is contained in:
Kevin Mihelich 2015-03-16 11:40:21 +00:00
parent 1497b2f2d7
commit cd270792e1
2 changed files with 2 additions and 32 deletions

View file

@ -5,7 +5,6 @@
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
# - removed makedepend on vc - not for ARM
# - patch to fix qreal ARMisms
pkgbase=calligra
pkgname=('calligra-braindump'
@ -35,16 +34,11 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen' 'kdeedu-marble'
'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio'
'libetonyek' 'libpqxx' 'libspnav' 'postgresql')
groups=('calligra')
source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"
'arm.patch')
md5sums=('3afd7afffbbb8078dcc1e339a85cf74c'
'e701bc237f84bfa9ed6531d1446008da')
source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
md5sums=('3afd7afffbbb8078dcc1e339a85cf74c')
prepare() {
mkdir build
cd ${pkgbase}-${pkgver}
patch -p1 -i ../arm.patch
}
build() {

View file

@ -1,24 +0,0 @@
diff -urN a/krita/image/kis_circle_mask_generator.cpp b/krita/image/kis_circle_mask_generator.cpp
--- a/krita/image/kis_circle_mask_generator.cpp 2015-02-24 05:53:08.000000000 -0700
+++ b/krita/image/kis_circle_mask_generator.cpp 2015-03-03 16:52:50.040204434 -0700
@@ -122,7 +122,7 @@
void KisCircleMaskGenerator::setSoftness(qreal softness)
{
KisMaskGenerator::setSoftness(softness);
- qreal safeSoftnessCoeff = 1.0 / qMax(0.01, softness);
+ qreal safeSoftnessCoeff = 1.0 / qMax(0.01, (double)softness);
d->transformedFadeX = d->xfadecoef * safeSoftnessCoeff;
d->transformedFadeY = d->yfadecoef * safeSoftnessCoeff;
diff -urN a/krita/image/kis_rect_mask_generator.cpp b/krita/image/kis_rect_mask_generator.cpp
--- a/krita/image/kis_rect_mask_generator.cpp 2015-02-24 05:53:08.000000000 -0700
+++ b/krita/image/kis_rect_mask_generator.cpp 2015-03-03 16:52:19.980206593 -0700
@@ -72,7 +72,7 @@
void KisRectangleMaskGenerator::setSoftness(qreal softness)
{
KisMaskGenerator::setSoftness(softness);
- qreal safeSoftnessCoeff = 1.0 / qMax(0.01, softness);
+ qreal safeSoftnessCoeff = 1.0 / qMax(0.01, (double)softness);
d->transformedFadeX = d->xfadecoeff * safeSoftnessCoeff;
d->transformedFadeY = d->yfadecoeff * safeSoftnessCoeff;