DELTA 32499 0 1477 SVNƒ΄ƒ΄ ‚—ށœq‚—AC_FUNC_FSEEKOENDREP DELTA 25595 451 68 SVN‰,‰c /ˆR―bˆJ#if defined(HAVE_FSEEKO) #define LUA_USE_FSEEKOENDREP DELTA 22739 28899 1237 SVN‰G—&+Œ €JsQr€ƒDE‡}H…=€E‡}H…=€„z‡4‚lua-5.2/freeciv_lua.patch lua-5.2/freeciv_lua.patch --- lua-5.2/freeciv_lua.patch 2016-06-25 01:25:58.950034475 +0300 +++ lua-5.2/freeciv_lua.patch 2016-06-25 01:30:46.753551478 +0300 @@ -1,27 +0,0 @@ --+++ freeciv/dependencies/lua-5.2/src/luaconf.h 2013-04-19 01:57:26.310354514 +0300 -@@ -11,6 +11,7 @@ - #include - #include - -+#include "localluaconf.h" - - /* - ** ================================================================== -@@ -43,7 +44,6 @@ - #if defined(LUA_USE_LINUX) - #define LUA_USE_POSIX - #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ --#define LUA_USE_READLINE /* needs some extra libraries */ --- #define LUA_USE_LONGLONG /* assume support for long long */ -@@ -52,7 +52,6 @@ - #if defined(LUA_USE_MACOSX) - #define LUA_USE_POSIX - #define LUA_USE_DLOPEN /* does not need -ldl */ --#define LUA_USE_READLINE /* needs an extra library: -lreadline */ --- #define LUA_USE_LONGLONG /* assume support for long long */ diff -Nurd lua-5.2/src/liolib.c lua-5.2/src/liolib.c --- lua-5.2/src/liolib.c 2016-06-25 01:25:58.970034443 +0300 +++ lua-5.2/src/liolib.c 2016-06-25 01:29:07.605721751 +0300 @@ -86,7 +86,7 @@ #if !defined(lua_fseek) && !defined(LUA_ANSI) /* { */ -#if defined(LUA_USE_POSIX) /* { */ +#if defined(LUA_USE_SEEKO) /* { */ #define l_fseek(f,o,w) fseeko(f,o,w) #define l_ftell(f) ftello(f) diff -Nurd lua-5.2/src/luaconf.h lua-5.2/src/luaconf.h --- lua-5.2/src/luaconf.h 2016-06-25 01:26:42.313964121 +0300 +++ lua-5.2/src/luaconf.h 2015-03-21 20:01:35.286587205 +02ENDREP DELTA 23890 22221 925 SVN†,†, J…φ]OSEEKOENDREP id: 149.5kv.r33073/1846 type: file pred: 149.5kv.r32499/1504 count: 433 text: 33073 0 40 55829 ce86329b2c5900426423ed12298e4d36 props: 10922 613 112 0 391fbfe6c7602972dbce1584a6808d2a cpath: /branches/S2_5/configure.ac copyroot: 22812 /branches/S2_5 id: nr9.5kv.r33073/2097 type: file pred: nr9.5ck.r22739/43689 count: 1 text: 33073 159 1600 2982 2329ce9025e68898128a2a884832878c cpath: /branches/S2_5/dependencies/lua-5.2/freeciv_lua.patch copyroot: 22812 /branches/S2_5 id: 9zw.5kv.r33073/2320 type: file pred: 9zw.5kv.r26906/141817 count: 4 text: 33073 1789 28 17196 aadd94796c87b7e6ad977b2eda0f8122 props: 26906 141770 34 0 25e6c2f7558b7484000d4d090dea5b92 cpath: /branches/S2_5/dependencies/lua-5.2/src/liolib.c copyroot: 22812 /branches/S2_5 id: a06.5kv.r33073/2597 type: file pred: a06.5kv.r26906/150601 count: 5 text: 33073 66 67 1251 aedb308aebcd4d90602de9b5f2667da8 props: 26906 150554 34 0 25e6c2f7558b7484000d4d090dea5b92 cpath: /branches/S2_5/dependencies/lua-5.2/src/localluaconf.h copyroot: 22812 /branches/S2_5 PLAIN K 11 Makefile.am V 23 file 9z8.5kv.r23969/164 K 6 lapi.c V 26 file 9za.5kv.r26906/136966 K 6 lapi.h V 26 file 9zb.5kv.r26906/137613 K 9 lauxlib.c V 26 file 9zc.5kv.r26906/148653 K 9 lauxlib.h V 26 file 9zd.5kv.r26906/150279 K 10 lbaselib.c V 26 file 9ze.5kv.r26906/134696 K 9 lbitlib.c V 26 file 9zf.5kv.r26906/135671 K 7 lcode.c V 26 file 9zg.5kv.r26906/144748 K 7 lcode.h V 26 file 9zh.5kv.r26906/146700 K 10 lcorolib.c V 26 file 9zi.5kv.r26906/139863 K 8 lctype.c V 26 file 9zj.5kv.r26906/148328 K 8 lctype.h V 26 file 9zk.5kv.r26906/149957 K 8 ldblib.c V 24 file 9zl.5kv.r28595/4697 K 8 ldebug.c V 24 file 9zm.5kv.r28595/6080 K 8 ldebug.h V 26 file 9zn.5kv.r26906/140843 K 5 ldo.c V 26 file 9zo.5kv.r26906/135024 K 5 ldo.h V 26 file 9zp.5kv.r26906/136319 K 7 ldump.c V 26 file 9zq.5kv.r26906/135347 K 7 lfunc.c V 26 file 9zr.5kv.r26906/140519 K 7 lfunc.h V 26 file 9zs.5kv.r26906/142144 K 5 lgc.c V 24 file 9zt.5kv.r28595/6355 K 5 lgc.h V 26 file 9zu.5kv.r26906/141495 K 7 linit.c V 26 file 9zv.5kv.r26906/143120 K 8 liolib.c V 24 file 9zw.5kv.r33073/2320 K 6 llex.c V 24 file 9zx.5kv.r28595/5253 K 6 llex.h V 26 file 9zy.5kv.r26906/133076 K 9 llimits.h V 26 file 9zz.5kv.r26906/143771 K 10 lmathlib.c V 26 file a00.5kv.r26906/147024 K 6 lmem.c V 26 file a01.5kv.r26906/146377 K 6 lmem.h V 26 file a02.5kv.r26906/148004 K 9 loadlib.c V 26 file a03.5kv.r26906/140190 K 9 lobject.c V 26 file a04.5kv.r26906/143444 K 9 lobject.h V 24 file a05.5kv.r28595/4418 K 14 localluaconf.h V 24 file a06.5kv.r33073/2597 K 10 lopcodes.c V 26 file a07.5kv.r26906/151252 K 10 lopcodes.h V 24 file a08.5kv.r28595/5802 K 8 loslib.c V 26 file a09.5kv.r26906/144423 K 9 lparser.c V 26 file a0a.5kv.r26906/141168 K 9 lparser.h V 26 file a0b.5kv.r26906/142468 K 8 lstate.c V 26 file a0c.5kv.r26906/147351 K 8 lstate.h V 26 file a0d.5kv.r26906/148980 K 9 lstring.c V 26 file a0e.5kv.r26906/144097 K 9 lstring.h V 26 file a0f.5kv.r26906/145724 K 9 lstrlib.c V 26 file a0g.5kv.r26906/133722 K 8 ltable.c V 26 file a0h.5kv.r26906/149305 K 8 ltable.h V 26 file a0i.5kv.r26906/150928 K 9 ltablib.c V 24 file a0j.5kv.r28595/5524 K 5 ltm.c V 26 file a0k.5kv.r26906/137934 K 5 ltm.h V 26 file a0l.5kv.r26906/138577 K 5 lua.h V 24 file a0m.5kv.r28595/4145 K 7 lua.hpp V 26 file a0n.5ck.r20749/551457 K 9 luaconf.h V 24 file a0p.5kv.r28595/4975 K 8 lualib.h V 26 file a0q.5kv.r26906/142795 K 9 lundump.c V 26 file a0r.5kv.r26906/136640 K 9 lundump.h V 26 file a0s.5kv.r26906/137289 K 5 lvm.c V 26 file a0t.5kv.r26906/138255 K 5 lvm.h V 26 file a0u.5kv.r26906/139225 K 6 lzio.c V 26 file a0v.5kv.r26906/134048 K 6 lzio.h V 26 file a0w.5kv.r26906/135997 END ENDREP id: 9z7.5kv.r33073/5516 type: dir pred: 9z7.5kv.r28595/9271 count: 20 text: 33073 2877 2626 0 618315b5d1cf102316d2387a03b38fc6 props: 23742 842 53 0 1aad128f6d028f535e9ce7233326568e cpath: /branches/S2_5/dependencies/lua-5.2/src copyroot: 22812 /branches/S2_5 PLAIN K 11 Makefile.am V 25 file 9z1.5ck.r22739/53515 K 6 README V 24 file 9z2.5kv.r28595/9535 K 7 Version V 24 file 9z3.5kv.r28595/3445 K 3 doc V 23 dir 9z4.5kv.r28595/3940 K 17 freeciv_lua.patch V 24 file nr9.5kv.r33073/2097 K 3 src V 23 dir 9z7.5kv.r33073/5516 END ENDREP id: 9yx.5kv.r33073/6052 type: dir pred: 9yx.5kv.r28595/10020 count: 22 text: 33073 5777 262 0 435dee80e02d2d0f7d60e204cfb7f758 props: 23742 1448 47 0 bf36bdb5202732a1b9a911cc1234183c cpath: /branches/S2_5/dependencies/lua-5.2 copyroot: 22812 /branches/S2_5 PLAIN K 11 Makefile.am V 23 file 31m.5ck.r22501/750 K 7 cvercmp V 22 dir acu.5kv.r31544/795 K 7 lua-5.2 V 23 dir 9yx.5kv.r33073/6052 K 6 luasql V 25 dir 6k8.5nh.r26906/164999 K 2 m4 V 23 dir 4ef.5ck.r21870/4968 K 9 tolua-5.2 V 25 dir c6p.5kv.r26906/160051 END ENDREP id: 2yu.5kv.r33073/6577 type: dir pred: 2yu.5kv.r31544/1314 count: 104 text: 33073 6310 254 0 63dfe5174448d9c1a034b46cd58bd9d8 props: 14844 2808 53 0 a527b216afb99426b763a1e313c531be cpath: /branches/S2_5/dependencies copyroot: 22812 /branches/S2_5 PLAIN K 9 ABOUT-NLS V 24 file fu.5kv.r23463/86338 K 7 AUTHORS V 24 file 5u.5ck.r22143/14016 K 7 COPYING V 22 file 1h.5kv.r29456/845 K 9 ChangeLog V 26 file 6l.5kv.r32703/4669962 K 7 INSTALL V 21 file 6.5kv.r29707/213 K 11 Makefile.am V 22 file 59.5kv.r31921/510 K 4 NEWS V 22 file 6m.5kv.r28524/894 K 8 NEWS-2.5 V 25 file 1h59.5kv.r32701/9912 K 6 README V 20 file 7.0.r4421/96382 K 2 ai V 21 dir 8.5kv.r32366/2590 K 10 autogen.sh V 22 file 12o.5kv.r32731/46 K 9 bootstrap V 24 dir 2p5.5kv.r32828/24335 K 6 client V 21 dir d.5kv.r33070/5134 K 6 common V 21 dir p.5kv.r33070/9936 K 12 configure.ac V 24 file 149.5kv.r33073/1846 K 4 data V 22 dir w.5kv.r32828/44797 K 6 debian V 22 dir 5w.5kv.r23304/4091 K 12 dependencies V 23 dir 2yu.5kv.r33073/6577 K 11 diff_ignore V 24 file qq.5ck.r21039/26581 K 3 doc V 23 dir k7.5kv.r33052/12976 K 10 fc_version V 25 file 2lo.5kw.r33070/10176 K 3 lua V 24 dir 2c60.5kv.r31921/4513 K 2 m4 V 23 dir 12p.5kv.r32515/2584 K 7 scripts V 23 dir 2yo.5kv.r28718/5390 K 6 server V 22 dir z.5kv.r33070/14379 K 5 tests V 22 dir 2g9.5kv.r32363/652 K 5 tools V 24 dir 4pj.5lo.r33018/15519 K 12 translations V 24 dir t0n.5kv.r33053/28262 K 7 utility V 22 dir 1c.5kv.r32931/3005 K 3 vms V 25 dir u9.5ck.r21528/1396085 K 5 win32 V 23 dir 2eu.5kv.r32489/1706 END ENDREP id: 3.5kv.r33073/8116 type: dir pred: 3.5kv.r33070/15912 count: 18571 text: 33073 6827 1276 0 855a31e10ae4a6ba6f78b46d8d208c60 props: 20140 3888 282 0 e4bb46e81629a60eef613b169b23a9ea cpath: /branches/S2_5 copyroot: 22812 /branches/S2_5 PLAIN K 5 S1_14 V 21 dir 3.21.r18109/18803 K 4 S2_0 V 21 dir 3.10x.r21862/4178 K 4 S2_1 V 22 dir 3.59e.r20026/11014 K 4 S2_2 V 21 dir 3.5cy.r21861/5036 K 4 S2_3 V 21 dir 3.5f2.r29458/5135 K 4 S2_4 V 23 dir 3.5ii.r32693/294508 K 4 S2_5 V 21 dir 3.5kv.r33073/8116 K 6 S2_5_3 V 23 dir 3.5ut.r31805/553797 K 4 S2_6 V 21 dir 3.5qi.r33072/9556 K 11 freeciv-web V 22 dir 3.5bl.r13594/14918 END ENDREP id: 1.0.r33073/8748 type: dir pred: 1.0.r33072/10190 count: 11396 text: 33073 8354 381 0 e7451e728623b225a0a964889b6904d7 cpath: /branches copyroot: 0 / PLAIN K 8 branches V 19 dir 1.0.r33073/8748 K 4 tags V 19 dir 2.0.r32705/6625 K 5 trunk V 21 dir 3.5ck.r33071/9461 K 7 website V 20 dir 3ge.0.r32723/802 END ENDREP id: 0.0.r33073/9066 type: dir pred: 0.0.r33072/10510 count: 33073 text: 33073 8902 151 0 fcec75e1fc4e3c04dcaba6ab7687196c cpath: / copyroot: 0 / 149.5kv.t33072-1 modify true false /branches/S2_5/configure.ac nr9.5kv.t33072-1 modify true false /branches/S2_5/dependencies/lua-5.2/freeciv_lua.patch 9zw.5kv.t33072-1 modify true false /branches/S2_5/dependencies/lua-5.2/src/liolib.c a06.5kv.t33072-1 modify true false /branches/S2_5/dependencies/lua-5.2/src/localluaconf.h 9066 9212