diff options
| author |   Jonathan Callen <jcallen@gentoo.org> | 2009-12-12 09:29:11 +0000 |
|---|---|---|
| committer | Jonathan Callen <jcallen@gentoo.org> | 2009-12-12 09:29:11 +0000 |
| commit | 1842cde5ba89ed272cd397fb6f46f376c27ad979 (patch) | |
| tree | a85e822dda556e6494d658056940d7e8ff9c202c /kde-base | |
| parent | Version bump. Set SUPPORT_PYTHON_ABIS. (diff) | |
| download | historical-1842cde5ba89ed272cd397fb6f46f376c27ad979.tar.gz historical-1842cde5ba89ed272cd397fb6f46f376c27ad979.tar.bz2 historical-1842cde5ba89ed272cd397fb6f46f376c27ad979.zip | |
Drop old patch
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/libkdepim/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/libkdepim/Manifest | 3 | ||||
| -rw-r--r-- | kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff | 22 |
3 files changed, 6 insertions, 25 deletions
diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog index 845c5bba0b31..a52807d5735b 100644 --- a/kde-base/libkdepim/ChangeLog +++ b/kde-base/libkdepim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/libkdepim # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.145 2009/12/10 23:17:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.146 2009/12/12 09:29:10 abcd Exp $ + + 12 Dec 2009; Jonathan Callen <abcd@gentoo.org> + -files/libkdepim-4.3.1-ldap_crash.diff: + Drop old patch 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -libkdepim-4.3.1.ebuild, -libkdepim-4.3.1-r1.ebuild: diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest index d40cfa5122e3..201c7312e995 100644 --- a/kde-base/libkdepim/Manifest +++ b/kde-base/libkdepim/Manifest @@ -1,7 +1,6 @@ -AUX libkdepim-4.3.1-ldap_crash.diff 900 RMD160 147af66df800e0c64f4c5eec201ed8714dcf0b26 SHA1 666c66f04dee67abde417a4255cfaf688b66b865 SHA256 e8acb073df5fd83596a42e0eca068d765a0f0144cb45af47acfe52dff08a03c4 DIST kdepim-4.3.3.tar.bz2 11250414 RMD160 a8809be1ff6d6ae3f22d0f29124566793ed97aaa SHA1 8d467f7c652631c9955538e57ef846cdb5e8905c SHA256 3cb28e1e18efff48e1116598d7f832c00b07d76d35a925f7571fbe69f2c5b736 DIST kdepim-4.3.4.tar.bz2 11252861 RMD160 8c33c627357e70a44cf4d97a186002793e49c062 SHA1 3ddc34c2b0c96c0273431631ccf47a8b9b4289b3 SHA256 7f7723cf545668bf22330427f13aeed682384a41a8c619472914b971de8ec4e5 EBUILD libkdepim-4.3.3.ebuild 971 RMD160 1604202659d49a83800e7bcae6c74ef7dfa30a09 SHA1 91c05b80ec05b322af6ca21a8dfb2693fe3b989e SHA256 181ba77a5ed387f65aa4ff97784df2022aad4af1d592eb114684e0c6c386bc39 EBUILD libkdepim-4.3.4.ebuild 975 RMD160 000849d858319165521e53b62ba50a6b71ddc3f5 SHA1 aaff0b827b8478f4442f28a0b54fcd5992b81e9d SHA256 87b722115783ff0981740c970e3ea68dee32b56c53a9bc4fd7a4db1b9d216126 -MISC ChangeLog 18385 RMD160 b2cf4e76068bab6d5494f5be8d221c68901e13f3 SHA1 395c57fb3c69ca95f3d4754abea598210bc79531 SHA256 1eca119ba4acd9b2602faedd24010382f44c5f609de4b1bf0b7f71c79b222952 +MISC ChangeLog 18489 RMD160 72a4d20ebe52f8e3f7c91fd0e22e10a91f2709bb SHA1 9acc9368dffd4f686d0e769bdaf573694efec4e7 SHA256 f298afb987283dabcc7571d080545083254664a342c196e4dcab46581e0a12c3 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff deleted file mode 100644 index a3092f058762..000000000000 --- a/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff +++ /dev/null @@ -1,22 +0,0 @@ -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 ) - { -- if ( s_LDAPLineEdit != this ) { -+ if ( adrs.isEmpty() || s_LDAPLineEdit != this ) { - 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 ); - } - } |