rpms/konversation/F-12 konversation-1.2.1-kdebug215256.patch, NONE, 1.1 konversation.spec, 1.38, 1.39

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/konversation/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29835

Modified Files:
	konversation.spec 
Added Files:
	konversation-1.2.1-kdebug215256.patch 
Log Message:
* Wed Feb 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-3
- test out qt46/cpu/fonts patch (kde#215256)


konversation-1.2.1-kdebug215256.patch:
 ircview.cpp |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE konversation-1.2.1-kdebug215256.patch ---
diff -up konversation-1.2.1/src/viewer/ircview.cpp.kdebug215256 konversation-1.2.1/src/viewer/ircview.cpp
--- konversation-1.2.1/src/viewer/ircview.cpp.kdebug215256	2009-11-11 23:24:44.000000000 -0600
+++ konversation-1.2.1/src/viewer/ircview.cpp	2010-02-03 12:32:37.269567059 -0600
@@ -207,6 +207,11 @@ IRCView::IRCView(QWidget* parent, Server
     setServer(newServer);
 
     if (Preferences::self()->useParagraphSpacing()) enableParagraphSpacing();
+
+    //HACK to workaround an issue with the QTextDocument
+    //doing a relayout/scrollbar over and over resulting in 100%
+    //proc usage. See bug 215256
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 }
 
 IRCView::~IRCView()


Index: konversation.spec
===================================================================
RCS file: /cvs/pkgs/rpms/konversation/F-12/konversation.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- konversation.spec	12 Nov 2009 12:58:12 -0000	1.38
+++ konversation.spec	3 Feb 2010 18:36:05 -0000	1.39
@@ -1,7 +1,7 @@
 
 Name:           konversation
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        A user friendly IRC client
 
 Group:          Applications/Internet
@@ -10,6 +10,10 @@ URL:            http://konversation.kde.
 Source0:        ftp://ftp.kde.org/pub/kde/stable/konversation/%{version}/src/konversation-%{version}%{?pre:-%{pre}}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=215256#c19
+Patch100: konversation-1.2.1-kdebug215256.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
@@ -18,8 +22,7 @@ BuildRequires:  libXScrnSaver-devel
 BuildRequires:  phonon-devel
 BuildRequires:  qca2-devel
 
-%global kde4_version %((kde4-config --version 2>/dev/null || echo "KDE 4.3.0") | grep ^KDE | cut -d' ' -f2)
-Requires: kdelibs4 >= %{kde4_version}
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
 
 %description
 A simple and easy to use IRC client with support for
@@ -32,6 +35,8 @@ to chat windows; configurable background
 %prep
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
+%patch100 -p1 -b .kdebug215256
+
 
 %build
 mkdir -p %{_target_platform}
@@ -86,6 +91,12 @@ fi
 
 
 %changelog
+* Wed Feb 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-3
+- test out qt46/cpu/fonts patch (kde#215256)
+
+* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-2
+- use %%{_kde4_version}
+
 * Thu Nov 12 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.1-1
 - konversation-1.2.1