diff options
author | eolianoe | 2016-07-29 23:42:12 +0200 |
---|---|---|
committer | eolianoe | 2016-07-29 23:42:12 +0200 |
commit | 3cc06579affcecd21d00d736bb9d8c8a306f4082 (patch) | |
tree | 575f564a7e59f221f862741654b9bee5dcbb57cb /scilab-git_strict-jar.patch | |
parent | 694613928192e2f8d3dbca0782ce7d7b7a66c7e9 (diff) | |
download | aur-3cc06579affcecd21d00d736bb9d8c8a306f4082.tar.gz |
updpkg: 6.0.0.beta.2
* Rewrite to get it build with the new beta version
* For now, modelica is disabled as the build fails
Diffstat (limited to 'scilab-git_strict-jar.patch')
-rw-r--r-- | scilab-git_strict-jar.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/scilab-git_strict-jar.patch b/scilab-git_strict-jar.patch new file mode 100644 index 000000000000..805dd8d4ee49 --- /dev/null +++ b/scilab-git_strict-jar.patch @@ -0,0 +1,29 @@ +--- configure.old 2016-04-24 14:32:13.301199078 +0200 ++++ configure 2016-04-24 14:34:47.821731712 +0200 +@@ -17159,7 +17159,7 @@ + + DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" + +- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' -or -name 'fop*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'fop.jar' -or -name 'libfop.jar' -or -name 'libfop-java.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + +@@ -19139,7 +19139,7 @@ + + DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" + +- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' -or -name 'xmlgraphics-commons*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'xmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons.jar' -or -name 'libxmlgraphics-commons-java.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + +@@ -20019,7 +20019,7 @@ + + DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" + +- jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' -or -name 'commons-logging*.jar' \) 2>/dev/null |tr '\n' ':')." ++ jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'commons-logging.jar' -or -name 'libcommons-logging.jar' -or -name 'libcommons-logging-java.jar' \) 2>/dev/null |tr '\n' ':')." + + if test ! -f conftestSharedChecker.class ; then + |