fix for gcc-3.2

3 files changed, 105 insertions, 4 deletions

diff --git a/dev-util/kdestudio/ChangeLog b/dev-util/kdestudio/ChangeLog
index 09556cc1dbf8..0f41b1ba314b 100644
--- a/dev-util/kdestudio/ChangeLog
+++ b/dev-util/kdestudio/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/kdestudio
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdestudio/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdestudio/ChangeLog,v 1.2 2002/11/03 17:28:03 hannes Exp $
+
+  03 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdestudio-2.0.0-r2.ebuild,
+  files/kdestudio-2.0.0-gentoo.diff: fixes for gcc-3.2 (fix for #10068)
 
 *kdestudio-2.0.0-r2 (1 Feb 2002)
 
diff --git a/dev-util/kdestudio/files/kdestudio-2.0.0-gentoo.diff b/dev-util/kdestudio/files/kdestudio-2.0.0-gentoo.diff
new file mode 100644
index 000000000000..9117e5d7e46c
--- /dev/null
+++ b/dev-util/kdestudio/files/kdestudio-2.0.0-gentoo.diff
@@ -0,0 +1,98 @@
+--- Components/kwrite/highlight.h.orig	2000-08-21 16:47:50.000000000 +0200
++++ Components/kwrite/highlight.h	2002-11-03 17:00:47.000000000 +0100
+@@ -355,7 +355,7 @@
+ class KConfig;
+ 
+ class Highlight {
+-    friend HlManager;
++    friend struct HlManager;
+   public:
+     Highlight(const QString &name);
+     virtual ~Highlight();
+--- Components/kwrite/kwview.h.orig	2000-03-28 03:37:23.000000000 +0200
++++ Components/kwrite/kwview.h	2002-11-03 17:04:45.000000000 +0100
+@@ -19,8 +19,8 @@
+ 
+ class KWriteView : public QWidget
+ {Q_OBJECT
+-  friend KWriteDoc;
+-  friend KWrite;
++  friend struct KWriteDoc;
++  friend struct KWrite;
+ public:
+   KWriteView(KWrite *, KWriteDoc *);
+   ~KWriteView();
+@@ -106,4 +106,4 @@
+ };
+ 
+ 
+-#endif
+\ No newline at end of file
++#endif
+--- Components/studioui/checklistbox/checklistbox.cpp.orig	2000-09-25 19:26:36.000000000 +0200
++++ Components/studioui/checklistbox/checklistbox.cpp	2002-11-03 15:59:26.000000000 +0100
+@@ -203,7 +203,7 @@
+ 
+ /////////////////////////////////////////////////////////////////////////////////
+ 
+-CheckListBox::CheckListBox( QWidget * parent=0, const char * name=0, WFlags f=0 )
++CheckListBox::CheckListBox( QWidget * parent, const char * name, WFlags f )
+ :QWidget( parent,name,f )
+ {
+   layout = new QVBoxLayout( this );
+@@ -352,7 +352,7 @@
+   update();
+ }
+ 
+-void CheckListBoxItem::allowChecked( bool allow, bool def = false )
++void CheckListBoxItem::allowChecked( bool allow, bool def )
+ {
+   ch = def;
+   _allowCheck = allow;
+@@ -440,4 +440,4 @@
+       listBox->setCurrentItem( c );
+     }
+   }
+-}
+\ No newline at end of file
++}
+--- Components/studioui/checklistbox/checklistbox.h.orig	2000-08-26 19:51:37.000000000 +0200
++++ Components/studioui/checklistbox/checklistbox.h	2002-11-03 16:46:08.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ class CBHeader : public QFrame
+ {Q_OBJECT
+-friend CheckListBox;
++friend struct CheckListBox;
+ private slots:
+   void slotNewItem();
+   void slotDelItem();
+@@ -45,7 +45,7 @@
+ 
+ class CBLineEdit : public QLineEdit
+ {Q_OBJECT
+-friend CheckListBox;
++friend struct CheckListBox;
+ 
+   CBLineEdit( QWidget * parent=0, const char * name=0 );
+   ~CBLineEdit();
+@@ -60,7 +60,7 @@
+ 
+ class CheckListBoxItem : public QListBoxText
+ {
+-  friend CheckListBox;
++  friend struct CheckListBox;
+ public:
+   CheckListBoxItem( const char*, bool, CheckListBox* );
+   ~CheckListBoxItem();
+@@ -140,8 +140,8 @@
+ /*========================================================*/
+ class CheckListBox : public QWidget
+ {Q_OBJECT
+-  friend CheckListBoxItem;
+-  friend CBHeader;
++  friend class CheckListBoxItem;
++  friend class CBHeader;
+ public:
+   CheckListBox( QWidget * parent=0, const char * name=0, WFlags f=0 );
+   ~CheckListBox();
diff --git a/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild b/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
index 585513fc7ea2..5d1f94905b57 100644
--- a/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
+++ b/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild,v 1.7 2002/10/04 20:58:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdestudio/kdestudio-2.0.0-r2.ebuild,v 1.8 2002/11/03 17:28:03 hannes Exp $
 
+PATCHES="${FILESDIR}/${P}-gentoo.diff"
 inherit kde-base
-
+IUSE=""
 HOMEPAGE="http://www.thekompany.com/projects/kdestudio"
 DESCRIPTION="KDE 2.x IDE"
 SRC_URI="ftp://ftp.rygannon.com/pub/KDE_Studio/source/${P}.tar.gz"
 
 need-kde 2.1
 
-
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc sparc64"