diff options
Diffstat (limited to 'community/scilab')
| -rw-r--r-- | community/scilab/PKGBUILD | 86 | ||||
| -rw-r--r-- | community/scilab/classpath.xml | 173 | ||||
| -rw-r--r-- | community/scilab/configure-hdf5-vercheck.patch | 24 | ||||
| -rw-r--r-- | community/scilab/java.patch | 217 | ||||
| -rw-r--r-- | community/scilab/scilab.desktop | 9 |
5 files changed, 0 insertions, 509 deletions
diff --git a/community/scilab/PKGBUILD b/community/scilab/PKGBUILD deleted file mode 100644 index a1996a774..000000000 --- a/community/scilab/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: Simon Lipp <sloonz+aur@gmail.com> -# Paulo Matias - -pkgname=scilab -pkgver=5.3.1 -pkgrel=4 -pkgdesc='Scilab is a scientific software package for numerical computations.' -arch=('i686' 'x86_64') -url='http://www.scilab.org/' -license=('custom:CeCILL') -depends=('libxml2' 'pcre' 'lapack' 'java-batik' 'java-flexdock>=0.5.2' - 'jogl' 'jeuclid-core' 'fftw' 'libmatio' 'bash' 'tk' 'jrosetta' - 'ocaml' 'javahelp2' 'jgraphx=1_4_1_0' 'jlatexmath>=0.9.4' - 'jlatexmath-fop>=0.9.4' 'junit' 'java-skinlf' 'xalan-java' - 'java-commons-logging' 'hdf5') -makedepends=('apache-ant' 'antlr2' 'gcc-fortran' 'java-avalon-framework' 'xorg-fonts-type1') -[[ $CARCH == x86_64 ]] && \ - source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \ - "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-x86_64-src.tar.gz" \ - 'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch') - -[[ $CARCH == i686 ]] && \ - source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \ - "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-src.tar.gz" \ - 'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch') - -[[ $CARCH == x86_64 ]] && md5sums=('0002653e670efabb8faf9e6403367134' - '7c9bda373d8dfd75a4f8227a08ced588' - 'ad6286f324891fe8b86c60e4012a36b7' - 'efe6e8d06968ba5e1a3e5ab540a79667' - '7bf1a2149521db9e1c9a2ed684f9ce52') -[[ $CARCH == i686 ]] && md5sums=('0002653e670efabb8faf9e6403367134' - '7545859e4078d3b77436b7f322967f26' - 'ad6286f324891fe8b86c60e4012a36b7' - 'efe6e8d06968ba5e1a3e5ab540a79667' - '7bf1a2149521db9e1c9a2ed684f9ce52') - -options=('!libtool' '!emptydirs') - -build() { - # we do not want things we already have in Arch Linux - cd ${pkgname}-${pkgver}/thirdparty - rm avalon* batik* commons-* flexdock* gluegen-rt* jeuclid* jgraphx* \ - jhall* jlatexmath* jogl* jrosetta* junit* looks-2.1.1.jar xalan* \ - xml* skinlf* - # fix undefined references (scilab needs to fix its cyclic dependencies) - LDFLAGS=${LDFLAGS/ -Wl,--as-needed} - # begin configuring and building - cd .. - - # dirty hack to remove non-working hdf5 version check from configure - patch -Np0 -i ${srcdir}/configure-hdf5-vercheck.patch - - ./configure \ - --prefix=/usr \ - --enable-build-localization \ - --without-pvm \ - --with-matio \ - --without-umfpack \ - --with-fftw \ - --with-hdf5 \ - --with-gfortran # Needed for 64 bits, don't hurt for 32 bits - make all doc -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install install-html - - install -d ${pkgdir}/usr/share/licenses/${pkgname} - install -Dm644 ${srcdir}/scilab-${pkgver}/COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname} - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop - sed -i 's#/jni##' ${pkgdir}/usr/share/scilab/etc/librarypath.xml - install -Dm644 $srcdir/classpath.xml $pkgdir/usr/share/scilab/etc/classpath.xml - for i in jhdf5.jar fop.jar saxon.jar - do - install -Dm644 $srcdir/$pkgname-$pkgver/thirdparty/$i \ - $pkgdir/usr/share/java/scilab/$i - done - install -Dm644 $srcdir/$pkgname-$pkgver/bin/libjhdf5.so \ - $pkgdir/usr/lib/libjhdf5.so -} diff --git a/community/scilab/classpath.xml b/community/scilab/classpath.xml deleted file mode 100644 index 1bd503350..000000000 --- a/community/scilab/classpath.xml +++ /dev/null @@ -1,173 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!DOCTYPE classpaths SYSTEM "../modules/jvm/xml/classpath.dtd"> -<!-- classpath.xml --> -<!-- - default CLASSPATH for Scilab - - @author Allan CORNET - @author Sylvestre LEDRU - @date INRIA 2007/2008 - =================== - Don't touch if you do not know what you are doing ---> -<!-- =================== --> -<!-- -Scilab Java dependencies can be load in different ways. -It can be: -* startup - Load immediatly the dep when Scilab starts (default behaviour) -* background - After Scilab engine is loaded, load the dep in the background -* onUse - Load the deps only when needed (once) - -Some deps can be also disabled only for a specific mode. -The option is "disableUnderMode" and can be: -* STD - Normal mode -* NW - No Window mode (ie command line but with graphics -* API - Scilab as an API ---> - -<classpaths> - -<!-- Mandatory on startup --> -<path value="/usr/share/java/flexdock/flexdock.jar"/> -<path value="/usr/share/java/jrosetta/jrosetta-API.jar" disableUnderMode="NW"/> -<path value="/usr/share/java/jrosetta/jrosetta-engine.jar"/> -<path value="/usr/share/java/skinlf/skinlf.jar"/> -<path value="/usr/share/java/jgoodies-looks/looks-2.3.1.jar"/> -<path value="/usr/share/java/commons-logging/commons-logging.jar"/> -<path value="/usr/share/java/javahelp/jhall.jar"/> - -<!-- Load when needed --> - -<path value="/usr/share/java/jgraphx.jar" load="onUse"> - <load on="XCos"/> -</path> - -<path value="/usr/share/java/jogl/jogl.jar" load="onUse"> - <load on="graphics"/> - <load on="graphic_export"/> - <load on="XCos"/> -</path> - -<path value="/usr/share/java/jogl/gluegen-rt.jar" load="onUse"> - <load on="graphics"/> - <load on="graphic_export"/> - <load on="XCos"/> -</path> - -<!-- XCOS --> -<path value="/usr/share/java/scilab/jhdf5.jar" load="onUse"> - <load on="XCos"/> - <load on="HDF5"/> -</path> - -<!-- Temp. loaded at startup --> -<path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/> -<path value="$SCILAB/modules/output_stream/jar/org.scilab.modules.output_stream.jar" load="startup"/> -<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/> - -<path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse"> - <load on="XCos"/> -</path> -<!-- END --> - -<!-- Documentation (not mandatory) --> -<path value="/usr/share/java/jeuclid//jeuclid-core.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="graphics_mathml_textrendering"/> - <load on="xcos_mathml_rendering"/> -</path> - -<path value="/usr/share/java/jlatexmath-fop.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="pdf_ps_eps_graphic_export"/> -</path> -<path value="/usr/share/java/scilab/fop.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="pdf_ps_eps_graphic_export"/> -</path> -<path value="/usr/share/java/scilab/saxon.jar" load="onUse"> - <load on="documentationGeneration"/> -</path> -<path value="/usr/share/java/batik//batik-all.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="graphics_mathml_textrendering"/> - <load on="pdf_ps_eps_graphic_export"/> - <load on="XCos"/> -</path> -<path value="/usr/share/java/batik//xml-apis-ext.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="pdf_ps_eps_graphic_export"/> - <load on="XCos"/> -</path> - -<!-- PDF doc generation --> -<path value="/usr/share/java/commons-io//commons-io.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="graphics_mathml_textrendering"/> - <load on="pdf_ps_eps_graphic_export"/> - <load on="xcos"/> -</path> - -<!-- PDF doc generation (dep of jeuclid) --> -<path value="/usr/share/java/xmlgraphics-commons//xmlgraphics-commons.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="graphics_mathml_textrendering"/> - <load on="pdf_ps_eps_graphic_export"/> - <load on="XCos"/> -</path> -<path value="/usr/share/java/avalon-framework//avalon-framework.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="pdf_ps_eps_graphic_export"/> -</path> - -<path value="/usr/share/java//jlatexmath.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="graphics_latex_textrendering"/> - <load on="pdf_ps_eps_graphic_export"/> - <load on="XCos"/> -</path> - -<!-- helptools module doc generation --> -<path value="$SCILAB/modules/helptools/jar/org.scilab.modules.helptools.jar" load="onUse"> - <load on="documentationGeneration"/> - <load on="copyAsHTMLinScinotes"/> -</path> - -<!-- Mandatory on startup --> -<path value="$SCILAB/modules/jvm/jar/org.scilab.modules.jvm.jar"/> -<path value="$SCILAB/modules/commons/jar/org.scilab.modules.commons.jar"/> - -<!-- Console GUI dep --> -<path value="$SCILAB/modules/shell/jar/org.scilab.modules.shell.jar" disableUnderMode="NW"/> -<path value="$SCILAB/modules/history_manager/jar/org.scilab.modules.history_manager.jar" disableUnderMode="NW"/> -<path value="$SCILAB/modules/completion/jar/org.scilab.modules.completion.jar" disableUnderMode="NW"/> - -<path value="$SCILAB/modules/console/jar/org.scilab.modules.console.jar"/> - -<path value="$SCILAB/modules/localization/jar/org.scilab.modules.localization.jar"/> -<path value="$SCILAB/modules/action_binding/jar/org.scilab.modules.action_binding.jar"/> - -<path value="$SCILAB/modules/gui/jar/org.scilab.modules.gui.jar"/> -<path value="$SCILAB/modules/gui/etc"/> <!-- Scilab Flexdock theme --> -<path value="$SCILAB/modules/gui/images/icons/"/> <!-- Scilab Flexdock icons --> - -<path value="$SCILAB/modules/renderer/jar/org.scilab.modules.renderer.jar"/> - -<path value="$SCILAB/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar"/> - -<path value="$SCILAB/modules/core/jar/org.scilab.modules.core.jar"/> - -<!-- scinotes module --> -<path value="$SCILAB/modules/scinotes/jar/org.scilab.modules.scinotes.jar" load="onUse"> - <load on="SciNotes"/> -</path> - -<!-- TO DO Load only when we need --> -<path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/> - -<!-- TO DO Load only when we need --> -<path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/> - -<path value="$SCILAB/modules/history_browser/jar/org.scilab.modules.history_browser.jar" disableUnderMode="NW"/> - -</classpaths> diff --git a/community/scilab/configure-hdf5-vercheck.patch b/community/scilab/configure-hdf5-vercheck.patch deleted file mode 100644 index 0f1d875f3..000000000 --- a/community/scilab/configure-hdf5-vercheck.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- configure.bak 2011-07-10 11:28:35.833136771 +0200 -+++ configure 2011-07-10 11:28:45.023136232 +0200 -@@ -19495,21 +19495,6 @@ - // #line 19495 "configure" - import ncsa.hdf.hdf5lib.H5; - --public class conftest { -- public static void main(String[] argv) { -- String minVersion="1.8.4"; -- int[] vers = new int[3]; -- try { H5.H5get_libversion(vers); } -- catch (Throwable ex) {System.exit(-1);} -- String ver = vers[0] + "."+ vers[1] +"."+vers[2]; -- -- System.out.println(ver); -- if (minVersion.compareTo(ver) > 0) { -- System.exit(-1); -- } -- -- } --} - EOF - - CLASSPATH=$ac_java_classpath diff --git a/community/scilab/java.patch b/community/scilab/java.patch deleted file mode 100644 index d7cd42a75..000000000 --- a/community/scilab/java.patch +++ /dev/null @@ -1,217 +0,0 @@ -diff -aur scilab-5.1.1.orig/configure scilab-5.1.1.new/configure ---- scilab-5.1.1.orig/configure 2009-04-14 18:28:53.000000000 +0200 -+++ scilab-5.1.1.new/configure 2009-04-14 19:57:36.000000000 +0200 -@@ -29,9 +29,6 @@ - - fi - -- -- -- - # PATH needs CR - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' -@@ -12848,7 +12845,7 @@ - $as_echo_n "checking flexdock... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/flexdock.jar" "$jardir/libflexdock.jar" "$jardir/libflexdock-java.jar" "$jardir/flexdock*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -12921,9 +12918,9 @@ - $as_echo_n "checking looks... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/jgoodies-looks /usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do -- for jar in "$jardir/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do -+ for jar in "$jardir/jgoodies-looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` - # echo "protected $jar" - # jar_resolved=`ls $jar 2>/dev/null` -@@ -13070,7 +13067,7 @@ - $as_echo_n "checking skinlf... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/skinlf.jar" "$jardir/libskinlf.jar" "$jardir/libskinlf-java.jar" "$jardir/skinlf*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -13143,7 +13140,7 @@ - $as_echo_n "checking jogl... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/jogl.jar" "$jardir/libjogl.jar" "$jardir/libjogl-java.jar" "$jardir/jogl*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -13216,7 +13213,7 @@ - $as_echo_n "checking jhall... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/jhall.jar" "$jardir/libjhall.jar" "$jardir/libjhall-java.jar" "$jardir/jhall*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -13363,7 +13360,7 @@ - $as_echo_n "checking gluegen-rt... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/gluegen-rt.jar" "$jardir/libgluegen-rt.jar" "$jardir/libgluegen-rt-java.jar" "$jardir/gluegen-rt*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -13436,7 +13433,7 @@ - $as_echo_n "checking jrosetta-API... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/jrosetta-API.jar" "$jardir/libjrosetta-API.jar" "$jardir/libjrosetta-API-java.jar" "$jardir/jrosetta-API*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -13509,7 +13506,7 @@ - $as_echo_n "checking jrosetta-engine... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/jrosetta-engine.jar" "$jardir/libjrosetta-engine.jar" "$jardir/libjrosetta-engine-java.jar" "$jardir/jrosetta-engine*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -13582,7 +13579,7 @@ - $as_echo_n "checking commons-logging... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27293,7 +27290,7 @@ - $as_echo_n "checking batik-all... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/batik /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/batik-all.jar" "$jardir/libbatik-all.jar" "$jardir/libbatik-all-java.jar" "$jardir/batik-all*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27366,7 +27363,7 @@ - $as_echo_n "checking batik... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/batik.jar" "$jardir/libbatik.jar" "$jardir/libbatik-java.jar" "$jardir/batik*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27441,7 +27438,7 @@ - $as_echo_n "checking saxon... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/saxon.jar" "$jardir/libsaxon.jar" "$jardir/libsaxon-java.jar" "$jardir/saxon*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27514,7 +27511,7 @@ - $as_echo_n "checking fop... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27587,7 +27584,7 @@ - $as_echo_n "checking jeuclid-core... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/jeuclid/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27660,7 +27657,7 @@ - $as_echo_n "checking commons-io... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/commons-io.jar" "$jardir/libcommons-io.jar" "$jardir/libcommons-io-java.jar" "$jardir/commons-io*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27733,7 +27730,7 @@ - $as_echo_n "checking xmlgraphics-commons... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27806,7 +27803,7 @@ - $as_echo_n "checking xml-apis-ext... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/) " - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/xml-apis-ext.jar" "$jardir/libxml-apis-ext.jar" "$jardir/libxml-apis-ext-java.jar" "$jardir/xml-apis-ext*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -@@ -27880,7 +27877,7 @@ - $as_echo_n "checking avalon-framework... " >&6; } - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/avalon-framework.jar" "$jardir/libavalon-framework.jar" "$jardir/libavalon-framework-java.jar" "$jardir/avalon-framework*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -Nur in scilab-5.1.1.new: configure.orig. -Nur in scilab-5.1.1.new: configure.rej. -diff -aur scilab-5.1.1.orig/m4/java.m4 scilab-5.1.1.new/m4/java.m4 ---- scilab-5.1.1.orig/m4/java.m4 2009-04-14 18:28:53.000000000 +0200 -+++ scilab-5.1.1.new/m4/java.m4 2009-04-14 18:29:57.000000000 +0200 -@@ -745,7 +745,7 @@ - AC_MSG_CHECKING($1) - found_jar=no - saved_ac_java_classpath=$ac_java_classpath -- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java" -+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)" - for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do - for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do - # jar=`echo $jar|sed -e 's/ /\\ /'` -Nur in scilab-5.1.1.new/m4: java.m4.orig. -diff -aur scilab-5.1.1.orig/modules/core/src/c/TerminateCore.c scilab-5.1.1.new/modules/core/src/c/TerminateCore.c ---- scilab-5.1.1.orig/modules/core/src/c/TerminateCore.c 2009-04-14 18:28:54.000000000 +0200 -+++ scilab-5.1.1.new/modules/core/src/c/TerminateCore.c 2009-04-14 19:01:51.000000000 +0200 -@@ -9,8 +9,6 @@ - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ --#include <libxml/parser.h> -- - #include "TerminateCore.h" - /*--------------------------------------------------------------------------*/ - #include "realmain.h" /* Get_no_startup_flag */ -@@ -56,11 +54,6 @@ - /* Close all scilab's files */ - TerminateScilabFilesList(); - -- /* -- * Cleanup function for the XML library. -- */ -- xmlCleanupParser(); -- - /** clean tmpfiles **/ - C2F(tmpdirc)(); - diff --git a/community/scilab/scilab.desktop b/community/scilab/scilab.desktop deleted file mode 100644 index 0a363808b..000000000 --- a/community/scilab/scilab.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Scilab -Comment=A scientific software package for numerical computations -Icon=scilab -Exec=scilab -Encoding=UTF-8 -Terminal=false -Type=Application -Categories=Application;Science;Math |