[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Patch: upgrade to neon 0.17.0

From: Mo DeJong <supermo_at_bayarea.net>
Date: 2001-10-02 22:17:46 CEST

Hi all.

I posted a quick patch about upgrading to neon the other day, but I though it
would be better to post a full patch. I am running with neon 0.17.0 in my
local tree and the tests seem to pass just fine. Does anyone see any reason
not to upgrade?

cheers
Mo DeJong

2001-10-02 Mo DeJong <supermo@bayarea.net>

        Upgrade to neon 0.17.0

        * autogen.sh: Upgrade neon from 0.15.3 to 0.17.0, run
        neon's autogen.sh script in case neon was generated
        with a different version of autoconf/libtool.
        * subversion/libsvn_ra_dav/merge.c (validate_element):
        * subversion/libsvn_ra_dav/props.c (validate_element):
        * subversion/libsvn_ra_dav/fetch.c (validate_element):
        * subversion/libsvn_ra_dav/options.c (validate_element):
        Update the validate_element callback so that it accepts
        a void* in the first argument to account for a change in
        the neon API.

Index: ./subversion/libsvn_ra_dav/merge.c
===================================================================
--- ./subversion/libsvn_ra_dav/SVN/text-base/merge.c Thu Sep 27 13:11:58 2001
+++ ./subversion/libsvn_ra_dav/merge.c Tue Oct 2 12:37:57 2001
@@ -251,7 +251,7 @@
   return bump_resource(mc, relative, mc->vsn_url->data);
 }
 
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
 {
   if ((child == ELEM_collection || child == ELEM_baseline)
       && parent != ELEM_resourcetype) {
Index: ./subversion/libsvn_ra_dav/props.c
===================================================================
--- ./subversion/libsvn_ra_dav/SVN/text-base/props.c Thu Sep 27 13:12:00 2001
+++ ./subversion/libsvn_ra_dav/props.c Tue Oct 2 12:37:57 2001
@@ -169,7 +169,7 @@
   (void) ne_propset_iterate(rset, add_to_hash, r);
 }
 
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
 {
   switch (parent)
     {
Index: ./subversion/libsvn_ra_dav/fetch.c
===================================================================
--- ./subversion/libsvn_ra_dav/SVN/text-base/fetch.c Tue Oct 2 12:14:42 2001
+++ ./subversion/libsvn_ra_dav/fetch.c Tue Oct 2 12:37:57 2001
@@ -762,7 +762,7 @@
 ** ### next are subdir elems, possibly fetch-file, then fetch-prop.
 */
 
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
 {
   /* We're being very strict with the validity of XML elements here. If
      something exists that we don't know about, then we might not update
Index: ./subversion/libsvn_ra_dav/options.c
===================================================================
--- ./subversion/libsvn_ra_dav/SVN/text-base/options.c Thu Sep 27 13:11:59 2001
+++ ./subversion/libsvn_ra_dav/options.c Tue Oct 2 12:37:57 2001
@@ -46,7 +46,7 @@
 
 
 
-static int validate_element(ne_xml_elmid parent, ne_xml_elmid child)
+static int validate_element(void *userdata, ne_xml_elmid parent, ne_xml_elmid child)
 {
   switch (parent)
     {
Index: ./autogen.sh
===================================================================
--- ./SVN/text-base/autogen.sh Thu Sep 27 13:10:13 2001
+++ ./autogen.sh Tue Oct 2 12:39:33 2001
@@ -28,7 +29,7 @@
 fi
 
 # Make sure the Neon directory is present
-NEON_WANTED=0.15.3
+NEON_WANTED=0.17.0
 NEON_URL="http://www.webdav.org/neon/neon-${NEON_WANTED}.tar.gz"
 
 if [ ! -d neon ]; then
@@ -158,6 +160,9 @@
   echo "Creating config files for APR..."
   (cd apr; ./buildconf) # this is apr's equivalent of autogen.sh
 fi
+
+echo "Creating config files for Neon..."
+(cd neon ; ./autogen.sh)
 
 # If we have a config.cache file, toss it if the configure script has
 # changed, or if we just built it for the first time.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:43 2006

This is an archived mail posted to the Subversion Dev mailing list.