project: Update for 2.13.1 merge.

ShiftMediaProject · Jun 29, 2024 · 52bf25a · 52bf25a
1 parent baf6bd8
commit 52bf25a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -1,8 +1,8 @@
 diff --git a/parser.c b/parser.c
-index 5f1fdcfa..0001ef9a 100644
+index 372c2ba9..b505c16d 100644
 --- a/parser.c
 +++ b/parser.c
-@@ -7585,7 +7585,7 @@ xmlHandleUndeclaredEntity(xmlParserCtxtPtr ctxt, const xmlChar *name) {
+@@ -7586,7 +7586,7 @@ xmlHandleUndeclaredEntity(xmlParserCtxtPtr ctxt, const xmlChar *name) {
 
  static xmlEntityPtr
  xmlLookupGeneralEntity(xmlParserCtxtPtr ctxt, const xmlChar *name, int inAttr) {
@@ -11,7 +11,7 @@ index 5f1fdcfa..0001ef9a 100644
 
      /*
       * Predefined entities override any extra definition
-@@ -9330,7 +9330,7 @@ next_attr:
+@@ -9331,7 +9331,7 @@ next_attr:
  	if (defaults != NULL) {
  	    for (i = 0; i < defaults->nbAttrs; i++) {
                  xmlDefAttr *attr = &defaults->attrs[i];
@@ -21,10 +21,10 @@ index 5f1fdcfa..0001ef9a 100644
                  int res;
 
 diff --git a/xmlIO.c b/xmlIO.c
-index d4275cbf..33d60e12 100644
+index 640d909c..02506207 100644
 --- a/xmlIO.c
 +++ b/xmlIO.c
-@@ -2899,11 +2899,13 @@ xmlParserGetDirectory(const char *filename) {
+@@ -2903,11 +2903,13 @@ xmlParserGetDirectory(const char *filename) {
          if (cur == dir) dir[1] = 0;
  	else *cur = 0;
  	ret = xmlMemStrdup(dir);

diff --git a/SMP/libxml/xmlversion.h b/SMP/libxml/xmlversion.h
@@ -15,36 +15,36 @@
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.13.0"
+#define LIBXML_DOTTED_VERSION "2.13.1"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20130
+#define LIBXML_VERSION 20131
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20130"
+#define LIBXML_VERSION_STRING "20131"
 
 /**
  * LIBXML_VERSION_EXTRA:
  *
  * extra version information, used to show a git commit description
  */
-#define LIBXML_VERSION_EXTRA "-GITv2.13.0"
+#define LIBXML_VERSION_EXTRA "-GITv2.13.1"
 
 /**
  * LIBXML_TEST_VERSION:
  *
  * Macro to check that the libxml version in use is compatible with
  * the version the software has been compiled against
  */
-#define LIBXML_TEST_VERSION xmlCheckVersion(20130);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20131);
 
 /**
  * LIBXML_THREAD_ENABLED:

diff --git a/SMP/rcVersion.h b/SMP/rcVersion.h
@@ -5,5 +5,5 @@
 
 #define LIBXML_MAJOR_VERSION 2
 #define LIBXML_MINOR_VERSION 13
-#define LIBXML_MICRO_VERSION 0
-#define LIBXML_DOTTED_VERSION "2.13.0"
+#define LIBXML_MICRO_VERSION 1
+#define LIBXML_DOTTED_VERSION "2.13.1"