packages: kde4-konsole/kde4-konsole.spec, kde4-konsole/konsole-bug-280896.p...

[arekm]

Author: arekm                        Date: Sat Mar 31 08:02:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; workaround font rendering bug

---- Files affected:
packages/kde4-konsole:
   kde4-konsole.spec (1.13 -> 1.14) 
packages/kde4-konsole:
   konsole-bug-280896.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-konsole/kde4-konsole.spec
diff -u packages/kde4-konsole/kde4-konsole.spec:1.13 packages/kde4-konsole/kde4-konsole.spec:1.14
--- packages/kde4-konsole/kde4-konsole.spec:1.13	Sat Mar 31 09:25:17 2012
+++ packages/kde4-konsole/kde4-konsole.spec	Sat Mar 31 10:02:34 2012
@@ -10,13 +10,14 @@
 Summary(pl.UTF-8):	K Desktop Environment - Emulator terminala dla KDE
 Name:		kde4-konsole
 Version:	4.8.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5:	fa7dec61e2bbf120ddd5cff1d291e4b8
 Patch0:		konsole-wordchars.patch
 Patch1:		konsole-bug-188528.patch
+Patch2:		konsole-bug-280896.patch
 URL:		http://www.kde.org/
 BuildRequires:	kde4-kdebase-devel >= %{version}
 BuildRequires:	kde4-kdebase-workspace-devel >= %{version}
@@ -39,6 +40,7 @@
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
 %patch1 -p2
+%patch2 -p1
 
 %build
 install -d build
@@ -83,6 +85,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2012/03/31 08:02:34  arekm
+- rel 2; workaround font rendering bug
+
 Revision 1.13  2012/03/31 07:25:17  arekm
 - up to 4.8.2
 

================================================================
Index: packages/kde4-konsole/konsole-bug-280896.patch
diff -u /dev/null packages/kde4-konsole/konsole-bug-280896.patch:1.1
--- /dev/null	Sat Mar 31 10:02:39 2012
+++ packages/kde4-konsole/konsole-bug-280896.patch	Sat Mar 31 10:02:37 2012
@@ -0,0 +1,62 @@
+commit bf3e57e94b54c1c4337d7960e0fda0ef98156451
+Author: Kurt Hindenburg <kurt.hindenburg at gmail.com>
+Date:   Fri Mar 30 20:55:46 2012 -0400
+
+        A quick fix to get fonts to look OK w/ Qt4.8 and bidi off
+    
+        Hopefully a temp fix for this issue.  It would be better to find out
+        what happened with Qt4.8 font rendering.
+    
+        Thanks to people on bug report for research and info.
+    
+        CCBUG: 280896
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 1076131..ac44da9 100644
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -720,10 +720,18 @@ void TerminalDisplay::drawCharacters(QPainter& painter,
+         // Qt::LeftToRight for this widget
+         //
+         // This was discussed in: http://lists.kde.org/?t=120552223600002&r=1&w=2
+-        if (_bidiEnabled)
+-            painter.drawText(rect,0,text);
++        if (_bidiEnabled) {
++            painter.drawText(rect, 0, text);
++        }
+         else
+-            painter.drawText(rect,0,LTR_OVERRIDE_CHAR+text);
++        {
++            // 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
++        }
+     }
+ }
+ 
+diff --git a/src/TerminalDisplay.h b/src/TerminalDisplay.h
+index 97b517e..c6f993e 100644
+--- a/src/TerminalDisplay.h
++++ b/src/TerminalDisplay.h
+@@ -398,7 +398,17 @@ public:
+      * Sets the status of the BiDi rendering inside the terminal display.
+      * Defaults to disabled.
+      */
+-    void setBidiEnabled(bool set) { _bidiEnabled=set; }
++    void setBidiEnabled(bool set) {
++        _bidiEnabled=set;
++        // See bug 280896 for more info
++#if QT_VERSION >= 0x040800
++        if (_bidiEnabled) {
++            setLineSpacing(0);
++        } else {
++            setLineSpacing(2);
++        }
++#endif
++    }
+     /**
+      * Returns the status of the BiDi rendering in this widget.
+      */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/kde4-konsole/kde4-konsole.spec?r1=1.13&r2=1.14