Commit gcc v3.4 compile fix

4 files changed, 186 insertions, 4 deletions

diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 3d484c8e8741..9b1ca6498d05 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdegraphics
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.85 2004/04/21 01:39:14 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.86 2004/04/27 00:48:49 caleb Exp $
+
+  26 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdegraphics-3.2.2-gcc34-compile.patch:
+  GCC 3.4 compile fix
 
   20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
   -files/kdegraphics-3.0.5b-kghostviewrc, -kdegraphics-3.0.5b.ebuild:
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 96958da9658c..4d3eac48e9a2 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,9 +1,10 @@
-MD5 ac9275c5ae92ef4779522a62d9ec71de kdegraphics-3.2.2.ebuild 1151
+MD5 eaf052ca120358d27b37ba4c050e7787 kdegraphics-3.2.2.ebuild 1230
 MD5 f1522dfb60d1336e3a31134108537e07 kdegraphics-3.2.1.ebuild 1237
 MD5 275fdd177d7f05cea0cafa8b18dda21b kdegraphics-3.1.5.ebuild 1057
-MD5 7108646429ac422fb7bb6e2321b2b1da ChangeLog 12125
+MD5 4ad6fc9d4a69acb3723ad5e31e4cc4dd ChangeLog 12243
 MD5 f370a12e68e79f1aabb05a4afb49d660 kdegraphics-3.2.0.ebuild 1339
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
+MD5 eb03ab721af71700a0b445f1c50b55f8 files/kdegraphics-3.2.2-gcc34-compile.patch 7723
 MD5 78ab0a172f24863df0ba35300e95a890 files/digest-kdegraphics-3.1.5 71
 MD5 8c9db7f8d52169b544da66be07e9979a files/digest-kdegraphics-3.2.0 71
 MD5 53922251ccc0fc7dd56ca9e8fd3d5e80 files/digest-kdegraphics-3.2.1 71
diff --git a/kde-base/kdegraphics/files/kdegraphics-3.2.2-gcc34-compile.patch b/kde-base/kdegraphics/files/kdegraphics-3.2.2-gcc34-compile.patch
new file mode 100644
index 000000000000..ff9bce562a39
--- /dev/null
+++ b/kde-base/kdegraphics/files/kdegraphics-3.2.2-gcc34-compile.patch
@@ -0,0 +1,172 @@
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp	2002-12-30 22:55:16.000000000 +0300
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/kpovmodeler/pmvariant.cpp	2004-04-21 22:54:55.760403944 +0400
+@@ -311,7 +311,7 @@
+       m_dataType = PMVariant::ObjectPointer;
+    }
+    else
+-      ( ( PMObject* ) m_pData ) = obj;
++      m_pData = ( void* ) obj;
+ }
+ 
+ int PMVariant::intData( ) const
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h	2003-10-26 13:52:36.000000000 +0300
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_bridge.h	2004-04-22 00:12:13.212404080 +0400
+@@ -90,7 +90,7 @@
+ //			kdDebug(26004) << "KSVGBridge::put(), " << propertyName.qstring() << " Name: " << classInfo()->className << " Object: " << m_impl << endl;
+ 
+ 		// Try to see if we know this property (and need to take special action)
+-		if(m_impl->put(exec, propertyName, value, attr))
++		if(this->m_impl->put(exec, propertyName, value, attr))
+ 			return;
+ 
+ 		// We don't -> set property in ObjectImp.
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h	2003-08-17 15:49:23.000000000 +0400
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_lookup.h	2004-04-21 23:34:50.954279128 +0400
+@@ -21,10 +21,13 @@
+ #ifndef KSVG_LOOKUP_H
+ #define KSVG_LOOKUP_H
+ 
++#include <kdebug.h>
++
+ #include <kjs/object.h>
+ #include <kjs/lookup.h>
+ #include <kjs/interpreter.h> // for ExecState
+ 
++//#include "ksvg_scriptinterpreter.h"
+ class KSVGScriptInterpreter;
+ 
+ #define KSVG_GET_COMMON \
+@@ -188,6 +191,7 @@
+ 	 * The "this" class must implement putValueProperty.
+ 	 * If it returns false, put() will return false, and KSVGRequest will set a dynamic property in ObjectImp
+ 	 */
++/*
+ 	template <class ThisImp>
+ 	inline bool lookupPut(KJS::ExecState *exec,
+ 						  const KJS::Identifier &propertyName,
+@@ -218,6 +222,7 @@
+ 			return true;
+ 		}
+ 	}
++*/ /* moved to ksvg_scriptinterpreter.h */
+ }
+ 
+ // Same as kjs' DEFINE_PROTOTYPE, but with a pointer to the hashtable too, and no ClassName here
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h	2003-05-10 13:32:50.000000000 +0400
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/ecma/ksvg_scriptinterpreter.h	2004-04-21 23:40:36.693718744 +0400
+@@ -68,6 +68,47 @@
+ 	QPtrDict<KJS::ObjectImp> m_domObjects;
+ };
+ 
++namespace KSVG
++{
++
++    /**
++	 * This one is for "put".
++	 * Lookup hash entry for property to be set, and set the value.
++	 * The "this" class must implement putValueProperty.
++	 * If it returns false, put() will return false, and KSVGRequest will set a dynamic property in ObjectImp
++	 */
++	template <class ThisImp>
++	inline bool lookupPut(KJS::ExecState *exec,
++						  const KJS::Identifier &propertyName,
++						  const KJS::Value &value,
++						  int attr,
++						  const KJS::HashTable *table,
++						  ThisImp *thisObj)
++    {
++		const KJS::HashEntry *entry = KJS::Lookup::findEntry(table, propertyName);
++
++		if(!entry) // not found, forward to parents
++			return thisObj->putInParents(exec, propertyName, value, attr);
++		else if(entry->attr & KJS::Function) // Function: put as override property
++			return false;
++		else if(entry->attr & KJS::ReadOnly && !(attr & KJS::Internal)) // readonly! Can't put!
++		{
++#ifdef KJS_VERBOSE
++			kdWarning(26004) <<" Attempt to change value of readonly property '" << propertyName.qstring() << "'" << endl;
++#endif
++			return true; // "we did it" -> don't put override property
++		}
++		else
++		{
++			if(static_cast<KSVGScriptInterpreter *>(exec->interpreter())->attributeSetMode())
++				thisObj->m_attrFlags |= (1 << entry->value);
++
++			thisObj->putValueProperty(exec, entry->value, value, attr);
++			return true;
++		}
++	}
++}
++
+ // Lookup or create JS object around an existing "DOM Object"
+ template<class DOMObj, class KJSDOMObj>
+ inline KJS::Value cacheDOMObject(KJS::ExecState *exec, DOMObj *domObj)
+@@ -100,7 +141,7 @@
+ 	{
+ 		ClassCtor* ctor = new ClassCtor(exec); // create the ClassCtor instance
+ 		KJS::Object newObject(new KSVGBridge<ClassCtor>(exec, ctor)); // create the bridge around it
+-		exec->interpreter()->globalObject().put(exec, propertyName, newObject, Internal);
++		exec->interpreter()->globalObject().put(exec, propertyName, newObject, KJS::Internal);
+ 		return newObject;
+ 	}
+ }
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h	2003-08-28 00:08:25.000000000 +0400
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGHelperImpl.h	2004-04-22 00:04:58.029561928 +0400
+@@ -23,6 +23,7 @@
+ 
+ #include <dom/dom_element.h>
+ 
++#include "SVGElementImpl.h"
+ #include "SVGLengthImpl.h"
+ 
+ #include "ksvg_lookup.h"
+@@ -56,7 +57,7 @@
+ 		{
+ 			T *cast = dynamic_cast<T *>(element->ownerDoc()->getElementFromHandle(node.handle()));
+ 			if(cast)
+-				cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), Internal);
++				cast->putValueProperty(element->ownerDoc()->ecmaEngine()->globalExec(), token, KJS::String(value), KJS::Internal);
+ 		}
+ 	}
+ 
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h	2004-01-17 15:52:40.000000000 +0300
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/impl/SVGList.h	2004-04-21 23:41:08.040953240 +0400
+@@ -48,7 +48,7 @@
+ {
+ public:
+ 	SVGList() { m_impl.setAutoDelete(false); }
+-	SVGList(const SVGList &) { *this = other; }
++	SVGList(const SVGList &other) { *this = other; }
+ 	~SVGList() { clear(); }
+ 
+ 	SVGList<T> &operator=(const SVGList<T> &other)
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp	2003-11-30 12:46:17.000000000 +0300
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/plugin/backends/libart/LibartCanvas.cpp	2004-04-22 00:15:04.624345504 +0400
+@@ -176,7 +176,7 @@
+ 
+ CanvasPaintServer *LibartCanvas::createPaintServer(SVGElementImpl *pserver)
+ {
+-	LibartPaintServer *result;
++	LibartPaintServer *result = NULL;
+ 	if(dynamic_cast<SVGLinearGradientElementImpl *>(pserver))
+ 		result = new LibartLinearGradient(dynamic_cast<SVGLinearGradientElementImpl *>(pserver));
+ 	else if(dynamic_cast<SVGRadialGradientElementImpl *>(pserver))
+diff -udBbr kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp
+--- kdegraphics-3.2.2/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp	2003-11-30 12:46:12.000000000 +0300
++++ kdegraphics-3.2.2-fix1/work/kdegraphics-3.2.2/ksvg/core/CanvasFactory.cpp	2004-04-22 00:48:56.135508864 +0400
+@@ -26,6 +26,7 @@
+ 
+ #include "KSVGCanvas.h"
+ #include "CanvasFactory.h"
++#include "CanvasItem.h"
+ 
+ using namespace KSVG;
+ 
diff --git a/kde-base/kdegraphics/kdegraphics-3.2.2.ebuild b/kde-base/kdegraphics/kdegraphics-3.2.2.ebuild
index 9f3b63cc6b7b..6dd3b40454b6 100644
--- a/kde-base/kdegraphics/kdegraphics-3.2.2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-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/kdegraphics/kdegraphics-3.2.2.ebuild,v 1.1 2004/04/20 01:50:50 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.2.2.ebuild,v 1.2 2004/04/27 00:48:49 caleb Exp $
 
 inherit kde-dist
 
@@ -22,6 +22,11 @@ DEPEND="~kde-base/kdebase-${PV}
 RDEPEND="${DEPEND}
 	app-text/xpdf"
 
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/${P}-gcc34-compile.patch
+}
+
 src_compile() {
 
 	use gphoto2	\