summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-12-28 17:26:43 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-12-28 17:26:43 +0000
commit19e2f69e1fb88cdd9610c36b86e876a84103c5ba (patch)
tree6c137dbed7d0fba84717d3b236382d4d32cae174 /kde-base
parentUpdate to EAPI4. (diff)
downloadgentoo-2-19e2f69e1fb88cdd9610c36b86e876a84103c5ba.tar.gz
gentoo-2-19e2f69e1fb88cdd9610c36b86e876a84103c5ba.tar.bz2
gentoo-2-19e2f69e1fb88cdd9610c36b86e876a84103c5ba.zip
Fix rendering with qt-4.8, bug 396259
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/konsole/ChangeLog8
-rw-r--r--kde-base/konsole/files/konsole-4.7.4-ypos.patch12
-rw-r--r--kde-base/konsole/konsole-4.7.4-r1.ebuild (renamed from kde-base/konsole/konsole-4.7.4.ebuild)3
3 files changed, 21 insertions, 2 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/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"
)