File paulstretch-fix_mxml.patch of Package paulstretch

Overview Repositories Revisions Requests Users Attributes Meta

File paulstretch-fix_mxml.patch of Package paulstretch (Revision 1996b41ed3813c562f7d8648862bd3d6)

Currently displaying revision 1996b41ed3813c562f7d8648862bd3d6 , Show latest

Description: Fix FTBFS
 With mxml v3.0 directly accessing the private node structure is not
 allowed. Instead we need to use the API.

Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Bug-Debian: https://bugs.debian.org/952055

---

--- paulstretch-2.2-2.orig/XMLwrapper.cpp
+++ paulstretch-2.2-2/XMLwrapper.cpp
@@ -29,7 +29,11 @@ int xml_k=0;
 char tabs[STACKSIZE+2];
 
 const char *XMLwrapper_whitespace_callback(mxml_node_t *node,int where){
+#ifdef MXML_MAJOR_VERSION
+    const char *name = mxmlGetElement(node);
+#else
     const char *name=node->value.element.name;
+#endif
 
     if ((where==MXML_WS_BEFORE_OPEN)&&(!strcmp(name,"?xml"))) return(NULL);
     if ((where==MXML_WS_BEFORE_CLOSE)&&(!strcmp(name,"string"))) return(NULL);
@@ -406,12 +410,17 @@ void XMLwrapper::getparstr(const char *n
     ZERO(par,maxstrlen);
     node=mxmlFindElement(peek(),peek(),"string","name",name,MXML_DESCEND_FIRST);
     
+#ifdef MXML_MAJOR_VERSION
+    mxml_node_t *temp_node = mxmlGetFirstChild(node);
+    if (temp_node==NULL) return;
+    if (mxmlGetType(temp_node)!=MXML_OPAQUE) return;
+    snprintf(par,maxstrlen,"%s",mxmlGetElement(temp_node));
+#else
     if (node==NULL) return;
     if (node->child==NULL) return;
     if (node->child->type!=MXML_OPAQUE) return;
-    
     snprintf(par,maxstrlen,"%s",node->child->value.element.name);
-    
+#endif
 };
 
 REALTYPE XMLwrapper::getparreal(const char *name,REALTYPE defaultpar){

Places

File paulstretch-fix_mxml.patch of Package paulstretch (Revision 1996b41ed3813c562f7d8648862bd3d6)

Places