Only build against java 1.7 + be strict for jars

3 files changed, 54 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5616370e46d..d7fc7ab6b909 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v7
-# Sun Sep 27 14:18:56 UTC 2015
 pkgbase = scilab
 	pkgdesc = A scientific software package for numerical computations.
 	pkgver = 5.5.2
-	pkgrel = 6
+	pkgrel = 7
 	url = https://www.scilab.org
 	install = scilab.install
 	arch = i686
@@ -51,10 +49,12 @@ pkgbase = scilab
 	source = scilab-5.5.2-batik-1.8.patch
 	source = scilab-5.5.2-fop-2.0.patch
 	source = scilab-5.5.2-xmlgraphics-common-2.0.patch
+	source = scilab-5.5.2-strict-jar.patch
 	sha256sums = a734519de96d35b8f081768a5584086e46db089ab11c021744897b22ec4d0f5e
 	sha256sums = 4f243e32be0aa2755405e121e7a23a370276c98e00d1b016bd43df56a76782ca
 	sha256sums = a8e03352cdaa5955414945e3fc8f56a035793869934345eef301cc6124b7ec95
 	sha256sums = 64de4a044fb7228cae7003e6f86f6f0958ea10049f2fb24a11a07b0087e4ef36
+	sha256sums = cda2635f25a56f3c423f7a88791222aae3caad53c086cedc0cfe48011936a5a8
 
 pkgname = scilab
 
diff --git a/PKGBUILD b/PKGBUILD
index 5a3518422d25..654e25ef5bd6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=scilab
 pkgver=5.5.2
-pkgrel=6
+pkgrel=7
 pkgdesc='A scientific software package for numerical computations.'
 arch=('i686' 'x86_64')
 url='https://www.scilab.org'
@@ -24,27 +24,34 @@ makedepends=('java-environment=7' 'apache-ant'
 conflicts=('scilab-git' 'scilab-bin')
 
 source=("${url}/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
-        'scilab-5.5.2-batik-1.8.patch'
-        'scilab-5.5.2-fop-2.0.patch'
-        'scilab-5.5.2-xmlgraphics-common-2.0.patch')
+        "${pkgname}-${pkgver}-batik-1.8.patch"
+        "${pkgname}-${pkgver}-fop-2.0.patch"
+        "${pkgname}-${pkgver}-xmlgraphics-common-2.0.patch"
+        "${pkgname}-${pkgver}-strict-jar.patch")
 sha256sums=('a734519de96d35b8f081768a5584086e46db089ab11c021744897b22ec4d0f5e'
             '4f243e32be0aa2755405e121e7a23a370276c98e00d1b016bd43df56a76782ca'
             'a8e03352cdaa5955414945e3fc8f56a035793869934345eef301cc6124b7ec95'
-            '64de4a044fb7228cae7003e6f86f6f0958ea10049f2fb24a11a07b0087e4ef36')
+            '64de4a044fb7228cae7003e6f86f6f0958ea10049f2fb24a11a07b0087e4ef36'
+            'cda2635f25a56f3c423f7a88791222aae3caad53c086cedc0cfe48011936a5a8')
 
 install=${pkgname}.install
 
 prepare(){
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p2 < "${srcdir}"/scilab-5.5.2-batik-1.8.patch
-  patch -p2 < "${srcdir}"/scilab-5.5.2-fop-2.0.patch
-  patch -p2 < "${srcdir}"/scilab-5.5.2-xmlgraphics-common-2.0.patch
+  patch -p2 < "${srcdir}"/${pkgname}-${pkgver}-batik-1.8.patch
+  patch -p2 < "${srcdir}"/${pkgname}-${pkgver}-fop-2.0.patch
+  patch -p2 < "${srcdir}"/${pkgname}-${pkgver}-xmlgraphics-common-2.0.patch
+  patch < "${srcdir}"/${pkgname}-${pkgver}-strict-jar.patch
+
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  # Newer version (>7) of java does not work
+  export JAVA_HOME=/usr/lib/jvm/java-7-openjdk
+
   ./configure \
     --prefix=/usr \
     --with-gcc \
@@ -64,6 +71,13 @@ build() {
   make doc
 }
 
+# For now, does not work
+#check(){
+  #cd "${srcdir}/${pkgname}-${pkgver}"
+
+  #make check
+#}
+
 package(){
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/scilab-5.5.2-strict-jar.patch b/scilab-5.5.2-strict-jar.patch
new file mode 100644
index 000000000000..86aa4ac3af2e
--- /dev/null
+++ b/scilab-5.5.2-strict-jar.patch
@@ -0,0 +1,29 @@
+--- configure	2015-10-14 21:38:41.696745994 +0200
++++ configure.new	2015-10-14 22:12:15.437348019 +0200
+@@ -15666,7 +15666,7 @@
+     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 $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(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)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+-      for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do
++      for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar"; do
+ 
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+@@ -16880,7 +16880,7 @@
+     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 $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(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)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+-      for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.jar"; do
++      for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" ; do
+ 
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`
+@@ -17352,7 +17352,7 @@
+     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 $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null) $(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)"
+     for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR; do
+-      for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do
++      for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" ; do
+ 
+ # TODO check the behaviour when spaces
+         jars_resolved=`ls $jar 2>/dev/null`