rpms/kdepim/F-11 kdepim-4.3.2-ldapCompletionCrash.patch, 1.1, 1.2 kdepim.spec, 1.225, 1.226
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 23 17:26:47 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdepim/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8321
Modified Files:
kdepim-4.3.2-ldapCompletionCrash.patch kdepim.spec
Log Message:
* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
- respin ldap crasher patch (kdebug:206024, rhbz#524870)
kdepim-4.3.2-ldapCompletionCrash.patch:
addresseelineedit.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: kdepim-4.3.2-ldapCompletionCrash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim-4.3.2-ldapCompletionCrash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdepim-4.3.2-ldapCompletionCrash.patch 15 Sep 2009 14:33:57 -0000 1.1
+++ kdepim-4.3.2-ldapCompletionCrash.patch 23 Sep 2009 17:26:47 -0000 1.2
@@ -1,7 +1,6 @@
-Index: branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp
-===================================================================
---- branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp (revision 1019118)
-+++ branches/KDE/4.3/kdepim/libkdepim/addresseelineedit.cpp (revision 1019119)
+diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp
+--- libkdepim/addresseelineedit.cpp (revision 1019119)
++++ libkdepim/addresseelineedit.cpp (revision 1019358)
@@ -800,7 +800,7 @@
void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
@@ -11,3 +10,13 @@ Index: branches/KDE/4.3/kdepim/libkdepim
return;
}
+@@ -817,7 +817,8 @@
+ setText( m_previousAddresses + m_searchString );
+ // only complete again if the user didn't change the selection while
+ // we were waiting; otherwise the completion box will be closed
+- if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
++ QListWidgetItem *current = completionBox()->currentItem();
++ if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
+ doCompletion( m_lastSearchMode );
+ }
+ }
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-11/kdepim.spec,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- kdepim.spec 15 Sep 2009 14:33:57 -0000 1.225
+++ kdepim.spec 23 Sep 2009 17:26:47 -0000 1.226
@@ -6,7 +6,7 @@ Name: kdepim
Summary: PIM (Personal Information Manager) applications
Epoch: 6
Version: 4.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Productivity
@@ -20,6 +20,7 @@ Patch1: kdepim-4.3.1-kmail-saveAttachme
# http://websvn.kde.org/?view=rev&revision=1022964
Patch100: kdepim-4.3.2-imapMove.patch
# http://websvn.kde.org/?view=rev&revision=1019119
+# http://websvn.kde.org/?view=rev&revision=1019358
Patch101: kdepim-4.3.2-ldapCompletionCrash.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -101,7 +102,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%
%patch0 -p1 -b .libqgpgme-link-fix
%patch1 -p0 -b .kmail-saveAttachments
%patch100 -p4 -b .imapMove
-%patch101 -p4 -b .ldapCompletionCrash
+%patch101 -p0 -b .ldapCompletionCrash
%build
@@ -220,6 +221,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Sep 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.1-5
+- respin ldap crasher patch (kdebug:206024, rhbz#524870)
+
* Tue Sep 15 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.1-4
- fix crash when autocompleting LDAP address (kdebug:206024)
More information about the scm-commits
mailing list