[SCM] Konversation packaging for Debian branch, master, updated. debian/1.3.1-2

Modestas Vainius modax at alioth.debian.org
Tue Sep 28 21:49:04 UTC 2010


The following commit has been merged in the master branch:
commit 04cd20e49f661dcd8867dbb2f2fd2f45d6be150c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Sep 29 00:05:46 2010 +0300

    Backport a patch to fix "disappearing cursor" bug.
    
    0001-Work-around-bug-217592-the-infamous-cursor-disappear.patch fixes a very
    annoying "disappearing cursor" bug. It happens rather rarely but when it does,
    konversation becomes nearly unusable. The only way out is restart of the
    application.
---
 debian/changelog                                   |    4 ++
 ...-bug-217592-the-infamous-cursor-disappear.patch |   34 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1dd53c2..ab8bf75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 konversation (1.3.1-2) UNRELEASED; urgency=low
 
+  * Backport 0001-Work-around-bug-217592-the-infamous-cursor-disappear.patch
+    from upstream in order to fix a very annoying "disappearing cursor" bug.
+    It happens rather rarely but when it does, konversation becomes nearly
+    unusable. The only way out is restart of the application.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 28 Sep 2010 23:59:34 +0300
 
diff --git a/debian/patches/0001-Work-around-bug-217592-the-infamous-cursor-disappear.patch b/debian/patches/0001-Work-around-bug-217592-the-infamous-cursor-disappear.patch
new file mode 100644
index 0000000..a990045
--- /dev/null
+++ b/debian/patches/0001-Work-around-bug-217592-the-infamous-cursor-disappear.patch
@@ -0,0 +1,34 @@
+From: Eike Hein <hein at kde.org>
+Last-Update: Mon, 20 Sep 2010 12:35:44 +0200
+Origin: backport commit:0a5bc983c817c24783b9578b0ed236bc3a9c3645
+Subject: [PATCH] Work around bug 217592 (the infamous cursor disappearing act).
+
+The underlying ongoings are that there are two widgets involved,
+the KTextEdit and it's viewport(), both of which KCursor installs
+an event filter on, which on keypress events sets a blank cursor
+on the KTextEdit. On a FocusOut event, such as occurs when the
+paste warning KMessageBox is spawned and assumes focus, KCursor
+then calls unsetCursor() on it. Qt's behavior however seems to
+have changed in such a way that unsetCursor() doesn't affect the
+KTextEdit's viewport(), which QTextEdit originally set the I-Beam
+cursor on. So we do it manually here. But in the end either the
+Qt behavioral change has to be addressed, or KCursor has to be
+equipped to deal with it, since this obviously can happen in all
+KDE apps (and does, as seen in bug 231177).
+CCBUG:217592
+---
+ src/viewer/ircinput.cpp |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+--- a/src/viewer/ircinput.cpp
++++ b/src/viewer/ircinput.cpp
+@@ -505,6 +505,9 @@ bool IRCInput::checkPaste(QString& text)
+         QString bytesString = i18np("1 byte", "%1 bytes", text.length());
+         QString linesString = i18np("1 line", "%1 lines", lines+1);
+ 
++        // Work around bug 217592.
++        viewport()->setCursor(Qt::IBeamCursor);
++
+         doPaste=KMessageBox::warningYesNoCancel
+             (this,
+             i18nc(
diff --git a/debian/patches/series b/debian/patches/series
index 67ce773..17af29e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001-Work-around-bug-217592-the-infamous-cursor-disappear.patch
 debian_dbug_autoreplace.diff
 debian_channel.diff

-- 
Konversation packaging for Debian



More information about the pkg-kde-commits mailing list