Fix rendering with qt-4.8, bug 396259

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 37 insertions, 17 deletions

diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 8c18bc0518a6..90cc6405efb3 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.213 2011/12/18 19:46:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.214 2011/12/28 17:26:43 dilfridge Exp $
+
+*konsole-4.7.4-r1 (28 Dec 2011)
+
+  28 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> -konsole-4.7.4.ebuild,
+  +konsole-4.7.4-r1.ebuild, +files/konsole-4.7.4-ypos.patch:
+  Fix rendering with qt-4.8, bug 396259
 
   18 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> -konsole-4.6.5.ebuild:
   Drop KDE 4.6.5
diff --git a/kde-base/konsole/Manifest b/kde-base/konsole/Manifest
index e96b76b1e4b3..70113354a6c8 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-base/konsole/Manifest
@@ -3,28 +3,29 @@ Hash: SHA512
 
 AUX konsole-4.6.4-imagesize.patch 2373 RMD160 f35549577157ccc9a596dae80ed6cf520ccff5f2 SHA1 b54d9b0515201df553d2386dd2b53e15e2502fcc SHA256 cbebc132ff781fa02cb6e2db9c1f7c55ea0aa98e8506dbd2325a672f437de978
 AUX konsole-4.7.0-tests.patch 601 RMD160 ef426c3bff818dc8f28e1307b28d25d64b06373f SHA1 52df5ea38250060e7b57484deae8d7bffcb2b58c SHA256 edb420e4b9784a50ed377c31c3f4ca1ba2985c66a8250f68d2182b214e9a716b
+AUX konsole-4.7.4-ypos.patch 450 RMD160 49c4d9cb410da550326e52a9f7a7679b8f9b0e02 SHA1 e8e60e24f289d9f3594e1d38171921e8cca057bc SHA256 0e5299ed0b2ac06c09614d25d0a30fd4cc57250e04da97f4cc3748ab42409b09
 DIST kdebase-4.6.3.tar.bz2 2682586 RMD160 38784d7a5a708703f5a22e39dc5f83ef7aecd833 SHA1 69cfba74099cdce27f7f72725288f025979b41f3 SHA256 23151e6afdc3864a9637794715faf750740e15f15b5d9f5b35ab431db473494d
 DIST konsole-4.7.3.tar.bz2 462846 RMD160 1cc3c2816c8b2ab6c23624b02dda5a1ffd1f3457 SHA1 ecf5d1cc087d78ba049fe65e06ee992a2fadcc19 SHA256 e18d838ce3a34a60ad61b9fa21b2ba07466491ea81649efa4dff3b96291a4f00
 DIST konsole-4.7.4.tar.bz2 463114 RMD160 fc4bad47e8cb86440b04182101c0dedb70b1ae4b SHA1 33e1bc6f1043c9bf6186190b66b21483301eac7e SHA256 fe464482d43b2ca33a4f26a978c1959e16b55056e4c32fc5e906d9681e9a02f3
 EBUILD konsole-4.6.3.ebuild 750 RMD160 7d0fcbd17195124446006310d2f7322fcb1f46bd SHA1 66bfb71267ebd7377d60410b3f5ff4aa4129457b SHA256 c16b8d40d4c9b6ee4d4c774fc00f026e7a98be7c725e0ba2b4224ad76157646c
 EBUILD konsole-4.7.3.ebuild 794 RMD160 35ef123093254473eca218707e8b400f99a6e436 SHA1 cce4cd32b9003924464033c005de48ca2dbbb53f SHA256 a9036889cfc622de8853b783fa2934e50cc709b80f55453aea62b55d69905c3e
-EBUILD konsole-4.7.4.ebuild 794 RMD160 7cf0d5f4aafcd67731a04889ed1889dfba120e92 SHA1 555fc6b851dc26498672c437c3c458459a98bde3 SHA256 51b761460de7d0d0e531b276607447f606a0b8988cccb29819700d5c8200be4d
-MISC ChangeLog 26841 RMD160 b5a8cd88539e47e542bc99998b297e3dcad5f985 SHA1 e7b967d8fac9fbf79962e72e01a61dfb016c5cea SHA256 5aea230e8adf6bc3670ead7ea8018a0f91020fec753b6f321444ee1fc886ccbb
+EBUILD konsole-4.7.4-r1.ebuild 838 RMD160 b2f41190c38f8273fe294f07801ab23392e7f2e5 SHA1 03a83eb8bc97c7bd8a03ef9f13c0341c1e36b84f SHA256 19659e3a4c7cadc6bf8d8811b7eeb24cc59e5fcb03f222f032291346cbc01f86
+MISC ChangeLog 27056 RMD160 682d540e23cac93f1305774fac421146cd768600 SHA1 008182cee0c2c527abc154aa0ff7270175868ddc SHA256 c704ef8cb17a05acb9d4c5a9f1d387483bd2d45e70db50ade7660b32c811296f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO7kN1AAoJENwGBM22xffeuIkP/1AdkTY8W7vZIWK8gcwYPkoT
-oQgKKPC8RAXaZziytkdqp75OOhYSmDImv1URqjBUmTNxPRpRnXiYQMS6WrjIH2t6
-t0zb5vguK2vQ9mcUvpMpwhGAGu8fiPnRfZIHrqebCg6xO0Y3jTeM+9fH9US/PeyE
-8waxBjYqw9rWvR8R449k+sbidVtJYi/mPPmdwYlkh6FCZHSE/mGp2GhVWrDht7y8
-frsp8v7WazqRS4KCjmqQuc2YPHOOeocarF00QpCzOH39uwF4UzaKKjQc0t6Jlt2v
-G/IA8f6tcK2zq8aE7VA/vLCTf8TIXoT7a8AX+m5B3uR3Elui5OwuSWjARjW62JAi
-1krFPQxJOpY6oJBj47+PixS67vrkH/luZFzEYAmR7QYxj8E17xJ51EARscVDE2eC
-vT+M1vQkckf8COK7B7u9818heqQNZDMR7lReAsC1z+uUChTsArAxwvjRUrBHUeyb
-rTisnfN/A4wdgPVNghw1D4X0YSF4PkYdpMRGfRdcJdPXglkQipw3QP7ZaPrVTo28
-VNdaZD8nWkhJi5xodKkFB4Eb6UEWg6PQFXex/swOvqK67ssb/Kp77r1iyx35hnLT
-F5aCdG+RmBhk0u+0eZkJmGz8U7etdfNVxyE8xQuY1bsJZxIoPEmnKyQhWWBMM3Ii
-FWg4k7Urol/TMqDB4dMB
-=dbVT
+iQIcBAEBCgAGBQJO+1HUAAoJEEb+UGWnxTyHZjYP/0q+8wG/BFkhOK0X0gudX2be
+s29yE6mIpXCKOwRETj36N3IGgFYX2pbKIJjkCw5ekNiRsygXnTxmvCJ/2MNpAV/9
+kjn92QVnomLvyBgv+Gwts2J5PPzXA/2iIkS/GOXAgDojF4IBor9z3XD+Y169kVqf
+r9d0/54zaLfXjZO7468Qp4RSYteJIxGBstPVJXfMN8lmDWorDbebdWWQ0bGUp1pa
+Q6ZTSYvN2p0YnUmuz1LsKmexrjQbAEoOMWFPJ+GfWG1KRyQAqDJGjpTfYkGCpAh3
+Zx2yTOh2NLBI3FhJL8E8fEpJ81z3Qv/tZ3YIyj3702/zOPMRZQgZa/29hRLDnPKs
+vOGaDccHz/KIIJ4KbSgLZXqwVr1zYwrHTg97YLEm+YVgW/5JwidynS9XlooYm/YC
+veNz0COFNyI/bhm8vT45OIt0b8l66ATVqdl3P9e0DleO9yNzVSIMSsKBVBZ95tc9
+nRL0qWkRpBkcnoZ4nccUL6GljX+1CxAC34PZqoBqxJKSajRdOnHy7ltq7PmSPP4f
+xATWfOYOlj5fMXaAf4fZTaBqn2kcuGDfpcl/ymixU2j7BXC4fwCd6FlTXLYaffL8
+3Ab3pgTgEBpubxr3QFn3Hm7C154wLupnoQ7XWbs/doDcuRbwIO8qV46LUlIsMjbv
+KvmVp0ePVxBsvUTBdTWW
+=jgGy
 -----END PGP SIGNATURE-----
diff --git a/kde-base/konsole/files/konsole-4.7.4-ypos.patch b/kde-base/konsole/files/konsole-4.7.4-ypos.patch
new file mode 100644
index 000000000000..e9bdd4c71e5e
--- /dev/null
+++ b/kde-base/konsole/files/konsole-4.7.4-ypos.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+--- a/src/TerminalDisplay.cpp	2011-10-28 10:44:03.000000000 +0300
++++ b/src/TerminalDisplay.cpp	2011-12-28 02:32:02.686667954 +0200
+@@ -718,7 +718,7 @@
+         if (_bidiEnabled)
+             painter.drawText(rect,0,text);
+         else
+-            painter.drawText(rect,0,LTR_OVERRIDE_CHAR+text);
++            painter.drawText(rect,Qt::AlignBottom,LTR_OVERRIDE_CHAR+text);
+     }
+ }
+ 
diff --git a/kde-base/konsole/konsole-4.7.4.ebuild b/kde-base/konsole/konsole-4.7.4-r1.ebuild
index 06bae78d91eb..7404bda876a8 100644
--- a/kde-base/konsole/konsole-4.7.4.ebuild
+++ b/kde-base/konsole/konsole-4.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.7.4.ebuild,v 1.1 2011/12/11 18:52:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.7.4-r1.ebuild,v 1.1 2011/12/28 17:26:43 dilfridge Exp $
 
 EAPI=4
 
@@ -36,4 +36,5 @@ RDEPEND="${COMMONDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.6.4-imagesize.patch"
 	"${FILESDIR}/${PN}-4.7.0-tests.patch"
+	"${FILESDIR}/${PN}-4.7.4-ypos.patch"
 )