Attachment #53761 for bug #81320

View | Details | Raw Unified | Return to bug 81320
Collapse All | Expand All





PORTNAME=	pose
PORTVERSION=	3.5
PORTREVISION=	4
CATEGORIES=	palm emulators
MASTER_SITES=	http://www.palmos.com/dev/tools/emulator/sources/ \
		http://www.palmos.com/dev/tools/emulator/:skins


.if ${ARCH} != "i386"
BROKEN=		"Does not compile on !i386"
.endif

.if ${OSVERSION} >= 503000
BROKEN=		"Does not compile on FreeBSD >= 5.x"
.endif

post-install:




diff -ur ../SrcShared/EmStream.h.orig ../SrcShared/EmStream.h
--- ../SrcShared/EmStream.h.orig	Fri Mar 29 07:11:14 2002
+++ ../SrcShared/EmStream.h	Thu Nov 25 17:04:01 2004
@@ -90,7 +90,7 @@
 
 									container.resize (numElements);
 
-									deque<T>::iterator	iter = container.begin ();
+									typename deque<T>::iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this >> *iter;
@@ -108,7 +108,7 @@
 
 									container.resize (numElements);
 
-									list<T>::iterator	iter = container.begin ();
+									typename list<T>::iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this >> *iter;
@@ -126,7 +126,7 @@
 
 									container.resize (numElements);
 
-									vector<T>::iterator	iter = container.begin ();
+									typename vector<T>::iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this >> *iter;
@@ -143,7 +143,7 @@
 
 									*this << numElements;
 
-									deque<T>::const_iterator	iter = container.begin ();
+									typename deque<T>::const_iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this << *iter;
@@ -160,7 +160,7 @@
 
 									*this << numElements;
 
-									list<T>::const_iterator	iter = container.begin ();
+									typename list<T>::const_iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this << *iter;
@@ -177,7 +177,7 @@
 
 									*this << numElements;
 
-									vector<T>::const_iterator	iter = container.begin ();
+									typename vector<T>::const_iterator	iter = container.begin ();
 									while (iter != container.end ())
 									{
 										*this << *iter;
@@ -321,7 +321,7 @@
 
 	*this << numElements;
 
-	const deque<T>::const_iterator	iter = container.begin ();
+	typename const deque<T>::const_iterator	iter = container.begin ();
 	while (iter != container.end ())
 	{
 		*this << *iter;
@@ -338,7 +338,7 @@
 
 	*this << numElements;
 
-	const list<T>::const_iterator	iter = container.begin ();
+	typename const list<T>::const_iterator	iter = container.begin ();
 	while (iter != container.end ())
 	{
 		*this << *iter;
@@ -355,7 +355,7 @@
 
 	*this << numElements;
 
-	const vector<T>::const_iterator	iter = container.begin ();
+	typename const vector<T>::const_iterator	iter = container.begin ();
 	while (iter != container.end ())
 	{
 		*this << *iter;
diff -ur ../SrcShared/Hardware/EmRegsEZTRGpro.cpp.orig ../SrcShared/Hardware/EmRegsEZTRGpro.cpp
--- ../SrcShared/Hardware/EmRegsEZTRGpro.cpp.orig	Fri Mar 29 07:11:18 2002
+++ ../SrcShared/Hardware/EmRegsEZTRGpro.cpp	Fri Nov 26 21:28:59 2004
@@ -229,8 +229,8 @@
 void EmRegsEZTRGpro::SetSubBankHandlers(void)
 {
 	EmRegsEZ::SetSubBankHandlers();
-	this->SetHandler((ReadFunction)&EmRegs::StdRead,
-                         (WriteFunction)&EmRegsEZTRGpro::spiWrite,
+	this->SetHandler((ReadFunction) &EmRegsEZTRGpro::StdRead,
+                         (WriteFunction) &EmRegsEZTRGpro::spiWrite,
 	                 addressof(spiMasterData),
 	                 sizeof(f68EZ328Regs.spiMasterData));
 }
diff -ur ../SrcShared/Hardware/EmRegsVZHandEra330.cpp.orig ../SrcShared/Hardware/EmRegsVZHandEra330.cpp
--- ../SrcShared/Hardware/EmRegsVZHandEra330.cpp.orig	Fri Mar 29 07:11:19 2002
+++ ../SrcShared/Hardware/EmRegsVZHandEra330.cpp	Fri Nov 26 21:30:56 2004
@@ -588,14 +588,14 @@
 
     // SD support
 	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::spiRxDRead,
-                         (WriteFunction)&EmRegsVZ::StdWrite,
+                         (WriteFunction) &EmRegsVZHandEra330::StdWrite,
 	                 addressof(spiRxD),
 	                 sizeof(UInt16));
-	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
+	this->SetHandler((ReadFunction) &EmRegsVZHandEra330::StdRead,
                          (WriteFunction)&EmRegsVZHandEra330::spiTxDWrite,
 	                 addressof(spiTxD),
 	                 sizeof(UInt16));
-	this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
+	this->SetHandler((ReadFunction) &EmRegsVZHandEra330::StdRead,
                          (WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
 	                 addressof(spiCont1),
 	                 sizeof(UInt16));
diff -ur ../SrcShared/Hardware/EmRegsVZPalmM505.cpp.orig ../SrcShared/Hardware/EmRegsVZPalmM505.cpp
--- ../SrcShared/Hardware/EmRegsVZPalmM505.cpp.orig	Fri Mar 29 07:11:19 2002
+++ ../SrcShared/Hardware/EmRegsVZPalmM505.cpp	Fri Nov 26 21:32:00 2004
@@ -50,7 +50,7 @@
 
 	// Now add standard/specialized handers for the defined registers.
 
-	this->SetHandler ((ReadFunction) &EmRegsVZ::StdRead,
+	this->SetHandler ((ReadFunction) &EmRegsVZPalmM505::StdRead,
 		(WriteFunction) &EmRegsVZPalmM505::portFSelectWrite,
 		addressof (portFSelect), sizeof (f68VZ328Regs.portFSelect));
 }
diff -ur ../SrcShared/Hardware/TRG/EmSPISlave330Current.h.orig ../SrcShared/Hardware/TRG/EmSPISlave330Current.h
--- ../SrcShared/Hardware/TRG/EmSPISlave330Current.h.orig	Fri Mar 29 07:11:05 2002
+++ ../SrcShared/Hardware/TRG/EmSPISlave330Current.h	Fri Nov 26 21:23:41 2004
@@ -48,4 +48,5 @@
         Bool                    fPowerConnected;
 };
 
-#endif
\ No newline at end of file
+#endif
+
diff -ur ../SrcShared/Hardware/TRG/EmTRGSD.h.orig ../SrcShared/Hardware/TRG/EmTRGSD.h
--- ../SrcShared/Hardware/TRG/EmTRGSD.h.orig	Fri Mar 29 07:11:06 2002
+++ ../SrcShared/Hardware/TRG/EmTRGSD.h	Fri Nov 26 21:22:58 2004
@@ -61,4 +61,5 @@
 	    void ExchangeBits(uint16 txData, uint16 *rxData, uint16 Bits);
 };
 
-#endif
\ No newline at end of file
+#endif
+

Return to bug 81320

Lines 7-13 Link Here

(-)pose/Makefile (-5 / +1 lines)
7		7
8	PORTNAME= pose	8	PORTNAME= pose
9	PORTVERSION= 3.5	9	PORTVERSION= 3.5
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= palm emulators	11	CATEGORIES= palm emulators
12	MASTER_SITES= http://www.palmos.com/dev/tools/emulator/sources/ \	12	MASTER_SITES= http://www.palmos.com/dev/tools/emulator/sources/ \
13	http://www.palmos.com/dev/tools/emulator/:skins	13	http://www.palmos.com/dev/tools/emulator/:skins
Lines 34-43 Link Here
34		34
35	.if ${ARCH} != "i386"	35	.if ${ARCH} != "i386"
36	BROKEN= "Does not compile on !i386"	36	BROKEN= "Does not compile on !i386"
37	.endif
38
39	.if ${OSVERSION} >= 503000
40	BROKEN= "Does not compile on FreeBSD >= 5.x"
41	.endif	37	.endif
42		38
43	post-install:	39	post-install:

Line 0 Link Here

(-)pose/files/patch-gcc-3.4_fix (+153 lines)
		1	diff -ur ../SrcShared/EmStream.h.orig ../SrcShared/EmStream.h
		2	--- ../SrcShared/EmStream.h.orig Fri Mar 29 07:11:14 2002
		3	+++ ../SrcShared/EmStream.h Thu Nov 25 17:04:01 2004
		4	@@ -90,7 +90,7 @@
		5
		6	container.resize (numElements);
		7
		8	- deque<T>::iterator iter = container.begin ();
		9	+ typename deque<T>::iterator iter = container.begin ();
		10	while (iter != container.end ())
		11	{
		12	this >> iter;
		13	@@ -108,7 +108,7 @@
		14
		15	container.resize (numElements);
		16
		17	- list<T>::iterator iter = container.begin ();
		18	+ typename list<T>::iterator iter = container.begin ();
		19	while (iter != container.end ())
		20	{
		21	this >> iter;
		22	@@ -126,7 +126,7 @@
		23
		24	container.resize (numElements);
		25
		26	- vector<T>::iterator iter = container.begin ();
		27	+ typename vector<T>::iterator iter = container.begin ();
		28	while (iter != container.end ())
		29	{
		30	this >> iter;
		31	@@ -143,7 +143,7 @@
		32
		33	*this << numElements;
		34
		35	- deque<T>::const_iterator iter = container.begin ();
		36	+ typename deque<T>::const_iterator iter = container.begin ();
		37	while (iter != container.end ())
		38	{
		39	this << iter;
		40	@@ -160,7 +160,7 @@
		41
		42	*this << numElements;
		43
		44	- list<T>::const_iterator iter = container.begin ();
		45	+ typename list<T>::const_iterator iter = container.begin ();
		46	while (iter != container.end ())
		47	{
		48	this << iter;
		49	@@ -177,7 +177,7 @@
		50
		51	*this << numElements;
		52
		53	- vector<T>::const_iterator iter = container.begin ();
		54	+ typename vector<T>::const_iterator iter = container.begin ();
		55	while (iter != container.end ())
		56	{
		57	this << iter;
		58	@@ -321,7 +321,7 @@
		59
		60	*this << numElements;
		61
		62	- const deque<T>::const_iterator iter = container.begin ();
		63	+ typename const deque<T>::const_iterator iter = container.begin ();
		64	while (iter != container.end ())
65	{
66	this << iter;
67	@@ -338,7 +338,7 @@
68
69	*this << numElements;
70
71	- const list<T>::const_iterator iter = container.begin ();
72	+ typename const list<T>::const_iterator iter = container.begin ();
73	while (iter != container.end ())
74	{
75	this << iter;
76	@@ -355,7 +355,7 @@
77
78	*this << numElements;
79
80	- const vector<T>::const_iterator iter = container.begin ();
81	+ typename const vector<T>::const_iterator iter = container.begin ();
82	while (iter != container.end ())
83	{
84	this << iter;
85	diff -ur ../SrcShared/Hardware/EmRegsEZTRGpro.cpp.orig ../SrcShared/Hardware/EmRegsEZTRGpro.cpp
86	--- ../SrcShared/Hardware/EmRegsEZTRGpro.cpp.orig Fri Mar 29 07:11:18 2002
87	+++ ../SrcShared/Hardware/EmRegsEZTRGpro.cpp Fri Nov 26 21:28:59 2004
88	@@ -229,8 +229,8 @@
89	void EmRegsEZTRGpro::SetSubBankHandlers(void)
90	{
91	EmRegsEZ::SetSubBankHandlers();
92	- this->SetHandler((ReadFunction)&EmRegs::StdRead,
93	- (WriteFunction)&EmRegsEZTRGpro::spiWrite,
94	+ this->SetHandler((ReadFunction) &EmRegsEZTRGpro::StdRead,
95	+ (WriteFunction) &EmRegsEZTRGpro::spiWrite,
96	addressof(spiMasterData),
97	sizeof(f68EZ328Regs.spiMasterData));
98	}
99	diff -ur ../SrcShared/Hardware/EmRegsVZHandEra330.cpp.orig ../SrcShared/Hardware/EmRegsVZHandEra330.cpp
100	--- ../SrcShared/Hardware/EmRegsVZHandEra330.cpp.orig Fri Mar 29 07:11:19 2002
101	+++ ../SrcShared/Hardware/EmRegsVZHandEra330.cpp Fri Nov 26 21:30:56 2004
102	@@ -588,14 +588,14 @@
103
104	// SD support
105	this->SetHandler((ReadFunction)&EmRegsVZHandEra330::spiRxDRead,
106	- (WriteFunction)&EmRegsVZ::StdWrite,
107	+ (WriteFunction) &EmRegsVZHandEra330::StdWrite,
108	addressof(spiRxD),
109	sizeof(UInt16));
110	- this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
111	+ this->SetHandler((ReadFunction) &EmRegsVZHandEra330::StdRead,
112	(WriteFunction)&EmRegsVZHandEra330::spiTxDWrite,
113	addressof(spiTxD),
114	sizeof(UInt16));
115	- this->SetHandler((ReadFunction)&EmRegsVZ::StdRead,
116	+ this->SetHandler((ReadFunction) &EmRegsVZHandEra330::StdRead,
117	(WriteFunction)&EmRegsVZHandEra330::spiCont1Write,
118	addressof(spiCont1),
119	sizeof(UInt16));
120	diff -ur ../SrcShared/Hardware/EmRegsVZPalmM505.cpp.orig ../SrcShared/Hardware/EmRegsVZPalmM505.cpp
121	--- ../SrcShared/Hardware/EmRegsVZPalmM505.cpp.orig Fri Mar 29 07:11:19 2002
122	+++ ../SrcShared/Hardware/EmRegsVZPalmM505.cpp Fri Nov 26 21:32:00 2004
123	@@ -50,7 +50,7 @@
124
125	// Now add standard/specialized handers for the defined registers.
126
127	- this->SetHandler ((ReadFunction) &EmRegsVZ::StdRead,
128	+ this->SetHandler ((ReadFunction) &EmRegsVZPalmM505::StdRead,
129	(WriteFunction) &EmRegsVZPalmM505::portFSelectWrite,
130	addressof (portFSelect), sizeof (f68VZ328Regs.portFSelect));
131	}
132	diff -ur ../SrcShared/Hardware/TRG/EmSPISlave330Current.h.orig ../SrcShared/Hardware/TRG/EmSPISlave330Current.h
133	--- ../SrcShared/Hardware/TRG/EmSPISlave330Current.h.orig Fri Mar 29 07:11:05 2002
134	+++ ../SrcShared/Hardware/TRG/EmSPISlave330Current.h Fri Nov 26 21:23:41 2004
135	@@ -48,4 +48,5 @@
136	Bool fPowerConnected;
137	};
138
139	-#endif
140	\ No newline at end of file
141	+#endif
142	+
143	diff -ur ../SrcShared/Hardware/TRG/EmTRGSD.h.orig ../SrcShared/Hardware/TRG/EmTRGSD.h
144	--- ../SrcShared/Hardware/TRG/EmTRGSD.h.orig Fri Mar 29 07:11:06 2002
145	+++ ../SrcShared/Hardware/TRG/EmTRGSD.h Fri Nov 26 21:22:58 2004
146	@@ -61,4 +61,5 @@
147	void ExchangeBits(uint16 txData, uint16 *rxData, uint16 Bits);
148	};
149
150	-#endif
151	\ No newline at end of file
152	+#endif
153	+