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

Package-Manager: portage-2.2.0_alpha98/cvs/Linux i686

4 files changed, 51 insertions, 9 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/Manifest b/x11-libs/qt-gui/Manifest
index ee07ea1ff3bd..5faab082a5fd 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX qt-gui-4.6-libpng-1.5.patch 11322 RMD160 dba67fb2e79b96644e70715d6ffb28f3e676e884 SHA1 84c758d2fb76470b9282348a487e096dba33a92b SHA256 05c7a5aceeff1cc4c2bad065402025e6d4fead98c0eb0d786d15f65d7d1774a9
 AUX qt-gui-4.7.3-cups.patch 3297 RMD160 fc99e57ccfa8db47a1df799186d6daedcbdf744d SHA1 d712b9b570101de5c996692551ba5a3ae4a410e9 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33
 AUX qt-gui-4.7.4-fix-libreoffice-crash.patch 1958 RMD160 da10c0614e4ecb8f6f3c705d191503a42e174659 SHA1 652fc396b99846d1f2fe334c15f4cd4b8599806b SHA256 097021dfb6c25d8d8ca31a8a1bf70e35f9962113ce44791ad682fb54f4604844
+AUX qt-gui-4.8.1-fix-calligra-crash.patch 1074 RMD160 076cc7c25389e2e44ceeaed84ff8ecccef2685e5 SHA1 81998944520def371e07d8bfd88bc9a5f693836b SHA256 94bcdce1b4d737bf7492bb1936502054fa9c66d1d55dfb437c644166b0281d7e
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 RMD160 3e47b09663a89973b1c8628506c995dfc2a5387c SHA1 af9016aa924a577f7b06ffd28c9773b56d74c939 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
@@ -14,13 +15,17 @@ EBUILD qt-gui-4.6.3.ebuild 5438 RMD160 6c7e7fcfdf10576f06a9ae70030cca1839d165e4
 EBUILD qt-gui-4.7.2.ebuild 6303 RMD160 0338bbbce1bd8d833ea5d58358742e9bdfab28a5 SHA1 665cb48ca6c9cfda2dee41cc7546edfcc1f03b6f SHA256 4a1b830be8f11858d6abaf0d35f723e52f1630fc12cd472ea606be47d20e0085
 EBUILD qt-gui-4.7.4-r1.ebuild 6244 RMD160 c02b02a1494a17669fce66ce5eba356499b3078d SHA1 b09ca74c13183e4b0eec51ae58941f7c0ffb2cf1 SHA256 678c748ed84f12d0e47d5e790fb63150c8ac27bf58b2f5bfe4f294fa45c434d8
 EBUILD qt-gui-4.8.0-r4.ebuild 7642 RMD160 14abc0ec409906fbe843cee5f96f1d5913102769 SHA1 f763d270e02ea93fa9811c2f66e3637e182af86b SHA256 75dfb70d75e4b29fd5a6eaa8195f1a734142140579fe8310b9c3bd79e5f50f0f
-EBUILD qt-gui-4.8.1.ebuild 7650 RMD160 a69b85783339219836bc31654f4cb99214d19d7d SHA1 814674e89661aaa300f3370a4a3aa80f0fa5cc5b SHA256 2ceee254add308a505971533c88670015fc75c23d332cdda79f26cb020e6cfcd
-MISC ChangeLog 26502 RMD160 7a5a3d91f733058659be2831c46eb67459e055c4 SHA1 eea4b94ca6bf17a7dffeb988244f29746b544e94 SHA256 f1506b6426409227d0ece64fa0dd884ba117156f6febce8af659355893144e4a
+EBUILD qt-gui-4.8.1-r1.ebuild 7701 RMD160 82c92b0ece6f2b02ee34c0346bc9ac5e1d0321aa SHA1 ca3f2a11e10fc53a6c528dbf9e6ed337efd10b6e SHA256 4dbf6e5d12aba7c5b26ea661a1ca2d3271a28e16e4d743799aca95c28d7584e0
+MISC ChangeLog 26802 RMD160 e6b5951a80d3e941ba4d055672d2f73b6b77fcab SHA1 03bb76bff580f25c862eac6481b3148597f302b5 SHA256 ca13b1f99846ed02c4abc836f57f3cbf5c42c7f2b87382bf2502d0d86db5215d
 MISC metadata.xml 1321 RMD160 1542571f692bb2835d37878f355c92d733e67723 SHA1 da96dabea1aa946e1a5d9a983d6ea618dee58999 SHA256 a494da2f630a67491fd5f1950247277abce91216ed93b879cd511a13672da903
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk97b9gACgkQVWmRsqeSphOTWACeNDK3IapkiGgMLEFF9jmDt9/Y
-omwAnjvk/Re8EEYIrFD5vG/ysnWYmeWy
-=5s0X
+iQEcBAEBCgAGBQJPfDTiAAoJEO+t9ga+3I3aGbUH/2m1qlrwzFh/2tLFJrbaF9WP
+Y3LwZ46qePhEpvt7Hn1yIwY5rwXBWCGXathgqyT0Y0FrXMu43EIAmPKr6iyL9+jM
+aCaPC+U6I69UisMCSSODr3lNmzVs6D+KvK6VI5lEIyx5vswI8SQncLvhmmq+zSFQ
+FaRnd68HX6WPzIF0axGtW2jZU5WRDQLerGrWCc8NQakYMQXqu/H9iw9Tra7/vHpv
+T/DpvSuEIFJTxWR+PzlzYX8DgTRkjYIOyGs9/lOuGufdyXqV4MlKDFiq0IjQyWjD
+nidYkU2XYyb399+SwlXbwCBGuAv7szp7mDzrWpyGzTBHeziH0wrI2evc9fpTM0Y=
+=gOVw
 -----END PGP SIGNATURE-----
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() {