| 1 |
hollow 08/03/02 11:26:26 |
| 2 |
|
| 3 |
Added: subversion-1.4.6-neon-0.28.patch |
| 4 |
Log: |
| 5 |
add support for neon 0.28.0 wrt #210535 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: subversion-1.4.6-neon-0.28.patch |
| 15 |
=================================================================== |
| 16 |
--- build/ac-macros/neon.m4 |
| 17 |
+++ build/ac-macros/neon.m4 |
| 18 |
@@ -50,14 +50,18 @@ |
| 19 |
NEON_VERSION=`cat $abs_srcdir/neon/.version` |
| 20 |
AC_MSG_RESULT([$NEON_VERSION]) |
| 21 |
|
| 22 |
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then |
| 23 |
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then |
| 24 |
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], |
| 25 |
[Define to 1 if you have Neon 0.25 or later.]) |
| 26 |
fi |
| 27 |
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then |
| 28 |
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then |
| 29 |
AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], |
| 30 |
[Define to 1 if you have Neon 0.26 or later.]) |
| 31 |
fi |
| 32 |
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then |
| 33 |
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], |
| 34 |
+ [Define to 1 if you have Neon 0.27 or later.]) |
| 35 |
+ fi |
| 36 |
|
| 37 |
for svn_allowed_neon in $NEON_ALLOWED_LIST; do |
| 38 |
if test "$NEON_VERSION" = "$svn_allowed_neon" || |
| 39 |
@@ -127,14 +131,18 @@ |
| 40 |
NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'` |
| 41 |
AC_MSG_RESULT([$NEON_VERSION]) |
| 42 |
|
| 43 |
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then |
| 44 |
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then |
| 45 |
AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1], |
| 46 |
[Define to 1 if you have Neon 0.25 or later.]) |
| 47 |
fi |
| 48 |
- if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then |
| 49 |
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then |
| 50 |
AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1], |
| 51 |
[Define to 1 if you have Neon 0.26 or later.]) |
| 52 |
fi |
| 53 |
+ if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then |
| 54 |
+ AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1], |
| 55 |
+ [Define to 1 if you have Neon 0.27 or later.]) |
| 56 |
+ fi |
| 57 |
|
| 58 |
for svn_allowed_neon in $NEON_ALLOWED_LIST; do |
| 59 |
if test "$NEON_VERSION" = "$svn_allowed_neon" || |
| 60 |
--- subversion/libsvn_ra_dav/session.c |
| 61 |
+++ subversion/libsvn_ra_dav/session.c |
| 62 |
@@ -575,7 +575,11 @@ |
| 63 |
} neonprogress_baton_t; |
| 64 |
|
| 65 |
static void |
| 66 |
+#ifdef SVN_NEON_0_27 |
| 67 |
+ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total) |
| 68 |
+#else |
| 69 |
ra_dav_neonprogress(void *baton, off_t progress, off_t total) |
| 70 |
+#endif /* SVN_NEON_0_27 */ |
| 71 |
{ |
| 72 |
const neonprogress_baton_t *neonprogress_baton = baton; |
| 73 |
if (neonprogress_baton->progress_func) |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
-- |
| 78 |
gentoo-commits@l.g.o mailing list |
Archives