fix for kdeenablefinal

Package-Manager: portage-2.0.52-r1

4 files changed, 47 insertions, 13 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/Manifest b/kde-base/kmail/Manifest
index 8680c430537f..7924b09737a0 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0517daa346612e50e60119680a33a3da kmail-3.4.2.ebuild 1629
-MD5 564fcd1548c0095b5b16c323d11b7005 ChangeLog 3428
-MD5 aa82a9cf16faab980f09bd8763b742d1 kmail-3.4.1.ebuild 1610
+MD5 03cd0d1b2f5ecd1b5c9421b839e22471 ChangeLog 3605
 MD5 b9964e02eff2a443f6299bb15de581b4 kmail-3.4.1-r1.ebuild 1674
-MD5 393bf626aee24f4dd500ca341e1d314c kmail-3.4.2-r1.ebuild 1856
-MD5 d88af05e23358492de23336d360905c6 kmail-3.5_alpha1.ebuild 1702
+MD5 aa82a9cf16faab980f09bd8763b742d1 kmail-3.4.1.ebuild 1610
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 393bf626aee24f4dd500ca341e1d314c kmail-3.4.2-r1.ebuild 1856
+MD5 0517daa346612e50e60119680a33a3da kmail-3.4.2.ebuild 1629
+MD5 9dc7662fdefced208875f16950961b9a kmail-3.5_alpha1.ebuild 1762
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1-r1 208
 MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2 282
 MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2-r1 282
-MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208
-MD5 2943bf542accb5d027810434e6cebe1d files/digest-kmail-3.5_alpha1 68
 MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756
-MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2 282
+MD5 2943bf542accb5d027810434e6cebe1d files/digest-kmail-3.5_alpha1 68
+MD5 5c8908dca1e2acb4ba2df3455255bdc7 files/kmail-3.5_alpha1-kdeenablefinal-fix.diff 798
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHtddj5H05b2HAEkRAr7hAJ41no7hHWjRQiWSvDmDwbYEeSfoVACgngtI
-eLrRWLrpKwHcsdb11h5e17Y=
-=1jKD
+iD8DBQFDJrKTr2QksT29OyARAiIkAJwOLFbSkCQRCsPZGqFs6B+IteZpLACdH+iN
+BWjQJDBq/SbXW8dYyDVg4hA=
+=dBCM
 -----END PGP SIGNATURE-----
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"