Revision bump adds upstream patch to fix crash in calligra. Reported in kde packagers ml and requested by dilfridge.

(Portage version: 2.2.0_alpha98/cvs/Linux i686)

3 files changed, 39 insertions, 2 deletions

diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 0149cd525a0e..13eac9b2e429 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.174 2012/04/03 21:46:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.175 2012/04/04 11:47:17 johu Exp $
+
+*qt-gui-4.8.1-r1 (04 Apr 2012)
+
+  04 Apr 2012; Johannes Huber <johu@gentoo.org>
+  +files/qt-gui-4.8.1-fix-calligra-crash.patch, +qt-gui-4.8.1-r1.ebuild,
+  -qt-gui-4.8.1.ebuild:
+  Revision bump adds upstream patch to fix crash in calligra. Reported in kde
+  packagers ml and requested by dilfridge.
 
   03 Apr 2012; Jeroen Roovers <jer@gentoo.org> qt-gui-4.7.4-r1.ebuild:
   Stable for HPPA (bug #390963).
diff --git a/x11-libs/qt-gui/files/qt-gui-4.8.1-fix-calligra-crash.patch b/x11-libs/qt-gui/files/qt-gui-4.8.1-fix-calligra-crash.patch
new file mode 100644
index 000000000000..431141f4d5db
--- /dev/null
+++ b/x11-libs/qt-gui/files/qt-gui-4.8.1-fix-calligra-crash.patch
@@ -0,0 +1,28 @@
+commit cac12f4592477d99ef6fffaad40345bf85ef53b5
+Author: Jiang Jiang <jiang.jiang@nokia.com>
+Date:   Mon Apr 2 12:32:05 2012 +0200
+
+    Fix a crash in cursorToX() when new block is added
+    
+    When an empty new block is being added, the layoutData->memory data
+    will be 0, thus QTextEngine::attributes() will return 0. We should
+    only access the attributes pointer when some text actually exist.
+    
+    Task-number: QTBUG-24718
+    Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33
+
+diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
+index ee658d9..16f7150 100644
+--- a/src/gui/text/qtextlayout.cpp
++++ b/src/gui/text/qtextlayout.cpp
+@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
+     int pos = *cursorPos;
+     int itm;
+     const HB_CharAttributes *attributes = eng->attributes();
++    if (!attributes) {
++        *cursorPos = 0;
++        return x.toReal();
++    }
+     while (pos < line.from + line.length && !attributes[pos].charStop)
+         pos++;
+     if (pos == line.from + (int)line.length) {
\ No newline at end of file
diff --git a/x11-libs/qt-gui/qt-gui-4.8.1.ebuild b/x11-libs/qt-gui/qt-gui-4.8.1-r1.ebuild
index 1acfb28055a6..05083ed5979c 100644
--- a/x11-libs/qt-gui/qt-gui-4.8.1.ebuild
+++ b/x11-libs/qt-gui/qt-gui-4.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.1.ebuild,v 1.2 2012/03/30 19:53:22 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/qt-gui-4.8.1-r1.ebuild,v 1.1 2012/04/04 11:47:17 johu Exp $
 
 EAPI=4
 
@@ -56,6 +56,7 @@ PDEPEND="qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=,c++0x=,debug=,qpa=] )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.7.3-cups.patch"
+	"${FILESDIR}/${PN}-4.8.1-fix-calligra-crash.patch"
 )
 
 pkg_setup() {