[SCM] konsole packaging branch, master, updated. debian/4.8.4-2-1-g479d231

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/konsole.git;a=commitdiff;h=479d231

The following commit has been merged in the master branch:
commit 479d2314e7643be8690361e4fdc9e977ae545604
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 18 10:42:57 2013 +0100

    Reduces vertical misalignment
    
    - Add drawText-alignBottom.diff, this adds alignBottom flag to the bidirectional
      renderer.
    - Add avoid-lineSpacing.diff, this reverts the added linespacing for the
      unidirectional renderer.
    
    Git-Dch: Full
    Closes: 672554
---
 debian/changelog                         |   13 ++++++++++
 debian/patches/avoid-lineSpacing.diff    |   13 ++++++++++
 debian/patches/drawText-alignBottom.diff |   37 ++++++++++++++++++++++++++++++
 debian/patches/series                    |    2 +
 4 files changed, 65 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d347b6d..25eb5c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+konsole (4:4.8.4-3) UNRELEASED; urgency=low
+
+  * Team upload.
+
+  [ Maximiliano Curia ]
+  * Reduces vertical misalignment (Closes: 672554)
+    - Add drawText-alignBottom.diff, this adds alignBottom flag to the bidirectional
+      renderer.
+    - Add avoid-lineSpacing.diff, this reverts the added linespacing for the
+      unidirectional renderer.
+
+ -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Feb 2013 10:51:45 +0100
+
 konsole (4:4.8.4-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/avoid-lineSpacing.diff b/debian/patches/avoid-lineSpacing.diff
new file mode 100644
index 0000000..b4fd6d4
--- /dev/null
+++ b/debian/patches/avoid-lineSpacing.diff
@@ -0,0 +1,13 @@
+Index: konsole/src/TerminalDisplay.h
+===================================================================
+--- konsole.orig/src/TerminalDisplay.h	2013-02-18 12:11:02.117782190 +0100
++++ konsole/src/TerminalDisplay.h	2013-02-18 12:14:25.000000000 +0100
+@@ -405,7 +405,7 @@
+         if (_bidiEnabled) {
+             setLineSpacing(0);
+         } else {
+-            setLineSpacing(2);
++            setLineSpacing(0);
+         }
+ #endif
+     }
diff --git a/debian/patches/drawText-alignBottom.diff b/debian/patches/drawText-alignBottom.diff
new file mode 100644
index 0000000..e6d1904
--- /dev/null
+++ b/debian/patches/drawText-alignBottom.diff
@@ -0,0 +1,37 @@
+Index: konsole/src/TerminalDisplay.cpp
+===================================================================
+--- konsole.orig/src/TerminalDisplay.cpp	2013-02-18 12:18:34.531454381 +0100
++++ konsole/src/TerminalDisplay.cpp	2013-02-18 12:20:46.362113452 +0100
+@@ -707,6 +707,13 @@
+     }
+     else
+     {
++		// Avoid fonts vertical displacement.
++
++		// See bug 280896 for more info
++		int flags = 0;
++#if QT_VERSION >= 0x040800
++		flags |= Qt::AlignBottom;
++#endif
+         // Force using LTR as the document layout for the terminal area, because
+         // there is no use cases for RTL emulator and RTL terminal application.
+         //
+@@ -721,16 +728,11 @@
+         //
+         // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2
+         if (_bidiEnabled) {
+-            painter.drawText(rect, 0, text);
++            painter.drawText(rect, flags, text);
+         }
+         else
+         {
+-            // See bug 280896 for more info
+-#if QT_VERSION >= 0x040800
+-            painter.drawText(rect, Qt::AlignBottom, LTR_OVERRIDE_CHAR + text);
+-#else
+-            painter.drawText(rect, 0, LTR_OVERRIDE_CHAR + text);
+-#endif
++            painter.drawText(rect, flags, LTR_OVERRIDE_CHAR + text);
+         }
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 5047970..4ee50d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 one_profile_per_window.diff
 debian-T-addition.diff
 upstream_No-need-to-lookup-executable-PATH-when-absolute-path.patch
+avoid-lineSpacing.diff
+drawText-alignBottom.diff

-- 
konsole packaging