- rel 2; small fixes from git

diff --git a/kde4-konsole.spec b/kde4-konsole.spec
index f31542ada23e5a12469a60e430cb2b03e988ec25..3585d22322ba7973dd0b3fc38edecb7fd0e7697c 100644 (file)
--- a/kde4-konsole.spec
+++ b/kde4-konsole.spec
@@ -10,12 +10,13 @@ Summary:    K Desktop Environment - KDE Terminal Emulator
 Summary(pl.UTF-8):     K Desktop Environment - Emulator terminala dla KDE
 Name:          kde4-konsole
 Version:       4.14.3
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       http://download.kde.org/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
 # Source0-md5: 1c81a9a2c073f7992671e168b7285a2a
 Patch0:                konsole-wordchars.patch
+Patch1:                konsole-git.patch
 URL:           http://www.kde.org/
 BuildRequires: kde4-kdebase-devel >= %{version}
 BuildRequires: kde4-kdebase-workspace-devel >= %{kdeworkspacever}
@@ -37,6 +38,7 @@ Emulator terminala dla KDE.
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build

diff --git a/konsole-git.patch b/konsole-git.patch
new file mode 100644 (file)
index 0000000..735f372
--- /dev/null
+++ b/konsole-git.patch
@@ -0,0 +1,58 @@
+From: Casian Andrei <skeletk13@gmail.com>
+Date: Mon, 21 Jul 2014 13:50:38 +0000
+Subject: Issue a warning when not matching a font exactly
+X-Git-Url: http://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=e6fa0276a55cb915adb2e1c0e43879d8b8c14d65
+---
+Issue a warning when not matching a font exactly
+
+When setting a font for the terminal, if it is not found properly by the
+system, Qt attempts to use another font which is not an exact match. It
+happens that the other font is not fixed-pitch, so konsole ends up using
+an unsupported variable-pitch font for the terminal.
+
+Place a warning when an exact match for the desired font has not been
+found.
+---
+
+
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -208,6 +208,10 @@
+     QFont font = f;
+ 
+     QFontMetrics metrics(font);
++
++    if (!QFontInfo(font).exactMatch()) {
++        kWarning() << "The font for use in the terminal has not been matched exactly. Perhaps it has not been found properly.";
++    }
+ 
+     if (!QFontInfo(font).fixedPitch()) {
+         kWarning() << "Using an unsupported variable-width font in the terminal.  This may produce display errors.";
+
+From: Feng Chao <chaofeng111@gmail.com>
+Date: Sun, 03 Aug 2014 13:18:52 +0000
+Subject: Fix Bug 318453 - Blinking cursor of "fullwidth" character are "halfwidth"
+X-Git-Url: http://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=5fd1276b8d024a5a2670ff60753c9760a2ff7ca7
+---
+Fix Bug 318453 - Blinking cursor of "fullwidth" character are "halfwidth"
+
+Calculate the character width at current blinking cursor.
+
+BUG: 318453
+---
+
+
+--- a/src/TerminalDisplay.cpp
++++ b/src/TerminalDisplay.cpp
+@@ -1600,7 +1600,9 @@
+ 
+ void TerminalDisplay::updateCursor()
+ {
+-    QRect cursorRect = imageToWidget(QRect(cursorPosition(), QSize(1, 1)));
++    int cursorLocation = loc(cursorPosition().x(), cursorPosition().y());
++    int charWidth = konsole_wcwidth(_image[cursorLocation].character);
++    QRect cursorRect = imageToWidget(QRect(cursorPosition(), QSize(charWidth, 1)));
+     update(cursorRect);
+ }
+ 
+