Annotation of /trunk/subversion/patches/subversion-1.8.13-r1655262+.patch
Parent Directory
| 
Revision Log
Revision 2562 -
(hide annotations)
(download)
Wed Apr 22 07:43:58 2015 UTC (9 years ago) by niro
File size: 1263 byte(s)
Wed Apr 22 07:43:58 2015 UTC (9 years ago) by niro
File size: 1263 byte(s)
-fix build issues with swig3
| 1 | niro | 2562 | # ./pullrev.sh 1655262 1658347 |
| 2 | http://svn.apache.org/viewvc?view=revision&revision=1655262 | ||
| 3 | http://svn.apache.org/viewvc?view=revision&revision=1658347 | ||
| 4 | |||
| 5 | --- subversion-1.8.13/subversion/bindings/swig/core.i | ||
| 6 | +++ subversion-1.8.13/subversion/bindings/swig/core.i | ||
| 7 | @@ -800,10 +800,11 @@ | ||
| 8 | #endif | ||
| 9 | |||
| 10 | #ifdef SWIGPYTHON | ||
| 11 | -# The auth baton depends on the providers, so we preserve a | ||
| 12 | -# reference to them inside the wrapper. This way, if all external | ||
| 13 | -# references to the providers are gone, they will still be alive, | ||
| 14 | -# keeping the baton valid. | ||
| 15 | +/* The auth baton depends on the providers, so we preserve a | ||
| 16 | + reference to them inside the wrapper. This way, if all external | ||
| 17 | + references to the providers are gone, they will still be alive, | ||
| 18 | + keeping the baton valid. | ||
| 19 | + */ | ||
| 20 | %feature("pythonappend") svn_auth_open %{ | ||
| 21 | val.__dict__["_deps"] = list(args[0]) | ||
| 22 | %} | ||
| 23 | --- subversion-1.8.13/subversion/bindings/swig/svn_delta.i | ||
| 24 | +++ subversion-1.8.13/subversion/bindings/swig/svn_delta.i | ||
| 25 | @@ -205,11 +205,11 @@ | ||
| 26 | %include svn_delta_h.swg | ||
| 27 | |||
| 28 | #ifdef SWIGPYTHON | ||
| 29 | -%pythoncode { | ||
| 30 | +%pythoncode %{ | ||
| 31 | # This function is for backwards compatibility only. | ||
| 32 | # Use svn_txdelta_window_t.ops instead. | ||
| 33 | svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get | ||
| 34 | -} | ||
| 35 | +%} | ||
| 36 | #endif | ||
| 37 | |||
| 38 | #ifdef SWIGRUBY |