diff -Nru calligra-2.3.86/debian/changelog calligra-2.3.86/debian/changelog --- calligra-2.3.86/debian/changelog 2012-01-13 17:34:52.000000000 +0000 +++ calligra-2.3.86/debian/changelog 2012-01-16 12:34:51.000000000 +0000 @@ -1,3 +1,9 @@ +calligra (1:2.3.86-0ubuntu6) precise; urgency=low + + * Update kubuntu_01_arm_fixes.diff for more ARM missing qreal + + -- Jonathan Riddell Mon, 16 Jan 2012 12:34:39 +0000 + calligra (1:2.3.86-0ubuntu5) precise; urgency=low [ Jonathan Riddell ] diff -Nru calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff --- calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff 2012-01-13 17:34:52.000000000 +0000 +++ calligra-2.3.86/debian/patches/kubuntu_01_arm_fixes.diff 2012-01-16 12:36:57.000000000 +0000 @@ -1,7 +1,7 @@ Index: calligra-2.3.86/krita/image/brushengine/kis_paint_information.cc =================================================================== --- calligra-2.3.86.orig/krita/image/brushengine/kis_paint_information.cc 2012-01-07 03:25:01.000000000 +0000 -+++ calligra-2.3.86/krita/image/brushengine/kis_paint_information.cc 2012-01-13 16:14:04.000000000 +0000 ++++ calligra-2.3.86/krita/image/brushengine/kis_paint_information.cc 2012-01-16 12:32:46.000000000 +0000 @@ -211,20 +211,20 @@ qreal KisPaintInformation::declination(const KisPaintInformation& info, qreal maxTiltX, qreal maxTiltY, bool normalize) @@ -31,7 +31,7 @@ Index: calligra-2.3.86/plugins/textshape/dialogs/QuickTableButton.cpp =================================================================== --- calligra-2.3.86.orig/plugins/textshape/dialogs/QuickTableButton.cpp 2012-01-07 03:25:03.000000000 +0000 -+++ calligra-2.3.86/plugins/textshape/dialogs/QuickTableButton.cpp 2012-01-13 16:16:43.000000000 +0000 ++++ calligra-2.3.86/plugins/textshape/dialogs/QuickTableButton.cpp 2012-01-16 12:32:46.000000000 +0000 @@ -87,8 +87,8 @@ void SizeChooserGrid::mouseMoveEvent(QMouseEvent *ev) @@ -43,3 +43,16 @@ repaint(); } +Index: calligra-2.3.86/filters/karbon/wmf/WmfImportParser.cpp +=================================================================== +--- calligra-2.3.86.orig/filters/karbon/wmf/WmfImportParser.cpp 2012-01-07 03:25:00.000000000 +0000 ++++ calligra-2.3.86/filters/karbon/wmf/WmfImportParser.cpp 2012-01-16 12:36:07.621449394 +0000 +@@ -531,7 +531,7 @@ + return "stroke:none;"; + } + +- const qreal width = context.pen.width() > 1.0 ? qMax(1.0, context.pen.width() * m_scaleX) : 1.0; ++ const qreal width = context.pen.width() > qreal(1.0) ? qMax(qreal(1.0), context.pen.width() * m_scaleX) : qreal(1.0); + + QString strokeStyle; +