diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-02-21 15:55:09 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-02-21 15:55:09 +0000 |
| commit | cd36c5491eb7b4164c27701fb2992c3cc23e8d1c (patch) | |
| tree | 1c0f6bd55365cfadaa80ce5df8770dbd72475510 /kde-base | |
| parent | Sign Manfiest (diff) | |
| download | gentoo-2-cd36c5491eb7b4164c27701fb2992c3cc23e8d1c.tar.gz gentoo-2-cd36c5491eb7b4164c27701fb2992c3cc23e8d1c.tar.bz2 gentoo-2-cd36c5491eb7b4164c27701fb2992c3cc23e8d1c.zip | |
Fix compilation with USE="kdeenablefinal", bug 210954.
(Portage version: 2.1.4.4)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/certmanager/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/certmanager/certmanager-3.5.9.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/certmanager/files/certmanager-3.5.9-no-kdeenablefinal.patch | 27 |
3 files changed, 36 insertions, 2 deletions
diff --git a/kde-base/certmanager/ChangeLog b/kde-base/certmanager/ChangeLog index 61a2a2c4b1d8..0e6d5a70fe5d 100644 --- a/kde-base/certmanager/ChangeLog +++ b/kde-base/certmanager/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/certmanager # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.95 2008/02/20 22:31:25 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.96 2008/02/21 15:55:08 ingmar Exp $ + + 21 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> + +files/certmanager-3.5.9-no-kdeenablefinal.patch, + certmanager-3.5.9.ebuild: + Fix compilation with USE="kdeenablefinal", bug 210954. *certmanager-3.5.9 (20 Feb 2008) diff --git a/kde-base/certmanager/certmanager-3.5.9.ebuild b/kde-base/certmanager/certmanager-3.5.9.ebuild index a49ec1bffce8..9bc9c6c8f0d4 100644 --- a/kde-base/certmanager/certmanager-3.5.9.ebuild +++ b/kde-base/certmanager/certmanager-3.5.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.9.ebuild,v 1.1 2008/02/20 22:31:25 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.9.ebuild,v 1.2 2008/02/21 15:55:08 ingmar Exp $ KMNAME=kdepim EAPI="1" @@ -26,6 +26,8 @@ KMEXTRACTONLY="libkdenetwork/ KMEXTRA="doc/kleopatra doc/kwatchgnupg" +PATCHES="${FILESDIR}/${P}-no-kdeenablefinal.patch" + src_compile() { myconf="--with-gpg=/usr/bin/gpg" kde_src_compile diff --git a/kde-base/certmanager/files/certmanager-3.5.9-no-kdeenablefinal.patch b/kde-base/certmanager/files/certmanager-3.5.9-no-kdeenablefinal.patch new file mode 100644 index 000000000000..42da6b933055 --- /dev/null +++ b/kde-base/certmanager/files/certmanager-3.5.9-no-kdeenablefinal.patch @@ -0,0 +1,27 @@ +Fix kdepim/certmanager compilation with --enable-final, + Ingmar Vanhassel <ingmar@gentoo.org> + +diff -Naur kdepim-3.5.9.orig/certmanager/lib/cryptplug.h kdepim-3.5.9/certmanager/lib/cryptplug.h +--- kdepim-3.5.9.orig/certmanager/lib/cryptplug.h 2005-09-10 10:23:51.000000000 +0200 ++++ kdepim-3.5.9/certmanager/lib/cryptplug.h 2008-02-21 15:38:24.000000000 +0100 +@@ -408,7 +408,7 @@ + \note This function <b>must</b> be implemented by each plug-in using + this API specification. + */ +-bool hasFeature( Feature ); ++bool hasFeature( ::Feature ); + + /*! \ingroup groupSignCryptAct + \brief Information record returned by signing and by encrypting +diff -Naur kdepim-3.5.9.orig/certmanager/lib/cryptplugwrapper.h kdepim-3.5.9/certmanager/lib/cryptplugwrapper.h +--- kdepim-3.5.9.orig/certmanager/lib/cryptplugwrapper.h 2008-02-13 10:39:29.000000000 +0100 ++++ kdepim-3.5.9/certmanager/lib/cryptplugwrapper.h 2008-02-21 16:17:41.000000000 +0100 +@@ -718,7 +718,7 @@ + + \return whether the relative feature is implemented or not + */ +- bool hasFeature( Feature ); ++ bool hasFeature( ::Feature ); + + + /* \ingroup groupSignAct |