diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:07:46 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:07:46 +0000 |
| commit | 2d34be559bbdd5db4608521a05df287e186dfb25 (patch) | |
| tree | 5b4e753fdfa498f974a48dfeacd9b2536f22b1f2 /kde-base/libkpgp | |
| parent | x86 stable wrt bug 165415 (diff) | |
| download | gentoo-2-2d34be559bbdd5db4608521a05df287e186dfb25.tar.gz gentoo-2-2d34be559bbdd5db4608521a05df287e186dfb25.tar.bz2 gentoo-2-2d34be559bbdd5db4608521a05df287e186dfb25.zip | |
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base/libkpgp')
| -rw-r--r-- | kde-base/libkpgp/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff | 47 |
2 files changed, 5 insertions, 48 deletions
diff --git a/kde-base/libkpgp/ChangeLog b/kde-base/libkpgp/ChangeLog index 215b47cc755a..a5d9a0b1e34b 100644 --- a/kde-base/libkpgp/ChangeLog +++ b/kde-base/libkpgp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/libkpgp # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.53 2007/02/04 03:13:10 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.54 2007/02/05 12:07:46 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/libkpgp-3.5.0-fixes.diff: + Remove unneeded patches. 04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -libkpgp-3.5.0-r1.ebuild: diff --git a/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff b/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff deleted file mode 100644 index 85d5008f4c41..000000000000 --- a/kde-base/libkpgp/files/libkpgp-3.5.0-fixes.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- kdepim/libkpgp/kpgpbase2.cpp 2005/07/26 18:54:59 438982 -+++ kdepim/libkpgp/kpgpbase2.cpp 2006/04/15 12:39:26 530112 -@@ -863,9 +863,9 @@ - validity = KPGP_VALIDITY_FULL; - else if( !strncmp( str.data() + index+21, "marginal", 8 ) ) - validity = KPGP_VALIDITY_MARGINAL; -- else if( !strncmp( str.data() + index+21, "never", 8 ) ) -+ else if( !strncmp( str.data() + index+21, "never", 5 ) ) - validity = KPGP_VALIDITY_NEVER; -- else if( !strncmp( str.data() + index+21, "undefined", 8 ) ) -+ else if( !strncmp( str.data() + index+21, "undefined", 9 ) ) - validity = KPGP_VALIDITY_UNDEFINED; - - // determine the user ID ---- kdepim/libkpgp/kpgpbase6.cpp 2005/07/26 18:54:59 438982 -+++ kdepim/libkpgp/kpgpbase6.cpp 2006/04/15 12:39:26 530112 -@@ -634,8 +634,8 @@ - } - } - // store the global key capabilities -- canSign |= sign; -- canEncr |= encr; -+ canSign = canSign || sign; -+ canEncr = canEncr || encr; - } - else if( !strncmp( output.data() + offset, "Unknown type", 12 ) ) - { // line contains key data of unknown type (ignored) ---- kdepim/libkpgp/kpgpui.cpp 2005/07/26 18:54:59 438982 -+++ kdepim/libkpgp/kpgpui.cpp 2006/04/15 12:39:26 530112 -@@ -985,7 +985,7 @@ - kdDebug(5100) << "Selected keys: " << newKeyIdList.toStringList().join(", ") << endl; - mKeyIds = newKeyIdList; - if( !keysToBeChecked.isEmpty() ) { -- keysAllowed &= checkKeys( keysToBeChecked ); -+ keysAllowed = keysAllowed && checkKeys( keysToBeChecked ); - } - enableButtonOK( keysAllowed ); - -@@ -1016,7 +1016,7 @@ - pProgressDlg->setLabel( i18n("Checking key 0x%1...") - .arg( getKeyId( *it ) ) ); - kapp->processEvents(); -- keysAllowed &= ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); -+ keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) ); - pProgressDlg->progressBar()->advance( 1 ); - kapp->processEvents(); - } |