diff options
author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/extra-testing/subversion/subversion-neon.patch | |
parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/extra-testing/subversion/subversion-neon.patch')
-rw-r--r-- | abs/extra-testing/subversion/subversion-neon.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/abs/extra-testing/subversion/subversion-neon.patch b/abs/extra-testing/subversion/subversion-neon.patch deleted file mode 100644 index 7dc23c5..0000000 --- a/abs/extra-testing/subversion/subversion-neon.patch +++ /dev/null @@ -1,62 +0,0 @@ -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) |