1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
From: Bryan Gardiner <bog@khumba.net>
Project-Bug-URL: https://bugzilla.scilab.org/show_bug.cgi?id=13813
Gentoo-Bug-URL: https://github.com/gentoo-science/sci/pull/456
Updates Scilab to build against (and require) Batik >=1.8, fixing an API change
with SAXSVGDocumentFactory being moved. This is not tested beyond "yes Scilab
still links to Batik to export SVGs," as I'm not sure of a good test case, and
it's awaiting upstream review.
--- a/scilab/configure
+++ b/scilab/configure
@@ -16600,8 +16600,8 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar batik used
fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.7) of batik" >&5
-$as_echo_n "checking minimal version (1.7) of batik... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking minimal version (1.8) of batik" >&5
+$as_echo_n "checking minimal version (1.8) of batik... " >&6; }
saved_ac_java_classpath=$ac_java_classpath
export ac_java_classpath="$BATIK:$ac_java_classpath"
if test "x" == "x"; then
@@ -16614,7 +16614,7 @@ import org.apache.batik.Version;
public class conftest {
public static void main(String[] argv) {
- String minVersion="1.7";
+ String minVersion="1.8";
System.out.println(Version.getVersion());
if (compare(minVersion, Version.getVersion()) > 0) {
@@ -16663,7 +16663,7 @@ EOF
STDOUT=`cat conftest.java.output`
fi
echo "configure: CLASSPATH was $CLASSPATH" >&5
- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
+ as_fn_error $? "Wrong version of batik. Expected at least 1.8. Found $STDOUT" "$LINENO" 5
fi
fi
if test -f conftest.java.output; then
@@ -16673,7 +16673,7 @@ EOF
echo "configure: failed program was:" >&5
cat conftest.java >&5
echo "configure: CLASSPATH was $CLASSPATH" >&5
- as_fn_error $? "Wrong version of batik. Expected at least 1.7. Found $STDOUT" "$LINENO" 5
+ as_fn_error $? "Wrong version of batik. Expected at least 1.8. Found $STDOUT" "$LINENO" 5
fi
else
@@ -16686,7 +16686,7 @@ import org.apache.batik.Version;
public class conftest {
public static void main(String[] argv) {
- String minVersion="1.7";
+ String minVersion="1.8";
System.out.println(Version.getVersion());
if (compare(minVersion, Version.getVersion()) != 0) {
@@ -16735,7 +16735,7 @@ EOF
STDOUT=`cat conftest.java.output`
fi
echo "configure: CLASSPATH was $CLASSPATH" >&5
- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
+ as_fn_error $? "Wrong version of batik. Expected exact version 1.8. Found $STDOUT" "$LINENO" 5
fi
fi
if test -f conftest.java.output; then
@@ -16745,7 +16745,7 @@ EOF
echo "configure: failed program was:" >&5
cat conftest.java >&5
echo "configure: CLASSPATH was $CLASSPATH" >&5
- as_fn_error $? "Wrong version of batik. Expected exact version 1.7. Found $STDOUT" "$LINENO" 5
+ as_fn_error $? "Wrong version of batik. Expected exact version 1.8. Found $STDOUT" "$LINENO" 5
fi
fi
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1038,7 +1038,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
BATIK=$PACKAGE_JAR_FILE
fi
AC_SUBST(BATIK)
- AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.7],[Version.getVersion()])
+ AC_JAVA_CHECK_VERSION_PACKAGE([batik],[import org.apache.batik.Version;],$BATIK,[1.8],[Version.getVersion()])
# Commons I/O library
AC_JAVA_CHECK_PACKAGE([commons-io],[org.apache.commons.io.output.CountingOutputStream],[Commons I/O library])
--- a/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
+++ b/scilab/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java
@@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentLoader;
import org.apache.batik.bridge.GVTBuilder;
import org.apache.batik.bridge.UserAgent;
import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.gvt.GraphicsNode;
import org.apache.batik.util.XMLResourceDescriptor;
import org.scilab.forge.jlatexmath.ParseException;
|