DELTA 31823 4917 28 SVNŠ!ŠX 0GˆwH―j‰7*#if defined(HAVE_FSEEKO) #define LUA_USE_FSEEKOENDREP DELTA 29381 0 741 SVN‘₯A<–k€“ H€Tƒ€jV…#«F…@«R†x€jvˆ4`‰)ŠpŠ‚v‹€W„4ŒMfreeciv_lua.patch lua-5.3/freeciv_lua.patch --- lua-5.3/freeciv_lua.patch 2016-06-25 01:06:33.039306525 +0300 +++ lua-5.3/freeciv_lua.patch 2016-06-25 01:10:28.171040689 +0300 @@ -1,71 +0,0 @@ -diff -Nurd lua-5.3/src/ldo.c lua-5.3/src/ldo.c ---- lua-5.3/src/ldo.c 2015-08-05 01:16:36.823491105 +0300 -+++ lua-5.3/src/ldo.c 2015-08-05 01:02:57.653012740 +0300 -@@ -60,7 +60,7 @@ - try { a } catch(...) { if ((c)->status == 0) (c)->status = -1; } - #define luai_jmpbuf int /* dummy variable */ - --#elif defined(LUA_USE_POSIX) /* }{ */ -+#elif defined(LUA_USE_ULONGJMP) /* }{ */ - - /* in POSIX, try _longjmp/_setjmp (more efficient) */ - #define LUAI_THROW(L,c) _longjmp((c)->b, 1) -diff -Nurd lua-5.3/src/liolib.c lua-5.3/src/liolib.c ---- lua-5.3/src/liolib.c 2015-08-05 01:16:36.823491105 +0300 -+++ lua-5.3/src/liolib.c 2015-08-05 01:02:57.653012740 +0300 -@@ -47,7 +47,7 @@ - - #if !defined(l_popen) /* { */ - --#if defined(LUA_USE_POSIX) /* { */ -+#if defined(LUA_USE_POPEN) /* { */ - - #define l_popen(L,c,m) (fflush(NULL), popen(c,m)) - #define l_pclose(L,file) (pclose(file)) -diff -Nurd lua-5.3/src/loslib.c lua-5.3/src/loslib.c ---- lua-5.3/src/loslib.c 2015-08-05 01:16:36.823491105 +0300 -+++ lua-5.3/src/loslib.c 2015-08-05 01:23:04.578681552 +0300 -@@ -65,7 +65,7 @@ - ** where it uses gmtime_r/localtime_r - */ - --#if defined(LUA_USE_POSIX) /* { */ -+#if defined(LUA_USE_GMTIME_R) /* { */ - - #define l_gmtime(t,r) gmtime_r(t,r) - #define l_localtime(t,r) localtime_r(t,r) -@@ -92,7 +92,7 @@ - */ - #if !defined(lua_tmpnam) /* { */ - --#if defined(LUA_USE_POSIX) /* { */ -+#if defined(LUA_USE_MKSTEMP) /* { */ - - #include - -diff -Nurd lua-5.3/src/luaconf.h lua-5.3/src/luaconf.h ---- lua-5.3/src/luaconf.h 2015-08-05 01:16:36.823491105 +0300 -+++ lua-5.3/src/luaconf.h 2015-08-05 01:02:57.657012735 +0300 -@@ -11,6 +11,7 @@ - #include - #include - -+#include "localluaconf.h" - - /* - ** =================================================================== -@@ -61,14 +62,12 @@ - #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 */ - #endif - - - #if defined(LUA_USE_MACOSX) - #define LUA_USE_POSIX - #define LUA_USE_DLOPEN /* MacOS does not need -ldl */ --#define LUA_USE_READLINE /* needs an extra library: -lreadline */ - #endif - - 6-06-25 01:06:49.199270913 +0300 +++ lua-5.3/src/ldo.c 2016-06-23 09:06:32.8783316936-06-25 01:07:29.151182940 +0300 +++ lua-5.3/src/liolib.c 2016-06-25 01:05:21.175465084 +0300 @@ -53,7 +53@@ -102,7 +102,7 @@ #if !defined(l_fseekFSEEKO) /* { */ #include 6-06-25 01:09:00.591037419 +0300 +++ lua-5.3/src/loslib.c 2016-06-23 09:06:32.878331693 +0300 @@ -81,7 +81 108,7 +108 6-06-25 01:06:49.203270905 +0300 +++ lua-5.3/src/luaconf.h 2016-06-23 09:06:32.88233168ENDREP DELTA 32979 5130 209 SVNœoœp ‘†‹d‘ FSEEKOENDREP DELTA 32985 184 56 SVNƒΒ~ƒΓ ‚Ί,ŽˆS‚Ί+AC_FUNC_FSEEKOENDREP id: 149.5qi.r33072/3243 type: file pred: 149.5qi.r32985/267 count: 520 text: 33072 3177 40 57741 ebcb801c3cf99c5d3c869e29602500a9 props: 10922 613 112 0 391fbfe6c7602972dbce1584a6808d2a cpath: /branches/S2_6/configure.ac copyroot: 27474 /branches/S2_6 id: 19qx.5qi.r33072/3496 type: file pred: 19qx.5qi.r29381/1353 count: 5 text: 33072 99 2995 4801 82d79e47bc3269cece23f797feb0f34a cpath: /branches/S2_6/dependencies/lua-5.3/freeciv_lua.patch copyroot: 27474 /branches/S2_6 id: 19rn.5qi.r33072/3719 type: file pred: 19rn.5qi.r32979/42577 count: 9 text: 33072 3119 30 20080 f9f3a8f724b755276946c94b8d16ace8 props: 26905 185403 34 0 25e6c2f7558b7484000d4d090dea5b92 cpath: /branches/S2_6/dependencies/lua-5.3/src/liolib.c copyroot: 27474 /branches/S2_6 id: 19rx.5qi.r33072/3997 type: file pred: 19rx.5qi.r31823/5233 count: 6 text: 33072 0 72 1368 f2fa9ab8cca9b988c2ff2990a5c14332 props: 26905 175965 34 0 25e6c2f7558b7484000d4d090dea5b92 cpath: /branches/S2_6/dependencies/lua-5.3/src/localluaconf.h copyroot: 27474 /branches/S2_6 PLAIN K 11 Makefile.am V 23 file 19qz.5ck.r27466/56 K 6 lapi.c V 26 file 19r1.5qi.r32979/39510 K 6 lapi.h V 26 file 19r2.5qi.r29208/34060 K 9 lauxlib.c V 26 file 19r3.5qi.r32979/39789 K 9 lauxlib.h V 26 file 19r4.5qi.r30960/48845 K 10 lbaselib.c V 26 file 19r5.5qi.r32979/40067 K 9 lbitlib.c V 26 file 19r6.5qi.r30960/49407 K 7 lcode.c V 26 file 19r7.5qi.r32979/40349 K 7 lcode.h V 26 file 19r8.5qi.r32979/40631 K 10 lcorolib.c V 26 file 19r9.5qi.r32979/40911 K 8 lctype.c V 26 file 19ra.5ck.r27411/38656 K 8 lctype.h V 27 file 19rb.5ck.r26905/175381 K 8 ldblib.c V 26 file 19rc.5qi.r30960/49967 K 8 ldebug.c V 26 file 19rd.5qi.r32979/41191 K 8 ldebug.h V 26 file 19re.5qi.r29208/35742 K 5 ldo.c V 26 file 19rf.5qi.r32979/41471 K 5 ldo.h V 26 file 19rg.5qi.r32979/41749 K 7 ldump.c V 26 file 19rh.5qi.r30960/51083 K 7 lfunc.c V 26 file 19ri.5ck.r27411/45769 K 7 lfunc.h V 26 file 19rj.5qi.r29208/36853 K 5 lgc.c V 26 file 19rk.5qi.r32979/42025 K 5 lgc.h V 26 file 19rl.5qi.r32979/42302 K 7 linit.c V 25 file 19rm.5qi.r27593/6977 K 8 liolib.c V 25 file 19rn.5qi.r33072/3719 K 6 llex.c V 26 file 19ro.5qi.r32979/42857 K 6 llex.h V 26 file 19rp.5qi.r32979/43135 K 9 llimits.h V 26 file 19rq.5qi.r30960/52477 K 10 lmathlib.c V 26 file 19rr.5qi.r30960/52758 K 6 lmem.c V 26 file 19rs.5qi.r29208/38532 K 6 lmem.h V 26 file 19rt.5ck.r27411/38394 K 9 loadlib.c V 26 file 19ru.5qi.r30960/53039 K 9 lobject.c V 26 file 19rv.5qi.r32979/43411 K 9 lobject.h V 26 file 19rw.5qi.r30960/53602 K 14 localluaconf.h V 25 file 19rx.5qi.r33072/3997 K 10 lopcodes.c V 25 file 19ry.5qi.r27593/6698 K 10 lopcodes.h V 26 file 19rz.5ck.r27411/41559 K 8 loslib.c V 26 file 19s0.5qi.r32979/43694 K 9 lparser.c V 26 file 19s1.5qi.r32979/43976 K 9 lparser.h V 26 file 19s2.5qi.r32979/44257 K 9 lprefix.h V 26 file 1j4b.5qi.r27508/28802 K 8 lstate.c V 26 file 19s3.5qi.r30960/54447 K 8 lstate.h V 26 file 19s4.5qi.r32979/44538 K 9 lstring.c V 26 file 19s5.5qi.r30960/55007 K 9 lstring.h V 26 file 19s6.5qi.r30960/55289 K 9 lstrlib.c V 26 file 19s7.5qi.r32979/44816 K 8 ltable.c V 26 file 19s8.5qi.r30960/55849 K 8 ltable.h V 26 file 19s9.5qi.r30960/56131 K 9 ltablib.c V 26 file 19sa.5qi.r32979/45098 K 5 ltm.c V 26 file 19sb.5qi.r32979/45379 K 5 ltm.h V 26 file 19sc.5qi.r32979/45656 K 5 lua.h V 26 file 19sd.5qi.r32979/45932 K 7 lua.hpp V 27 file 19se.5ck.r25888/622391 K 9 luaconf.h V 26 file 19sf.5qi.r32979/46210 K 8 lualib.h V 27 file 19sg.5ck.r26905/186081 K 9 lundump.c V 26 file 19sh.5qi.r30960/57530 K 9 lundump.h V 26 file 19si.5qi.r30960/57811 K 10 lutf8lib.c V 26 file 19sj.5qi.r29208/42736 K 5 lvm.c V 26 file 19sk.5qi.r32979/46491 K 5 lvm.h V 26 file 19sl.5qi.r32979/46770 K 6 lzio.c V 26 file 19sm.5qi.r30960/58648 K 6 lzio.h V 26 file 19sn.5qi.r30960/58924 END ENDREP id: 19qy.5qi.r33072/7030 type: dir pred: 19qy.5qi.r32979/49801 count: 19 text: 33072 4276 2741 0 39a5fd33c6ebbff074e2ea0b73fd21c2 props: 28037 0 53 0 a527b216afb99426b763a1e313c531be cpath: /branches/S2_6/dependencies/lua-5.3/src copyroot: 27474 /branches/S2_6 PLAIN K 11 Makefile.am V 23 file 19qn.5qi.r27496/53 K 6 README V 26 file 19qp.5qi.r32979/38425 K 7 Version V 26 file 19qq.5qi.r32979/38639 K 3 doc V 25 dir 19qr.5qi.r32979/39301 K 17 freeciv_lua.patch V 25 file 19qx.5qi.r33072/3496 K 3 src V 24 dir 19qy.5qi.r33072/7030 END ENDREP id: 19ql.5qi.r33072/7573 type: dir pred: 19ql.5qi.r32979/50346 count: 21 text: 33072 7292 268 0 198fbe26ca45c42914e0a10c604ccf12 props: 28037 606 47 0 c348519a2f02d6470452d3eca58ed415 cpath: /branches/S2_6/dependencies/lua-5.3 copyroot: 27474 /branches/S2_6 PLAIN K 11 Makefile.am V 23 file 31m.5qi.r27699/592 K 7 cvercmp V 22 dir acu.5qi.r31316/795 K 7 lua-5.3 V 24 dir 19ql.5qi.r33072/7573 K 6 luasql V 23 dir 6k8.5r3.r32418/2624 K 2 m4 V 23 dir 4ef.5ck.r25384/7703 K 9 tolua-5.2 V 24 dir c6p.5qi.r31411/81342 END ENDREP id: 2yu.5qi.r33072/8097 type: dir pred: 2yu.5qi.r32979/50872 count: 131 text: 33072 7832 252 0 ad079c240212b10aee0a4403d6331804 props: 14844 2808 53 0 a527b216afb99426b763a1e313c531be cpath: /branches/S2_6/dependencies copyroot: 27474 /branches/S2_6 PLAIN K 9 ABOUT-NLS V 24 file fu.5ck.r27270/69307 K 7 AUTHORS V 24 file 5u.5ck.r22143/14016 K 7 COPYING V 22 file 1h.5qi.r29455/952 K 9 ChangeLog V 26 file 6l.5qi.r31298/7507168 K 7 INSTALL V 22 file 6.5qi.r31740/1317 K 11 Makefile.am V 22 file 59.5qi.r31920/516 K 4 NEWS V 24 file 6m.5ck.r25634/30702 K 6 README V 20 file 7.0.r4421/96382 K 2 ai V 21 dir 8.5qi.r33022/3186 K 10 autogen.sh V 22 file 12o.5qi.r32636/46 K 9 bootstrap V 23 dir 2p5.5qi.r32590/4079 K 6 client V 21 dir d.5qi.r33069/5097 K 6 common V 22 dir p.5qi.r33069/10916 K 12 configure.ac V 24 file 149.5qi.r33072/3243 K 4 data V 21 dir w.5qi.r33043/4871 K 12 dependencies V 23 dir 2yu.5qi.r33072/8097 K 3 doc V 23 dir k7.5qi.r33051/13080 K 10 fc_version V 25 file 2lo.5qj.r33069/11157 K 11 gen_headers V 23 dir 1hsw.5qi.r32276/968 K 3 lua V 24 dir 2c5p.5qi.r31920/4972 K 2 m4 V 23 dir 12p.5qi.r32514/2585 K 7 scripts V 23 dir 2yo.5qi.r31853/1104 K 6 server V 22 dir z.5qi.r33069/15630 K 5 tests V 22 dir 2g9.5qi.r32362/652 K 5 tools V 24 dir 4pj.5qp.r33060/47634 K 12 translations V 24 dir t0a.5qi.r33054/32125 K 7 utility V 23 dir 1c.5qi.r33060/51415 K 3 vms V 25 dir u9.5ck.r21528/1396085 K 5 win32 V 23 dir 2eu.5qi.r32896/7091 END ENDREP id: 3.5qi.r33072/9556 type: dir pred: 3.5qi.r33069/17083 count: 20814 text: 33072 8348 1195 0 d3dcf27a2af02b52b8cc33a84788aa64 props: 28037 14463 292 0 9e1d5de0253c723466868990c52c129f cpath: /branches/S2_6 copyroot: 27474 /branches/S2_6 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 22 dir 3.5kv.r33070/15912 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.r33072/10190 type: dir pred: 1.0.r33070/16548 count: 11395 text: 33072 9795 382 0 a099f1267cf1779fb7944557b892f1b8 cpath: /branches copyroot: 0 / PLAIN K 8 branches V 20 dir 1.0.r33072/10190 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.r33072/10510 type: dir pred: 0.0.r33071/9849 count: 33072 text: 33072 10345 152 0 5fdfec6af9be51e23e916ae16174e3af cpath: / copyroot: 0 / 149.5qi.t33071-1 modify true false /branches/S2_6/configure.ac 19qx.5qi.t33071-1 modify true false /branches/S2_6/dependencies/lua-5.3/freeciv_lua.patch 19rn.5qi.t33071-1 modify true false /branches/S2_6/dependencies/lua-5.3/src/liolib.c 19rx.5qi.t33071-1 modify true false /branches/S2_6/dependencies/lua-5.3/src/localluaconf.h 10510 10657