[konsole] Some fonts get chopped with Qt 4.8 (kde#280896)

[Rex Dieter]

commit 8d1f84ececdbd2e98af885b86441c196865c9483
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Dec 27 21:13:16 2011 -0600

    Some fonts get chopped with Qt 4.8 (kde#280896)

 konsole-4.7.95-kdebug280896.patch |   12 ++++++++++++
 konsole.spec                      |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/konsole-4.7.95-kdebug280896.patch b/konsole-4.7.95-kdebug280896.patch
new file mode 100644
index 0000000..a7359d5
--- /dev/null
+++ b/konsole-4.7.95-kdebug280896.patch
@@ -0,0 +1,12 @@
+diff -up konsole-4.7.95/src/TerminalDisplay.cpp.kde280896 konsole-4.7.95/src/TerminalDisplay.cpp
+--- konsole-4.7.95/src/TerminalDisplay.cpp.kde280896	2011-12-02 15:31:44.000000000 -0600
++++ konsole-4.7.95/src/TerminalDisplay.cpp	2011-12-27 21:11:28.386653332 -0600
+@@ -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 6b6567c..5fba89b 100644
--- a/konsole.spec
+++ b/konsole.spec
@@ -1,13 +1,17 @@
 Name:    konsole
 Summary: KDE Terminal emulator
 Version: 4.7.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # sources: MIT and LGPLv2 and LGPLv2+ and GPLv2+
 License: GPLv2 
 URL:     http://konsole.kde.org/ 
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 
+## upstreamable patches
+# Some fonts get chopped with Qt 4.8, http://bugs.kde.org/280896
+Patch50: konsole-4.7.95-kdebug280896.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase-devel >= %{version}
@@ -33,6 +37,8 @@ Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 %prep
 %setup -q
 
+%patch50 -p1 .kdebug280896
+
 
 %build
 mkdir -p %{_target_platform}
@@ -73,6 +79,9 @@ desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/konsole.des
 
 
 %changelog
+* Tue Dec 27 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.95-2
+- Some fonts get chopped with Qt 4.8 (kde#280896)
+
 * Wed Dec 21 2011 Radek Novacek <rnovacek at redhat.com> - 4.7.95-1
 - 4.7.95