[kris@FreeBSD.org: cvs commit: ports/graphics/imlib3d Makefile]

[Simon Barner]

Hi,

> FYI.  This port will be removed in 3 months if it is still broken.
> See http://bento.freebsd.org for the failure logs.
> 
> Kris

The attached patches should fix the build error (for both gcc 2.95.4 and
3.3.1). Unfortunately, I could only link the library with gcc 2.95.4, since
I am using -STABLE, and do not want to rebuild all of the dependencies with
gcc 3.3. Perhaps, some 5.x user from this list can verify this for me.

Simon
-------------- next part --------------
--- ImLib3D/CppTools.hpp.orig	Wed Aug  7 17:55:37 2002
+++ ImLib3D/CppTools.hpp	Thu Aug  7 16:59:30 2003
@@ -329,9 +329,9 @@
 //@}
 
 #ifdef __GNUC__ 
-#ifndef HPUX
+#if !defined (HPUX) && !defined (__FreeBSD__)
 #define USE_EXPLICIT_INSTANTIATION
-#endif // HPUX
+#endif // !HPUX && !__FreeBSD__
 #endif // __GNUC__ 
 
 #ifdef  USE_EXPLICIT_INSTANTIATION
-------------- next part --------------
--- ImLib3D/Image3Dlinear.hpp.orig	Thu Aug  7 17:13:19 2003
+++ ImLib3D/Image3Dlinear.hpp	Thu Aug  7 17:15:33 2003
@@ -64,7 +64,7 @@
 private:
 	typedef Container3D<Im3DValue> _Base;
 public:
-	typedef Im3DValue value_type;
+	//typedef Im3DValue value_type;
 	typedef Image3Dlinear<Im3DValue> ImageType;
 	std_typedefs;
 protected:
@@ -231,7 +231,7 @@
 private:
 	typedef Image3Dlinear<Im3DValue> _Base;
 public:
-	typedef Im3DValue value_type;
+	//typedef Im3DValue value_type;
 	std_typedefs;
 
 public:
-------------- next part --------------
--- ImLib3D/Properties.hpp.orig	Thu Aug  7 17:24:02 2003
+++ ImLib3D/Properties.hpp	Thu Aug  7 17:24:26 2003
@@ -194,7 +194,7 @@
 	bool Has(const string &propname) const {return properties.find(propname)!=properties.end();}
 
 	//! Add a string property instead of a char* property
-	void Add(const string &name,const char * str){Add(name,string(str));}
+	void Add(const string &name,const char * str){Add(name,str);}
 
 	//! Adds a new property using the automatic PropertyWrapPtr property wrapper
 	template<class PType>
-------------- next part --------------
--- ImLib3D/StringArgumentConversion.hpp.orig	Fri Aug  8 02:25:49 2003
+++ ImLib3D/StringArgumentConversion.hpp	Fri Aug  8 02:36:01 2003
@@ -38,8 +38,8 @@
 template<> inline void ImProcOutputArgToFile<Vect3Di>(const Vect3Di&arg,const string &str){cout << "result:" << arg << endl;}
 template<> inline void ImProcOutputArgToFile<Vect3Df>(const Vect3Df&arg,const string &str){cout << "result:" << arg << endl;}
 template<> inline void ImProcOutputArgToFile<RectZone3Di>(const RectZone3Di&arg,const string &str){cout << "result:" << arg << endl;}
-template<> inline void ImProcOutputArgToFile<BitMask3D::BitValue>(const BitMask3D::BitValue &arg,const string &str) {cout << "result:" << (uint)arg << endl;}
-template<> inline void ImProcOutputArgToFile<BitImage3D<byte,2,byte>::BitValue>(const BitImage3D<byte,2,byte>::BitValue &arg,const string &str) {cout << "result:" << (uint)arg << endl;}
+template<> inline void ImProcOutputArgToFile<BitMask3D::BitValue>(const BitMask3D::BitValue &arg,const string &str) {cout << "result:" << arg << endl;}
+template<> inline void ImProcOutputArgToFile<BitImage3D<byte,2,byte>::BitValue>(const BitImage3D<byte,2,byte>::BitValue &arg,const string &str) {cout << "result:" << arg << endl;}
 
 template<class T>
 void ImProcOutputArg(T &arg,const string &str,vector<TypeSafeGenericPointer> &alternateArgs,int argNum)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: Digital signature
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20030808/b37a661b/attachment.bin