[konsole] improved 'fonts get chopped' patch, fixes ascenders too (#742583, kde#280896)

[Rex Dieter]

commit c8462f897078fa311318ca1c1b42a6fef9c4d075
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jan 31 18:11:33 2012 -0600

    improved 'fonts get chopped' patch, fixes ascenders too (#742583,kde#280896)

 konsole-4.7.95-kdebug280896.patch |   12 ------------
 konsole-4.8.0-kdebug280896.patch  |   21 +++++++++++++++++++++
 konsole.spec                      |    7 +++++--
 3 files changed, 26 insertions(+), 14 deletions(-)
---
diff --git a/konsole-4.8.0-kdebug280896.patch b/konsole-4.8.0-kdebug280896.patch
new file mode 100644
index 0000000..450f088
--- /dev/null
+++ b/konsole-4.8.0-kdebug280896.patch
@@ -0,0 +1,21 @@
+diff -up konsole-4.8.0/src/TerminalDisplay.cpp.kdebug280896 konsole-4.8.0/src/TerminalDisplay.cpp
+--- konsole-4.8.0/src/TerminalDisplay.cpp.kdebug280896	2011-12-02 15:31:44.000000000 -0600
++++ konsole-4.8.0/src/TerminalDisplay.cpp	2012-01-31 18:03:12.750555833 -0600
+@@ -311,7 +311,7 @@ TerminalDisplay::TerminalDisplay(QWidget
+ ,_resizeTimer(0)
+ ,_flowControlWarningEnabled(false)
+ ,_outputSuspendedLabel(0)
+-,_lineSpacing(0)
++,_lineSpacing(1)
+ ,_colorsInverted(false)
+ ,_blendColor(qRgba(0,0,0,0xff))
+ ,_filterChain(new TerminalImageFilterChain())
+@@ -723,7 +723,7 @@ void TerminalDisplay::drawCharacters(QPa
+         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/konsole.spec b/konsole.spec
index 5af50e5..6d8cd65 100644
--- a/konsole.spec
+++ b/konsole.spec
@@ -1,7 +1,7 @@
 Name:    konsole
 Summary: KDE Terminal emulator
 Version: 4.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # sources: MIT and LGPLv2 and LGPLv2+ and GPLv2+
 License: GPLv2 
@@ -16,7 +16,7 @@ Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/%{name}-%{version}.t
 
 ## upstreamable patches
 # Some fonts get chopped with Qt 4.8, http://bugs.kde.org/280896
-Patch50: konsole-4.7.95-kdebug280896.patch
+Patch50: konsole-4.8.0-kdebug280896.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
@@ -85,6 +85,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/konsole.des
 
 
 %changelog
+* Tue Jan 31 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.0-2
+- improved 'fonts get chopped' patch, fixes ascenders too (#742583,kde#280896)
+
 * Fri Jan 20 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.0-1
 - 4.8.0