1 |
ssuominen 11/01/02 18:16:32 |
2 |
|
3 |
Added: gxine-0.5.905-fix-nspr-useage.patch |
4 |
gxine-0.5.905-spidermonkey-update.patch |
5 |
Log: |
6 |
Fix building with latest spidermonkey (unbundled from firefox's tarball) wrt #350134 by Jory A. Pratt and Juergen Rose. |
7 |
|
8 |
(Portage version: 2.2.0_alpha10/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/gxine/files/gxine-0.5.905-fix-nspr-useage.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: gxine-0.5.905-fix-nspr-useage.patch |
17 |
=================================================================== |
18 |
--- a/src/Makefile.am 2011-01-02 11:33:09.675000001 -0600 |
19 |
+++ b/src/Makefile.am 2011-01-02 11:34:05.205000001 -0600 |
20 |
@@ -4,7 +4,7 @@ |
21 |
-I$(top_builddir)/pixmaps $(LIRC_INCLUDE) |
22 |
|
23 |
AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \ |
24 |
- $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \ |
25 |
+ $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) $(NSPR_CFLAGS) \ |
26 |
$(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \ |
27 |
-DLOCALEDIR=\"$(localedir)\" |
28 |
|
29 |
|
30 |
|
31 |
|
32 |
1.1 media-video/gxine/files/gxine-0.5.905-spidermonkey-update.patch |
33 |
|
34 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/gxine/files/gxine-0.5.905-spidermonkey-update.patch?rev=1.1&view=markup |
35 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/gxine/files/gxine-0.5.905-spidermonkey-update.patch?rev=1.1&content-type=text/plain |
36 |
|
37 |
Index: gxine-0.5.905-spidermonkey-update.patch |
38 |
=================================================================== |
39 |
--- a/m4/_js.m4 2011-01-02 10:54:36.821000001 -0600 |
40 |
+++ b/m4/_js.m4 2011-01-02 10:55:45.368000001 -0600 |
41 |
@@ -103,7 +103,7 @@ |
42 |
# Failed... |
43 |
|
44 |
if test x"$JS_CFLAGS" = x; then |
45 |
- AC_MSG_ERROR([libjs not found]) |
46 |
+ AC_MSG_ERROR([libmozjs not found]) |
47 |
fi |
48 |
else |
49 |
saved_CFLAGS="$CFLAGS" |
50 |
@@ -118,10 +118,10 @@ |
51 |
echo moz |
52 |
;; |
53 |
esac`" |
54 |
- JS_LIBS="`spidermonkey_locate_lib([$JS_LIBS])`js" |
55 |
+ JS_LIBS="`spidermonkey_locate_lib([$JS_LIBS])`mozjs" |
56 |
AC_DEFINE(HAVE_LIBSMJS, 1, [Define if you have jsapi.h]) |
57 |
], |
58 |
- [AC_MSG_ERROR([libjs not found])], |
59 |
+ [AC_MSG_ERROR([libmozjs not found])], |
60 |
[#define XP_UNIX]) |
61 |
CFLAGS="$saved_CFLAGS" |
62 |
fi |