Make it build with gcc33

4 files changed, 47 insertions, 10 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 4210c813955a..c7eb7ad25003 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.33 2003/07/29 12:44:28 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.34 2003/08/07 02:57:42 caleb Exp $
+
+  06 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.1.3.ebuild:
+  Minor fix for gcc33 builds.
 
 *kdeutils-3.1.3 (29 Jul 2003)
 
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index e2441400b9a5..31e4c3f67831 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,15 +1,16 @@
-MD5 b5334de8f5d54d7739f12ef0e5d6ede5 ChangeLog 4166
-MD5 2b0be834a411b15eca52adc202186197 kdeutils-2.2.2-r1.ebuild 528
-MD5 bb14ef05b7474da665a5513965a9e588 kdeutils-3.0.4.ebuild 315
 MD5 eb21fe1f52ed4791beecff90ffd069fb kdeutils-3.0.5b.ebuild 325
-MD5 4a09fb92aeb1c2a7e42bf1c74424e151 kdeutils-3.1.1.ebuild 372
+MD5 0674e1ac6acfc987098c08ac7d6eac04 kdeutils-3.1.3.ebuild 431
+MD5 bb14ef05b7474da665a5513965a9e588 kdeutils-3.0.4.ebuild 315
 MD5 a2a326a090b2e21c4da7a16f6c6c560e kdeutils-3.1.2.ebuild 377
+MD5 2b0be834a411b15eca52adc202186197 kdeutils-2.2.2-r1.ebuild 528
+MD5 4058ab995777a2fe107e295c8390899f ChangeLog 4266
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 5eae768aea887fa18c5d6337a5bfa814 kdeutils-3.1.3.ebuild 364
-MD5 833411a8feba0e3dca65b52e228b0cf8 files/digest-kdeutils-2.2.2-r1 136
+MD5 4a09fb92aeb1c2a7e42bf1c74424e151 kdeutils-3.1.1.ebuild 372
 MD5 91b4ffe4f39481359ec0f0dbd0b044dc files/digest-kdeutils-3.0.4 68
-MD5 c94af5761c9b62565499475ce2371863 files/digest-kdeutils-3.0.5b 69
 MD5 f3aa73cde1897347bab9a94d797283ce files/digest-kdeutils-3.1.1 68
 MD5 996bc767855133331ee78819ea0e611b files/digest-kdeutils-3.1.2 68
-MD5 e02290749430420019b24b468f03dace files/kdeutils-2.2.2-gentoo.diff 857
 MD5 32a9878dea888a76ba12026c256bb428 files/digest-kdeutils-3.1.3 68
+MD5 833411a8feba0e3dca65b52e228b0cf8 files/digest-kdeutils-2.2.2-r1 136
+MD5 c94af5761c9b62565499475ce2371863 files/digest-kdeutils-3.0.5b 69
+MD5 e02290749430420019b24b468f03dace files/kdeutils-2.2.2-gentoo.diff 857
+MD5 f40236226b4aa977b63c01bf7097eacf files/kdeutils-3.1.3-gcc33.diff 749
diff --git a/kde-base/kdeutils/files/kdeutils-3.1.3-gcc33.diff b/kde-base/kdeutils/files/kdeutils-3.1.3-gcc33.diff
new file mode 100644
index 000000000000..ffb0acf0ab0d
--- /dev/null
+++ b/kde-base/kdeutils/files/kdeutils-3.1.3-gcc33.diff
@@ -0,0 +1,27 @@
+diff -urN klaptopdaemon/linux/cistpl.h klaptopdaemon/linux/cistpl.h
+--- klaptopdaemon/linux/cistpl.h	2001-03-16 09:29:21.000000000 -0300
++++ klaptopdaemon/linux/cistpl.h	2003-08-05 04:48:49.000000000 -0300
+@@ -161,7 +161,6 @@
+ 
+ typedef struct cistpl_funce_t {
+     u_char	type;
+-    u_char	data[0];
+ } cistpl_funce_t;
+ 
+ /*======================================================================
+@@ -226,7 +225,6 @@
+     u_char	escape;
+     u_char	encrypt;
+     u_char	misc_features;
+-    u_char	ccitt_code[0];
+ } cistpl_data_serv_t;
+ 
+ typedef struct cistpl_fax_serv_t {
+@@ -236,7 +234,6 @@
+     u_char	encrypt;
+     u_char	features_0;
+     u_char	features_1;
+-    u_char	ccitt_code[0];
+ } cistpl_fax_serv_t;
+ 
+ typedef struct cistpl_voice_serv_t {
diff --git a/kde-base/kdeutils/kdeutils-3.1.3.ebuild b/kde-base/kdeutils/kdeutils-3.1.3.ebuild
index 7b8f7e151f12..2dcedbd2b64f 100644
--- a/kde-base/kdeutils/kdeutils-3.1.3.ebuild
+++ b/kde-base/kdeutils/kdeutils-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/kdeutils/kdeutils-3.1.3.ebuild,v 1.2 2003/08/06 13:05:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.1.3.ebuild,v 1.3 2003/08/07 02:57:42 caleb Exp $
 inherit kde-dist 
 
 IUSE=""
@@ -8,3 +8,9 @@ DESCRIPTION="KDE utilities"
 
 #RDEPEND="$RDEPEND app-admin/dosfstools" # for kfloppy
 KEYWORDS="~x86 ~ppc"
+
+src_unpack()
+{
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc33.diff
+}