1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
Index: subversion-1.4.6/build/ac-macros/neon.m4
===================================================================
--- subversion-1.4.6.orig/build/ac-macros/neon.m4
+++ subversion-1.4.6/build/ac-macros/neon.m4
@@ -50,14 +50,18 @@ AC_DEFUN(SVN_LIB_NEON,
NEON_VERSION=`cat $abs_srcdir/neon/.version`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
[Define to 1 if you have Neon 0.25 or later.])
fi
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
[Define to 1 if you have Neon 0.26 or later.])
fi
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
+ [Define to 1 if you have Neon 0.27 or later.])
+ fi
for svn_allowed_neon in $NEON_ALLOWED_LIST; do
if test "$NEON_VERSION" = "$svn_allowed_neon" ||
@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG,
NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
AC_MSG_RESULT([$NEON_VERSION])
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
[Define to 1 if you have Neon 0.25 or later.])
fi
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
[Define to 1 if you have Neon 0.26 or later.])
fi
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
+ [Define to 1 if you have Neon 0.27 or later.])
+ fi
for svn_allowed_neon in $NEON_ALLOWED_LIST; do
if test "$NEON_VERSION" = "$svn_allowed_neon" ||
Index: subversion-1.4.6/subversion/libsvn_ra_dav/session.c
===================================================================
--- subversion-1.4.6.orig/subversion/libsvn_ra_dav/session.c
+++ subversion-1.4.6/subversion/libsvn_ra_dav/session.c
@@ -575,7 +575,11 @@ typedef struct neonprogress_baton_t
} neonprogress_baton_t;
static void
+#ifdef SVN_NEON_0_27
+ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total)
+#else
ra_dav_neonprogress(void *baton, off_t progress, off_t total)
+#endif /* SVN_NEON_0_27 */
{
const neonprogress_baton_t *neonprogress_baton = baton;
if (neonprogress_baton->progress_func)
|
