1 |
patrick 10/02/08 23:50:54 |
2 |
|
3 |
Added: freewrl-1.22.6-xulrunner192-fixes.patch |
4 |
Log: |
5 |
Fix for xulrunner-1.9.2 by Ian Stakenvicius, fixes #303183 |
6 |
(Portage version: 2.2_rc62/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-gfx/freewrl/files/freewrl-1.22.6-xulrunner192-fixes.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/freewrl/files/freewrl-1.22.6-xulrunner192-fixes.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-gfx/freewrl/files/freewrl-1.22.6-xulrunner192-fixes.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: freewrl-1.22.6-xulrunner192-fixes.patch |
15 |
=================================================================== |
16 |
--- configure.ac 2009-10-28 20:01:05.000000000 -0400 |
17 |
+++ configure.ac 2010-02-04 14:05:19.000000000 -0500 |
18 |
@@ -126,7 +126,7 @@ |
19 |
ZLIB_LIBS="-L$withval/lib $ZLIB_LIBS"]) |
20 |
|
21 |
# save global cflags/libs |
22 |
- oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS |
23 |
+ oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS;oCPPFLAGS=$CPPFLAGS |
24 |
# set cflags/libs for this case |
25 |
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" |
26 |
LDFLAGS="$LDFLAGS $ZLIB_LIBS" |
27 |
@@ -137,7 +137,7 @@ |
28 |
[AC_MSG_ERROR([Can't find zlib library. Please install zlib.])]) |
29 |
|
30 |
# restore global cflags/libs |
31 |
- CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS |
32 |
+ CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS;CFLAGS=$oCFLAGS |
33 |
|
34 |
AC_SUBST(ZLIB_CFLAGS) |
35 |
AC_SUBST(ZLIB_LIBS) |
36 |
@@ -218,7 +218,7 @@ |
37 |
EXPAT_LIBS="-L$withval/lib $EXPAT_LIBS"]) |
38 |
|
39 |
# save global cflags/libs |
40 |
- oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS |
41 |
+ oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS;oCPPFLAGS=$CPPFLAGS |
42 |
# set cflags/libs for this case |
43 |
CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS" |
44 |
LDFLAGS="$LDFLAGS $EXPAT_LIBS" |
45 |
@@ -229,8 +229,7 @@ |
46 |
[AC_MSG_ERROR([Can't find expat library. Please install expat.])]) |
47 |
|
48 |
# restore global cflags/libs |
49 |
- CPPFLAGS=$oCPPFLAGS |
50 |
- LDFLAGS=$oLDFLAGS |
51 |
+ CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS;CFLAGS=$oCFLAGS |
52 |
|
53 |
AC_SUBST(EXPAT_CFLAGS) |
54 |
AC_SUBST(EXPAT_LIBS) |
55 |
@@ -363,7 +362,7 @@ |
56 |
*) # Search for GLEW |
57 |
|
58 |
# save global cflags/libs |
59 |
- oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS |
60 |
+ oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS;oCPPFLAGS=$CPPFLAGS |
61 |
# set cflags/libs for this case |
62 |
CPPFLAGS="$CPPFLAGS $GLEW_CFLAGS $GL_CFLAGS" |
63 |
LDFLAGS="$LDFLAGS $GLEW_LIBS $GL_LIBS" |
64 |
@@ -378,7 +377,7 @@ |
65 |
esac |
66 |
|
67 |
# restore global cflags/libs |
68 |
- CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS |
69 |
+ CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS;CFLAGS=$oCFLAGS |
70 |
|
71 |
AC_SUBST(GLEW_CFLAGS) |
72 |
AC_SUBST(GLEW_LIBS) |
73 |
@@ -393,7 +392,7 @@ |
74 |
JPEG_LIBS="-L$withval/lib -ljpeg"]) |
75 |
|
76 |
# save global cflags/libs |
77 |
- oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS |
78 |
+ oCFLAGS=$CFLAGS;oLDFLAGS=$LDFLAGS;oCPPFLAGS=$CPPFLAGS |
79 |
# set cflags/libs for this case |
80 |
CPPFLAGS="$CPPFLAGS $JPEG_CFLAGS" |
81 |
LDFLAGS="$LDFLAGS $JPEG_LIBS" |
82 |
@@ -421,7 +420,7 @@ |
83 |
) |
84 |
|
85 |
# restore global cflags/libs |
86 |
- CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS |
87 |
+ CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS;CFLAGS=$oCFLAGS |
88 |
|
89 |
AC_SUBST(JPEG_CFLAGS) |
90 |
AC_SUBST(JPEG_LIBS) |
91 |
@@ -523,6 +522,17 @@ |
92 |
AC_SUBST(PLUGIN_CFLAGS) |
93 |
AC_SUBST(PLUGIN_LIBS) |
94 |
|
95 |
+# |
96 |
+# Check if 'int32' type is defined (would be included in plugin's includes) |
97 |
+ |
98 |
+ # save global cflags/libs |
99 |
+ oCPPFLAGS=$CPPFLAGS;oLDFLAGS=$LDFLAGS;oCFLAGS=$CFLAGS |
100 |
+ CFLAGS="$CFLAGS $PLUGIN_CFLAGS" |
101 |
+AC_CHECK_TYPES([int32, uint32, int16, uint16], [], [], [[#include <npapi.h>]]) |
102 |
+ # restore global cflags/libs |
103 |
+ CPPFLAGS=$oCPPFLAGS;LDFLAGS=$oLDFLAGS;CFLAGS=$oCFLAGS |
104 |
+ |
105 |
+ |
106 |
# ====================================== |
107 |
# FreeWRL helpers programs |
108 |
# ====================================== |
109 |
--- src/plugin/system.h 2009-10-12 08:58:19.000000000 -0400 |
110 |
+++ src/plugin/system.h 2010-02-04 14:19:35.000000000 -0500 |
111 |
@@ -108,5 +108,17 @@ |
112 |
# include <sys/socket.h> |
113 |
#endif |
114 |
|
115 |
+#ifndef HAVE_INT32 |
116 |
+# define int32 int32_t |
117 |
+#endif |
118 |
+#ifndef HAVE_UINT32 |
119 |
+# define uint32 uint32_t |
120 |
+#endif |
121 |
+#ifndef HAVE_INT16 |
122 |
+# define int16 int16_t |
123 |
+#endif |
124 |
+#ifndef HAVE_UINT16 |
125 |
+# define uint16 uint16_t |
126 |
+#endif |
127 |
|
128 |
#endif /* __FREEWRL_PLUGIN_SYSTEM_H__ */ |
129 |
--- src/plugin/npunix.c 2009-10-05 11:07:24.000000000 -0400 |
130 |
+++ src/plugin/npunix.c 2010-02-04 15:52:52.000000000 -0500 |
131 |
@@ -65,6 +65,9 @@ |
132 |
# define PLUGINDEBUGSTR(msg) |
133 |
#endif |
134 |
|
135 |
+/* fix for int32,uint32,int16,uint16 undefined errors with newer xulrunners */ |
136 |
+#include <config.h> |
137 |
+#include <system.h> |
138 |
|
139 |
/*********************************************************************** |
140 |
* |
141 |
@@ -256,7 +259,7 @@ |
142 |
#endif |
143 |
} |
144 |
|
145 |
- |
146 |
#ifdef MY_JAVA |
147 |
+/* |
148 |
JRIEnv* NPN_GetJavaEnv() |
149 |
{ |
150 |
@@ -266,6 +269,7 @@ |
151 |
return (*gNetscapeFuncs.getJavaEnv); |
152 |
# endif |
153 |
} |
154 |
+*/ |
155 |
|
156 |
jref NPN_GetJavaPeer(NPP instance) |
157 |
{ |
158 |
@@ -377,10 +381,10 @@ |
159 |
NPP_URLNotify(instance, url, reason, notifyData); |
160 |
} |
161 |
|
162 |
+/*JAS |
163 |
JRIGlobalRef |
164 |
Private_GetJavaClass(void) |
165 |
{ |
166 |
-/*JAS |
167 |
#ifdef MY_JAVA |
168 |
jref clazz = NPP_GetJavaClass(); |
169 |
#else |
170 |
@@ -390,9 +394,9 @@ |
171 |
JRIEnv* env = NPN_GetJavaEnv(); |
172 |
return JRI_NewGlobalRef(env, clazz); |
173 |
} |
174 |
-*/ |
175 |
return NULL; |
176 |
} |
177 |
+*/ |
178 |
|
179 |
/*********************************************************************** |
180 |
* |
181 |
@@ -533,7 +537,8 @@ |
182 |
pluginFuncs->urlnotify = (NPP_URLNotifyProcPtr)(Private_URLNotify); |
183 |
#endif |
184 |
pluginFuncs->event = NULL; |
185 |
- pluginFuncs->javaClass = Private_GetJavaClass(); |
186 |
+/* pluginFuncs->javaClass = Private_GetJavaClass(); */ |
187 |
+ pluginFuncs->javaClass = NULL; |
188 |
|
189 |
err = NPP_Initialize(); |
190 |
} |
191 |
--- src/lib/world_script/jsVRMLBrowser.c 2010-02-03 17:28:38.000000000 -0500 |
192 |
+++ src/lib/world_script/jsVRMLBrowser.c 2010-02-03 17:28:02.000000000 -0500 |
193 |
@@ -107,7 +107,7 @@ |
194 |
|
195 |
/* for setting field values to the output of a CreateVrml style of call */ |
196 |
/* it is kept at zero, unless it has been used. Then it is reset to zero */ |
197 |
-jsval JSCreate_global_return_val = INT_TO_JSVAL(0); |
198 |
+jsval JSCreate_global_return_val; |
199 |
|
200 |
/* we add/remove routes with this call */ |
201 |
void jsRegisterRoute( |
202 |
@@ -211,6 +211,8 @@ |
203 |
{ |
204 |
JSObject *obj; |
205 |
|
206 |
+JSCreate_global_return_val = INT_TO_JSVAL(0); |
207 |
+ |
208 |
#ifdef JSVERBOSE |
209 |
printf("VrmlBrowserInit\n"); |
210 |
#endif |
211 |
--- src/lib/Makefile.am 2009-10-28 20:16:50.000000000 -0400 |
212 |
+++ src/lib/Makefile.am 2010-02-04 11:06:58.000000000 -0500 |
213 |
@@ -17,14 +17,14 @@ |
214 |
$(ZLIB_CFLAGS) \ |
215 |
$(PTHREAD_CFLAGS) \ |
216 |
$(FREETYPE_CFLAGS) \ |
217 |
- $(JAVASCRIPT_ENGINE_CFLAGS) \ |
218 |
$(EXPAT_CFLAGS) \ |
219 |
$(XML_CFLAGS) \ |
220 |
$(GL_CFLAGS) \ |
221 |
$(JPEG_CFLAGS) \ |
222 |
$(PNG_CFLAGS) \ |
223 |
$(LIBCURL_CFLAGS) \ |
224 |
- $(IMLIB2_CFLAGS) |
225 |
+ $(IMLIB2_CFLAGS) \ |
226 |
+ $(JAVASCRIPT_ENGINE_CFLAGS) |
227 |
|
228 |
EXTERNAL_LIBS = \ |
229 |
$(ZLIB_LIBS) \ |