diff options
| author |   Hanno Böck <hanno@gentoo.org> | 2005-09-13 11:04:32 +0000 |
|---|---|---|
| committer | Hanno Böck <hanno@gentoo.org> | 2005-09-13 11:04:32 +0000 |
| commit | 8998c0d021036353e5f640a7db5d15f1e75ebd3a (patch) | |
| tree | 8a5e7284f0034458d64605a15d2aa14ac33ea611 /kde-base | |
| parent | Added some magic sed to remove unneeded SYSTEM variable from Makefile, fixing... (diff) | |
| download | gentoo-2-8998c0d021036353e5f640a7db5d15f1e75ebd3a.tar.gz gentoo-2-8998c0d021036353e5f640a7db5d15f1e75ebd3a.tar.bz2 gentoo-2-8998c0d021036353e5f640a7db5d15f1e75ebd3a.zip | |
fix for kdeenablefinal
(Portage version: 2.0.52-r1)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kmail/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kmail/files/kmail-3.5_alpha1-kdeenablefinal-fix.diff | 27 | ||||
| -rw-r--r-- | kde-base/kmail/kmail-3.5_alpha1.ebuild | 4 |
3 files changed, 35 insertions, 2 deletions
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog index 210b6d7c3f20..1fb4578ae5bc 100644 --- a/kde-base/kmail/ChangeLog +++ b/kde-base/kmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kmail # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.24 2005/09/07 12:04:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.25 2005/09/13 11:04:32 hanno Exp $ + + 13 Sep 2005; Hanno Boeck <hanno@gentoo.org> + +files/kmail-3.5_alpha1-kdeenablefinal-fix.diff, kmail-3.5_alpha1.ebuild: + Fix for compilation with kdeenablefinal (from kde svn). *kmail-3.5_alpha1 (07 Sep 2005) diff --git a/kde-base/kmail/files/kmail-3.5_alpha1-kdeenablefinal-fix.diff b/kde-base/kmail/files/kmail-3.5_alpha1-kdeenablefinal-fix.diff new file mode 100644 index 000000000000..df3bce8e301e --- /dev/null +++ b/kde-base/kmail/files/kmail-3.5_alpha1-kdeenablefinal-fix.diff @@ -0,0 +1,27 @@ +--- branches/KDE/3.5/kdepim/kmail/kmmainwidget.h 2005/08/08 12:07:57 444016 ++++ branches/KDE/3.5/kdepim/kmail/kmmainwidget.h 2005/09/13 07:39:47 460258 +@@ -51,7 +51,6 @@ + class KMMessage; + class KMFolder; + class KMAccount; +-class SearchWindow; + class KMSystemTray; + class KMHeaders; + +@@ -68,6 +67,7 @@ + class SieveDebugDialog; + class FolderJob; + class HeaderListQuickSearch; ++ class SearchWindow; + } + + typedef QMap<int,KMFolder*> KMMenuToFolder; +@@ -467,7 +467,7 @@ + mFolderThreadSubjPref, mReaderWindowActive, mReaderWindowBelow; + + // QPopupMenu *mMessageMenu; +- SearchWindow *mSearchWin; ++ KMail::SearchWindow *mSearchWin; + + KAction *mModifyFolderAction, *mRemoveFolderAction, *mExpireFolderAction, + *mCompactFolderAction, *mRefreshFolderAction, *mEmptyFolderAction, diff --git a/kde-base/kmail/kmail-3.5_alpha1.ebuild b/kde-base/kmail/kmail-3.5_alpha1.ebuild index adbb03a151ed..70af6b80c105 100644 --- a/kde-base/kmail/kmail-3.5_alpha1.ebuild +++ b/kde-base/kmail/kmail-3.5_alpha1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5_alpha1.ebuild,v 1.1 2005/09/07 12:04:18 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5_alpha1.ebuild,v 1.2 2005/09/13 11:04:32 hanno Exp $ KMNAME=kdepim MAXKDEVER=$PV @@ -52,3 +52,5 @@ KMCOMPILEONLY="libemailfunctions" KMEXTRA=" plugins/kmail/ kontact/plugins/kmail/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps. + +PATCHES="${FILESDIR}/kmail-3.5_alpha1-kdeenablefinal-fix.diff" |