wok rev 8764
Automated merge with https://bitbucket.org/gokhlayeh/wok
| author | Antoine Bodin <gokhlayeh@slitaz.org> |
|---|---|
| date | Mon Feb 21 04:48:27 2011 +0100 (2011-02-21) |
| parents | 9caf4331f934 73f88b3f05a7 |
| children | ed1d06a60d1a |
| files |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/spidermonkey/stuff/spidermonkey-1.7-threadsafe.patch Mon Feb 21 04:48:27 2011 +0100 1.3 @@ -0,0 +1,16 @@ 1.4 +--- js/src/Makefile.ref.orig 2008-05-28 19:51:32.000000000 -0400 1.5 ++++ js/src/Makefile.ref 2008-05-28 19:52:17.000000000 -0400 1.6 +@@ -63,11 +63,11 @@ 1.7 + 1.8 + ifdef JS_THREADSAFE 1.9 + DEFINES += -DJS_THREADSAFE 1.10 +-INCLUDES += -I$(DIST)/include/nspr 1.11 ++INCLUDES += -I/usr/include/nspr 1.12 + ifdef USE_MSVC 1.13 + OTHER_LIBS += $(DIST)/lib/libnspr$(NSPR_LIBSUFFIX).lib 1.14 + else 1.15 +-OTHER_LIBS += -L$(DIST)/lib -lnspr$(NSPR_LIBSUFFIX) 1.16 ++OTHER_LIBS += -L/usr/$(LIBDIR)/nspr -lnspr${NSPR_LIBSUFFIX} 1.17 + endif 1.18 + endif 1.19 +
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/spidermonkey/stuff/spidermonkey-Makefile.patch Mon Feb 21 04:48:27 2011 +0100 2.3 @@ -0,0 +1,110 @@ 2.4 +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 2.5 + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 2.6 +<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> 2.7 +<head> 2.8 +<title>svntogit/community.git - Git clone of the 'community' subversion repository</title> 2.9 +<meta name='generator' content='cgit v0.8.3.4-124-ge7dc'/> 2.10 +<meta name='robots' content='index, nofollow'/> 2.11 +<link rel='stylesheet' type='text/css' href='/cgit.css'/> 2.12 +<link rel='alternate' title='Atom feed' href='http://projects.archlinux.org/svntogit/community.git/atom/spidermonkey/trunk/spidermonkey-Makefile.patch?h=master' type='application/atom+xml'/> 2.13 +<link rel="stylesheet" href="/archnavbar.css" /> 2.14 +<link rel="icon" href="/favicon.ico" type="image/x-icon" /> 2.15 +<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> 2.16 +</head> 2.17 +<body> 2.18 + <div id="archnavbar"><!-- Arch Linux global navigation bar --> 2.19 + <div id="archnavbarlogo"> 2.20 + <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> 2.21 + </div> 2.22 + <div id="archnavbarmenu"> 2.23 + <ul id="archnavbarlist"> 2.24 + <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> 2.25 + <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> 2.26 + <li id="anb-forums"><a href="http://bbs.archlinux.org/" title="Community forums">Forums</a></li> 2.27 + <li id="anb-wiki"><a href="http://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> 2.28 + <li id="anb-bugs"><a href="http://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> 2.29 + <li id="anb-aur"><a href="http://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> 2.30 + <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> 2.31 + </ul> 2.32 + </div> 2.33 + </div><!-- #archnavbar --> 2.34 +<div id='cgit'><table id='header'> 2.35 +<tr> 2.36 +<td class='main'><a href='/'>index</a> : <a title='svntogit/community.git' href='/svntogit/community.git/'>svntogit/community.git</a></td><td class='form'><form method='get' action=''> 2.37 +<select name='h' onchange='this.form.submit();'> 2.38 +<option value='master' selected='selected'>master</option> 2.39 +</select> <input type='submit' name='' value='switch'/></form></td></tr> 2.40 +<tr><td class='sub'>Git clone of the 'community' subversion repository</td><td class='sub right'>Arch Linux Trusted Users</td></tr></table> 2.41 +<table class='tabs'><tr><td> 2.42 +<a href='/svntogit/community.git/'>summary</a><a href='/svntogit/community.git/refs/'>refs</a><a href='/svntogit/community.git/log/spidermonkey/trunk/spidermonkey-Makefile.patch'>log</a><a class='active' href='/svntogit/community.git/tree/spidermonkey/trunk/spidermonkey-Makefile.patch'>tree</a><a href='/svntogit/community.git/commit/spidermonkey/trunk/spidermonkey-Makefile.patch'>commit</a><a href='/svntogit/community.git/diff/spidermonkey/trunk/spidermonkey-Makefile.patch'>diff</a><a href='/svntogit/community.git/stats/spidermonkey/trunk/spidermonkey-Makefile.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/community.git/log/spidermonkey/trunk/spidermonkey-Makefile.patch'> 2.43 +<select name='qt'> 2.44 +<option value='grep'>log msg</option> 2.45 +<option value='author'>author</option> 2.46 +<option value='committer'>committer</option> 2.47 +<option value='range'>range</option> 2.48 +</select> 2.49 +<input class='txt' type='text' size='10' name='q' value=''/> 2.50 +<input type='submit' value='search'/> 2.51 +</form> 2.52 +</td></tr></table> 2.53 +<div class='path'>path: <a href='/svntogit/community.git/tree/'>root</a>/<a href='/svntogit/community.git/tree/spidermonkey'>spidermonkey</a>/<a href='/svntogit/community.git/tree/spidermonkey/trunk'>trunk</a>/<a href='/svntogit/community.git/tree/spidermonkey/trunk/spidermonkey-Makefile.patch'>spidermonkey-Makefile.patch</a></div><div class='content'>blob: abf1f31640e5e22c104cc5852c598ab7fac23a77 (<a href='/svntogit/community.git/plain/spidermonkey/trunk/spidermonkey-Makefile.patch'>plain</a>) 2.54 +<table summary='blob content' class='blob'> 2.55 +<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a> 2.56 +<a class='no' id='n2' name='n2' href='#n2'>2</a> 2.57 +<a class='no' id='n3' name='n3' href='#n3'>3</a> 2.58 +<a class='no' id='n4' name='n4' href='#n4'>4</a> 2.59 +<a class='no' id='n5' name='n5' href='#n5'>5</a> 2.60 +<a class='no' id='n6' name='n6' href='#n6'>6</a> 2.61 +<a class='no' id='n7' name='n7' href='#n7'>7</a> 2.62 +<a class='no' id='n8' name='n8' href='#n8'>8</a> 2.63 +<a class='no' id='n9' name='n9' href='#n9'>9</a> 2.64 +<a class='no' id='n10' name='n10' href='#n10'>10</a> 2.65 +<a class='no' id='n11' name='n11' href='#n11'>11</a> 2.66 +<a class='no' id='n12' name='n12' href='#n12'>12</a> 2.67 +<a class='no' id='n13' name='n13' href='#n13'>13</a> 2.68 +<a class='no' id='n14' name='n14' href='#n14'>14</a> 2.69 +<a class='no' id='n15' name='n15' href='#n15'>15</a> 2.70 +<a class='no' id='n16' name='n16' href='#n16'>16</a> 2.71 +<a class='no' id='n17' name='n17' href='#n17'>17</a> 2.72 +<a class='no' id='n18' name='n18' href='#n18'>18</a> 2.73 +<a class='no' id='n19' name='n19' href='#n19'>19</a> 2.74 +<a class='no' id='n20' name='n20' href='#n20'>20</a> 2.75 +<a class='no' id='n21' name='n21' href='#n21'>21</a> 2.76 +<a class='no' id='n22' name='n22' href='#n22'>22</a> 2.77 +</pre></td> 2.78 +<td class='lines'><pre><code>*** Makefile.ref.orig 2009-02-16 09:56:29.000000000 -0600 2.79 +<span class="hl kwb">--- Makefile.ref 2009-02-16 09:58:59.000000000 -0600</span> 2.80 +*************** 2.81 +*** 169,184 **** 2.82 +<span class="hl kwb">--- 169,185 ----</span> 2.83 + jstypes.h \ 2.84 + jsprvtd.h \ 2.85 + jspubtd.h \ 2.86 + jsregexp.h \ 2.87 + jsscan.h \ 2.88 + jsscope.h \ 2.89 + jsscript.h \ 2.90 + jsstr.h \ 2.91 +<span class="hl kwa">+ jsutil.h \</span> 2.92 + jsxdrapi.h \ 2.93 + jsxml.h \ 2.94 + $(NULL) 2.95 + 2.96 + API_HFILES = \ 2.97 + jsapi.h \ 2.98 + jsdbgapi.h \ 2.99 + $(NULL) 2.100 +</code></pre></td></tr></table> 2.101 +</div> <!-- class=content --> 2.102 +</div> 2.103 +<div class="foot" style="padding-left:1em;padding-right:1em;"> 2.104 +<p>Copyright © 2002-2010 <a href="mailto:jvinet@zeroflux.org" 2.105 +title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" 2.106 +title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo 2.107 +are recognized trademarks. Some rights reserved. The registered trademark 2.108 +Linux© is used pursuant to a sublicense from LMI, the exclusive licensee 2.109 +of Linus Torvalds, owner of the mark on a world-wide basis.</p> 2.110 +</div> 2.111 +</div> <!-- id=cgit --> 2.112 +</body> 2.113 +</html>