GCC 3.4 compile fix

6 files changed, 171 insertions, 4 deletions

diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index 13d21c63e5b3..f9d8b991efb2 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeedu
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.69 2004/04/21 01:40:23 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.70 2004/04/27 00:51:52 caleb Exp $
+
+  26 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdeedu-3.2.2-gcc34-compile.patch:
+  GCC 3.4 compile fix
 
   20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdeedu-3.0.5b.ebuild:
   Remove old version
diff --git a/kde-base/kdeedu/files/kdeedu-3.2.2-gcc34-compile.patch b/kde-base/kdeedu/files/kdeedu-3.2.2-gcc34-compile.patch
new file mode 100644
index 000000000000..22e3f90b7671
--- /dev/null
+++ b/kde-base/kdeedu/files/kdeedu-3.2.2-gcc34-compile.patch
@@ -0,0 +1,107 @@
+diff -udBbr kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h
+--- kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h	2004-04-04 11:47:53.000000000 +0400
++++ kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidevapi.h	2004-04-24 09:04:04.812573952 +0400
+@@ -155,9 +155,9 @@
+ /* function to set all property switches off */
+ extern void IUResetSwitches(const ISwitchVectorProperty *svp);
+ 
+-extern int IUUpdateSwitches(const ISwitchVectorProperty *svp, ISState *states, char *names[], int n);
++extern int IUUpdateSwitches(ISwitchVectorProperty *svp, ISState *states, char *names[], int n);
+ 
+-extern int IUUpdateNumbers(const INumberVectorProperty *nvp, double values[], char *names[], int n);
++extern int IUUpdateNumbers(INumberVectorProperty *nvp, double values[], char *names[], int n);
+ 
+ /* function to reliably save new text in a IText */
+ extern void IUSaveText (IText *tp, const char *newtext);
+diff -udBbr kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c
+--- kdeedu-3.2.2/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c	2004-04-04 11:47:53.000000000 +0400
++++ kdeedu-3.2.2-fix1/work/kdeedu-3.2.2/kstars/kstars/indi/indidrivermain.c	2004-04-24 09:07:50.076328656 +0400
+@@ -46,11 +46,11 @@
+ static void clientMsgCB(int fd, void *arg);
+ static int dispatch (XMLEle *root, char msg[]);
+ static int crackDN (XMLEle *root, char **dev, char **name, char msg[]);
+-static char *pstateStr(IPState s);
+-static char *sstateStr(ISState s);
+-static char *ruleStr(ISRule r);
+-static char *permStr(IPerm p);
+-static char *timestamp (void);
++static const char *pstateStr(IPState s);
++static const char *sstateStr(ISState s);
++static const char *ruleStr(ISRule r);
++static const char *permStr(IPerm p);
++static const char *timestamp (void);
+ 
+ static int verbose;			/* chatty */
+ char *me;				/* a.out name */
+@@ -546,7 +546,7 @@
+ 
+ /* Update property switches in accord with states and names. */
+ int 
+-IUUpdateSwitches(const ISwitchVectorProperty *svp, ISState *states, char *names[], int n)
++IUUpdateSwitches(ISwitchVectorProperty *svp, ISState *states, char *names[], int n)
+ {
+  int i=0;
+  
+@@ -571,7 +571,7 @@
+ }
+ 
+ /* Update property numbers in accord with values and names */
+-int IUUpdateNumbers(const INumberVectorProperty *nvp, double values[], char *names[], int n)
++int IUUpdateNumbers(INumberVectorProperty *nvp, double values[], char *names[], int n)
+ {
+   int i=0;
+   
+@@ -724,7 +724,7 @@
+ 	    static char **names;
+ 	    static int maxn;
+ 	    char *dev, *name;
+-	    XMLEle *ep;
++	    /* XMLEle *ep; */
+ 
+ 	    /* pull out device and name */
+ 	    if (crackDN (root, &dev, &name, msg) < 0)
+@@ -856,7 +856,7 @@
+ }
+ 
+ /* return static string corresponding to the given property or light state */
+-static char *
++static const char *
+ pstateStr (IPState s)
+ {
+ 	switch (s) {
+@@ -871,7 +871,7 @@
+ }
+ 
+ /* return static string corresponding to the given switch state */
+-static char *
++static const char *
+ sstateStr (ISState s)
+ {
+ 	switch (s) {
+@@ -884,7 +884,7 @@
+ }
+ 
+ /* return static string corresponding to the given Rule */
+-static char *
++static const char *
+ ruleStr (ISRule r)
+ {
+ 	switch (r) {
+@@ -898,7 +898,7 @@
+ }
+ 
+ /* return static string corresponding to the given IPerm */
+-static char *
++static const char *
+ permStr (IPerm p)
+ {
+ 	switch (p) {
+@@ -912,7 +912,7 @@
+ }
+ 
+ /* return current system time in message format */
+-static char *
++static const char *
+ timestamp()
+ {
+ 	static char ts[32];
diff --git a/kde-base/kdeedu/kdeedu-3.2.2.ebuild b/kde-base/kdeedu/kdeedu-3.2.2.ebuild
index d9ed6c9bb71a..1f03b5e8e212 100644
--- a/kde-base/kdeedu/kdeedu-3.2.2.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.2.2.ebuild
@@ -1,9 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.2.ebuild,v 1.1 2004/04/20 01:47:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.2.2.ebuild,v 1.2 2004/04/27 00:51:52 caleb Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+
+src_unpack()
+{
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc34-compile.patch
+}
+
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 427c997211bc..5254659968f2 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.67 2004/04/25 03:44:41 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.68 2004/04/27 00:54:35 caleb Exp $
+
+  26 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdeutils-3.2.2-gcc34-compile.patch:
+  GCC 3.4 compile fix
 
   24 Apr 2004; Bret Curtis <psi29a@gentoo.org> kdeutils-3.2.2.ebuild:
   Added to ~mips
diff --git a/kde-base/kdeutils/files/kdeutils-3.2.2-gcc34-compile.patch b/kde-base/kdeutils/files/kdeutils-3.2.2-gcc34-compile.patch
new file mode 100644
index 000000000000..85e58089b1a3
--- /dev/null
+++ b/kde-base/kdeutils/files/kdeutils-3.2.2-gcc34-compile.patch
@@ -0,0 +1,44 @@
+diff -udBbr kdeutils-3.2.2/work/kdeutils-3.2.2/ksim/library/themeloader.h kdeutils-3.2.2-fix1/work/kdeutils-3.2.2/ksim/library/themeloader.h
+--- kdeutils-3.2.2/work/kdeutils-3.2.2/ksim/library/themeloader.h	2003-09-21 12:42:18.000000000 +0400
++++ kdeutils-3.2.2-fix1/work/kdeutils-3.2.2/ksim/library/themeloader.h	2004-04-23 23:51:04.293387112 +0400
+@@ -45,6 +45,7 @@
+   class Theme
+   {
+     friend class ThemeLoader;
++    friend class ThemePrefs;
+     public:
+       enum PixmapType { KrellPanel = 0, KrellMeter, KrellSlider };
+       ~Theme();
+diff -udBbr kdeutils-3.2.2/work/kdeutils-3.2.2/ksim/ksimview.cpp kdeutils-3.2.2-fix1/work/kdeutils-3.2.2/ksim/ksimview.cpp
+--- kdeutils-3.2.2/work/kdeutils-3.2.2/ksim/ksimview.cpp	2003-10-26 13:58:52.000000000 +0300
++++ kdeutils-3.2.2-fix1/work/kdeutils-3.2.2/ksim/ksimview.cpp	2004-04-23 23:33:08.507931360 +0400
+@@ -271,13 +271,14 @@
+   ChangedPluginList::ConstIterator it;
+   for (it = list.begin(); it != list.end(); ++it) {
+     if ((*it).isDifferent()) {
++      KDesktopFile tempKDesktopFile((*it).filename());
+       if ((*it).isEnabled()) { // Go through the added/removed plugins and load/unload them
+-        addPlugin(KDesktopFile((*it).filename()));
++        addPlugin(tempKDesktopFile);
+         m_prefDialog->createPage((*it).libName());
+       }
+       else {
+         m_prefDialog->removePage((*it).libName());
+-        removePlugin(KDesktopFile((*it).filename()));
++        removePlugin(tempKDesktopFile);
+       }
+     }
+   }
+@@ -303,8 +304,10 @@
+ {
+   QStringList locatedFiles = KGlobal::dirs()->findAllResources("data", "ksim/monitors/*.desktop");
+   QStringList::ConstIterator it;
+-  for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it)
+-    addPlugin(KDesktopFile(*it, true));
++  for (it = locatedFiles.begin(); it != locatedFiles.end(); ++it) {
++    KDesktopFile tempKDesktopFile(*it, true);
++    addPlugin(tempKDesktopFile);
++  }
+ }
+ 
+ void KSim::MainView::addPlugin(const KDesktopFile &file, bool force)
diff --git a/kde-base/kdeutils/kdeutils-3.2.2.ebuild b/kde-base/kdeutils/kdeutils-3.2.2.ebuild
index a70875b8a00e..6dca049e55fe 100644
--- a/kde-base/kdeutils/kdeutils-3.2.2.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.2.2.ebuild,v 1.2 2004/04/25 03:44:41 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.2.2.ebuild,v 1.3 2004/04/27 00:54:35 caleb Exp $
 
 inherit kde-dist
 
@@ -16,4 +16,5 @@ src_unpack()
 {
 	kde_src_unpack
 	epatch ${FILESDIR}/${P}-tarfix.patch
+	epatch ${FILESDIR}/${P}-gcc34-compile.patch
 }