67cf8aafbd
* 6.1 series first beta, many fixes and features around * Notably kde5_gtk3 integration, on by default now - Remove merged patches: * 0001-Use-PYTHON_FOR_BUILD-instead-of-calling-python-direc.patch * libreoffice-icu61.patch * kde5-configure-checks.patch * bnc1060128.patch * bnc1039203.patch - Disable firebird everywhere for now as it causes issues - Try to implement safeguarding to avoid bsc#1050305 - Disable base-drivers-mysql as it needs mysqlcppcon that is only for mysql and not mariadb, causes issues bsc#1094779 * Users can still connect using jdbc/odbc - Fix java detection on machines with too many cpus * libreoffice-java-sched.patch - Remove galaxy icon theme replaced by colibri - Add karasa jaga icon theme OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=661
39 lines
1.5 KiB
Diff
39 lines
1.5 KiB
Diff
diff --git a/xmlsecurity/source/xmlsec/xmlstreamio.cxx b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
|
|
index de32f8286c1b..83dd83e66a25 100644
|
|
--- a/xmlsecurity/source/xmlsec/xmlstreamio.cxx
|
|
+++ b/xmlsecurity/source/xmlsec/xmlstreamio.cxx
|
|
@@ -157,6 +157,25 @@ XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks()
|
|
//Notes: all none default callbacks will lose.
|
|
xmlSecIOCleanupCallbacks() ;
|
|
|
|
+ // Newer xmlsec wants the callback order in the opposite direction.
|
|
+#if XMLSEC_VERSION_MAJOR > 1 || (XMLSEC_VERSION_MAJOR == 1 && XMLSEC_VERSION_MINOR > 2) || (XMLSEC_VERSION_MAJOR == 1 && XMLSEC_VERSION_MINOR == 2 && XMLSEC_VERSION_SUBMINOR >= 26)
|
|
+ //Register the default callbacks.
|
|
+ //Notes: the error will cause xmlsec working problems.
|
|
+ int cbs = xmlSecIORegisterDefaultCallbacks() ;
|
|
+ if( cbs < 0 ) {
|
|
+ return -1 ;
|
|
+ }
|
|
+
|
|
+ //Register my classbacks.
|
|
+ cbs = xmlSecIORegisterCallbacks(
|
|
+ xmlStreamMatch,
|
|
+ xmlStreamOpen,
|
|
+ xmlStreamRead,
|
|
+ xmlStreamClose ) ;
|
|
+ if( cbs < 0 ) {
|
|
+ return -1 ;
|
|
+ }
|
|
+#else
|
|
//Register my classbacks.
|
|
int cbs = xmlSecIORegisterCallbacks(
|
|
xmlStreamMatch,
|
|
@@ -173,6 +192,7 @@ XSECXMLSEC_DLLPUBLIC int xmlEnableStreamInputCallbacks()
|
|
if( cbs < 0 ) {
|
|
return -1 ;
|
|
}
|
|
+#endif
|
|
|
|
enableXmlStreamIO |= XMLSTREAMIO_INITIALIZED ;
|
|
}
|
|
|