commit: 92beb1e7875d7df761c5995c2de6b38beee325a2
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Jan 11 17:23:25 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Jan 11 17:23:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=92beb1e7
sci-mathematics/scilab: add libxml patch
thanks to @efferre79
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
.../scilab/files/scilab-6.1.0-libxml.patch | 66 ++++++++++++++++++++++
sci-mathematics/scilab/scilab-6.1.0.ebuild | 1 +
2 files changed, 67 insertions(+)
diff --git a/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch
b/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch
new file mode 100644
index 000000000..55d2e744a
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-6.1.0-libxml.patch
@@ -0,0 +1,66 @@
+--- orig/scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp
2020-02-25 10:59:51.000000000 +0100
++++ scilab-6.1.0/modules/functions_manager/src/cpp/dynamic_modules.cpp
2020-06-13 17:52:19.258491176 +0200
+@@ -22,13 +22,13 @@
+ {
+ #include "loadOnUseClassPath.h"
+ #include "Scierror.h"
++}
+
+ //XML API
+ #include <libxml/xpath.h>
+ #include <libxml/xmlreader.h>
+ #include "sci_malloc.h"
+ #include "configvariable_interface.h"
+-}
+
+ vectGateway loadGatewaysName(const std::wstring& _wstModuleName)
+ {
+--- orig/scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-02-25
10:59:59.000000000 +0100
++++ scilab-6.1.0/modules/io/src/cpp/loadlib.cpp 2020-06-13
17:38:17.474133786 +0200
+@@ -17,6 +17,8 @@
+ #include "context.hxx"
+ #include "loadlib.hxx"
+ #include "macrofile.hxx"
++#include <libxml/xpath.h>
++#include <libxml/xmlreader.h>
+ extern "C"
+ {
+ #include "FileExist.h"
+@@ -26,8 +28,6 @@
+ #include "fullpath.h"
+ #include "PATH_MAX.h"
+ #include "pathconvert.h"
+-#include <libxml/xpath.h>
+-#include <libxml/xmlreader.h>
+ }
+
+ #define DEFAULT_ENCODING "UTF-8"
+--- orig/scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-02-25
11:00:18.000000000 +0100
++++ scilab-6.1.0/modules/xml/src/cpp/XMLDocument.hxx 2020-06-13
17:45:02.443795087 +0200
+@@ -23,13 +23,10 @@
+
+ #include "dynlib_xml_scilab.h"
+
+-extern "C"
+-{
+ #include "xml.h"
+ #ifndef XML_XPATH_CHECKNS
+ #define XML_XPATH_CHECKNS
+ #endif
+-}
+
+ #include "XMLObject.hxx"
+
+--- orig/scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-02-25
11:00:08.000000000 +0100
++++ scilab-6.1.0/modules/scicos/includes/XMIResource.hxx 2020-06-13
18:13:54.985717732 +0200
+@@ -22,10 +22,8 @@
+ #include <string>
+ #include <vector>
+
+-extern "C" {
+ #include <libxml/xmlwriter.h>
+ #include <libxml/xmlreader.h>
+-}
+
+ namespace org_scilab_modules_scicos
+ {
diff --git a/sci-mathematics/scilab/scilab-6.1.0.ebuild
b/sci-mathematics/scilab/scilab-6.1.0.ebuild
index 190b3f105..4b3daa17c 100644
--- a/sci-mathematics/scilab/scilab-6.1.0.ebuild
+++ b/sci-mathematics/scilab/scilab-6.1.0.ebuild
@@ -113,6 +113,7 @@ PATCHES=(
"${FILESDIR}/${P}-accessviolation.patch"
"${FILESDIR}/${P}-missinglib.patch"
"${FILESDIR}/${P}-freehep.patch"
+ "${FILESDIR}/${P}-libxml.patch"
)
pkg_pretend() {
