Fix compilation issue

4 files changed, 34 insertions, 12 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index e7192d2cc202..3202da38b99a 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.44 2003/08/30 10:19:25 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.45 2003/09/01 22:01:07 caleb Exp $
+
+  01 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.1.3.ebuild:
+  Add patch from bug #26022
 
   30 Aug 2003; Alastair Tse <liquidx@gentoo.org> kdepim-2.2.2-r1.ebuild,
   kdepim-3.0.4.ebuild, kdepim-3.0.5b.ebuild, kdepim-3.1.1.ebuild,
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index aabad24aa462..09ab798e1c7c 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,19 +1,20 @@
-MD5 c8fbeceacbf58c99e0c9f197bdfbd6bb ChangeLog 5937
-MD5 c73ee51f1fdcc1139fb4934ac8f78b1d kdepim-2.2.2-r1.ebuild 700
 MD5 a354060b9af1f8b8d8705c003fc976ee kdepim-3.0.4.ebuild 569
-MD5 7eefe33e5fa8de798421ee125378d399 kdepim-3.0.5b.ebuild 577
-MD5 5d17887d7ec0aed9637a83feaf998597 kdepim-3.1.1.ebuild 750
-MD5 2777f1b091947e7da4619d7ecb04d301 kdepim-3.1.2-r1.ebuild 1027
 MD5 22608c3eda8ec8934110a49aea4666a3 kdepim-3.1.2.ebuild 748
-MD5 b0a02bbfe7482379ddb0509c304bf580 kdepim-3.1.3.ebuild 855
+MD5 2777f1b091947e7da4619d7ecb04d301 kdepim-3.1.2-r1.ebuild 1027
+MD5 5d17887d7ec0aed9637a83feaf998597 kdepim-3.1.1.ebuild 750
+MD5 c73ee51f1fdcc1139fb4934ac8f78b1d kdepim-2.2.2-r1.ebuild 700
+MD5 126e36872bee8ab72cb5791f229ad348 ChangeLog 6032
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 25b7171189f4ffbf21eb256a43758295 files/digest-kdepim-2.2.2-r1 66
+MD5 a5c7e9289d5fa4e10a3e307d7538dc3c kdepim-3.1.3.ebuild 924
+MD5 7eefe33e5fa8de798421ee125378d399 kdepim-3.0.5b.ebuild 577
 MD5 ce5fa57255f8b647438149e6fc6c0cd0 files/digest-kdepim-3.0.4 66
-MD5 d833726815dce86df6d79630ceeecfdc files/digest-kdepim-3.0.5b 67
 MD5 d4b7a2d165d35d1c82d4b79713209870 files/digest-kdepim-3.1.1 66
 MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2 66
-MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2-r1 66
 MD5 0416c7d10d9725d1fa0e87794660f3dd files/digest-kdepim-3.1.3 66
+MD5 d833726815dce86df6d79630ceeecfdc files/digest-kdepim-3.0.5b 67
+MD5 b6096c1f83c6be572d1fe8fa91bd9d83 files/post-2.2.2-kdepim.diff 7037
 MD5 9531924495b374de9fc7acf45105c3d7 files/kdepim-2.2.2-gentoo.diff 1054
 MD5 c13bf6597f7d7edba5e3cdc29efcae2a files/kdepim-3.1.2-libmal-support.diff 1134
-MD5 b6096c1f83c6be572d1fe8fa91bd9d83 files/post-2.2.2-kdepim.diff 7037
+MD5 d870663d465fa52954057d4e4edca9ba files/digest-kdepim-3.1.2-r1 66
+MD5 59c7b887af9f082914f0e5537bd7c5ce files/kdepim-3.1.3-gcc33.diff 602
+MD5 25b7171189f4ffbf21eb256a43758295 files/digest-kdepim-2.2.2-r1 66
diff --git a/kde-base/kdepim/files/kdepim-3.1.3-gcc33.diff b/kde-base/kdepim/files/kdepim-3.1.3-gcc33.diff
new file mode 100644
index 000000000000..0db7bdaf8980
--- /dev/null
+++ b/kde-base/kdepim/files/kdepim-3.1.3-gcc33.diff
@@ -0,0 +1,12 @@
+diff -urN libkpimexchange/core/exchangeaccount.cpp libkpimexchange/core/exchangeaccount.cpp
+--- libkpimexchange/core/exchangeaccount.cpp	2003-05-07 08:48:01.000000000 -0300
++++ libkpimexchange/core/exchangeaccount.cpp	2003-08-05 04:56:21.000000000 -0300
+@@ -255,7 +255,7 @@
+   return result;
+ }
+   
+-static QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
++QString ExchangeAccount::tryMailbox( const QString& _url, const QString& user, const QString& password ) {
+   KURL url = KURL( _url );
+   url.setUser( user );
+   url.setPass( password );
diff --git a/kde-base/kdepim/kdepim-3.1.3.ebuild b/kde-base/kdepim/kdepim-3.1.3.ebuild
index c79f20110ca4..f024368f8e31 100644
--- a/kde-base/kdepim/kdepim-3.1.3.ebuild
+++ b/kde-base/kdepim/kdepim-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.1.3.ebuild,v 1.5 2003/08/30 10:19:25 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.1.3.ebuild,v 1.6 2003/09/01 22:01:07 caleb Exp $
 inherit kde-dist 
 
 IUSE="pda"
@@ -17,6 +17,12 @@ use pda && myconf="$myconf --with-extra-includes=/usr/include/libpisock"
 
 # reported by doctomoe on ppc
 MAKEOPTS="$MAKEOPTS -j1"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc33.diff
+}
+
 src_compile() {
 	kde_src_compile myconf configure
 	kde_src_compile make