fix for ocmal (-j1) and lucene >=7

5 files changed, 65 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8881e8117acb..b2f397f367f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jul  3 09:29:54 UTC 2017
+# Thu Jan  4 20:11:05 UTC 2018
 pkgbase = scilab-git
 	pkgdesc = A scientific software package for numerical computations
-	pkgver = 6.0.0.r101.gac588401314
+	pkgver = 6.0.0.r296.g2f851190556
 	pkgrel = 1
 	url = https://www.scilab.org/
 	arch = i686
@@ -23,7 +23,7 @@ pkgbase = scilab-git
 	depends = tk
 	depends = curl
 	depends = java-runtime>=8
-	depends = apache-lucene>=6
+	depends = apache-lucene>=7
 	depends = beanshell
 	depends = eclipse-ecj
 	depends = java-flexdock>=1.2.4
@@ -48,17 +48,19 @@ pkgbase = scilab-git
 	source = scilab-jogl-2.3.2.patch
 	source = scilab-LD_LIBRARY_PATH.patch
 	source = scilab-strict-jar.patch
-	source = scilab-lucene-6.patch
+	source = scilab-lucene.patch
 	source = scilab-hdf5-type.patch
 	source = scilab-hdf5-1.8.10.patch
+	source = scilab-batik-1.9.patch
 	source = scilab-type.patch
 	sha256sums = SKIP
 	sha256sums = f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc
 	sha256sums = 37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0
 	sha256sums = 38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd
-	sha256sums = ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66
+	sha256sums = b1fb3e4b08b3c17f267c213d954c704cb95225cf1445cf92892e205a4ca14d76
 	sha256sums = c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d
 	sha256sums = 2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0
+	sha256sums = cc9bde7008ef078af3382e09867700c0f98779b4af39e21bb96e4bf9e020084a
 	sha256sums = 93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd
 
 pkgname = scilab-git
diff --git a/PKGBUILD b/PKGBUILD
index f7fb3f459261..b9077a8e999e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=scilab
 pkgname=scilab-git
-pkgver=6.0.0.r101.gac588401314
+pkgver=6.0.0.r296.g2f851190556
 pkgrel=1
 pkgdesc='A scientific software package for numerical computations'
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('suitesparse>=4.4.1'  'arpack' 'fftw' 'eigen'
          'hdf5'
          'libmatio' 'tk' 'curl'
          'java-runtime>=8'
-         'apache-lucene>=6'
+         'apache-lucene>=7'
          'beanshell' 'eclipse-ecj' 'java-flexdock>=1.2.4' 'fop-hyph'
          'jeuclid-core' 'jgraphx>=2.0.0.1' 'javahelp2'
          'saxon-he' 'jlatexmath-fop>=1.0.3' 'jrosetta>=1.0.4' 'jgoodies-looks' 'java-qdox'
@@ -26,18 +26,20 @@ source=("git://git.scilab.org/scilab"
         "${_pkgname}-jogl-2.3.2.patch"
         "${_pkgname}-LD_LIBRARY_PATH.patch"
         "${_pkgname}-strict-jar.patch"
-        "${_pkgname}-lucene-6.patch"
+        "${_pkgname}-lucene.patch"
         "${_pkgname}-hdf5-type.patch"
         "${_pkgname}-hdf5-1.8.10.patch"
+        "${_pkgname}-batik-1.9.patch"
         "${_pkgname}-type.patch")
 
 sha256sums=('SKIP'
             'f19f173e989f72bd55bda35e271b3c180ecef4e29da964df3f230fce8b1330fc'
             '37f649fea0196b255e5a8576dd1e8c5fd219c6e8c600b703b35303fb90b6a7e0'
             '38aa094951338fa1d267dc6f397552e175213b0f8ba7b35727c178607861f6dd'
-            'ba7969fff7f839562120534222fbb6421e204f6a382654d80bbab19e0c7a2c66'
+            'b1fb3e4b08b3c17f267c213d954c704cb95225cf1445cf92892e205a4ca14d76'
             'c992a4f230dac60c3e217efee04b678c58d856f2aafa6173f742d4c5b050ab9d'
             '2dee1346c240d09ce7870bbbeb3318e0ac5d78f249d855df313e9cb7a2ef7fc0'
+            'cc9bde7008ef078af3382e09867700c0f98779b4af39e21bb96e4bf9e020084a'
             '93597034c6866c3a4aaa7ef92b4588d2753383545ed3366be6cdb404edf949bd')
 
 pkgver() {
@@ -55,12 +57,14 @@ prepare(){
   patch -p2 < "${srcdir}"/${_pkgname}-jogl-2.3.2.patch
   # Linked to: https://codereview.scilab.org/#/c/18089/
   patch < "${srcdir}"/${_pkgname}-strict-jar.patch
-  # Fix to build with lucene >= 6
-  patch -p0 < "${srcdir}"/${_pkgname}-lucene-6.patch
+  # Fix to build with lucene >= 7
+  patch -p0 < "${srcdir}"/${_pkgname}-lucene.patch
   # Fix hdf5 type
   patch -p0 < "${srcdir}"/${_pkgname}-hdf5-type.patch
   # Fix for LD_LIBRARY_PATH
   patch bin/scilab "${srcdir}"/${_pkgname}-LD_LIBRARY_PATH.patch
+  # Fix version for batik
+  patch -p0 < "${srcdir}"/${_pkgname}-batik-1.9.patch
   # Fix type
   patch -p0 < "${srcdir}"/${_pkgname}-type.patch
 }
@@ -83,7 +87,7 @@ build() {
     --enable-build-localization \
     --disable-static-system-lib
 
-  make
+  make -j1
   make doc
 }
 
diff --git a/scilab-batik-1.9.patch b/scilab-batik-1.9.patch
new file mode 100644
index 000000000000..226c3c5a26fd
--- /dev/null
+++ b/scilab-batik-1.9.patch
@@ -0,0 +1,11 @@
+--- modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java.orig	2017-08-30 13:17:48.301380837 +0200
++++ modules/xcos/src/java/org/scilab/modules/xcos/Xcos.java	2017-08-30 13:16:58.934524972 +0200
+@@ -101,7 +101,7 @@
+      * Dependencies version
+      */
+     private static final List<String> MXGRAPH_VERSIONS = null;
+-    private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8");
++    private static final List<String> BATIK_VERSIONS = Arrays.asList("1.7", "1.8pre", "1.8", "1.9");
+ 
+     private static final String UNABLE_TO_LOAD_JGRAPHX = Messages.gettext("Unable to load the jgraphx library.\nExpecting version %s ; Getting version %s .");
+     private static final String UNABLE_TO_LOAD_BATIK = Messages.gettext("Unable to load the Batik library. \nExpecting version %s ; Getting version %s .");
diff --git a/scilab-lucene-6.patch b/scilab-lucene-6.patch
deleted file mode 100644
index 7054a6876c91..000000000000
--- a/scilab-lucene-6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java	2017-02-15 19:48:09.065311738 +0100
-+++ modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java.new	2017-02-15 19:43:03.057878902 +0100
-@@ -52,7 +52,7 @@
-      */
-     public List<Document> search(String str) {
-         List<Document> found = new ArrayList<>();
--        try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true)) {
-+        try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true, true)) {
-             IndexSearcher searcher = new IndexSearcher(reader);
- 
-             StandardQueryParser queryParserHelper = new StandardQueryParser();
diff --git a/scilab-lucene.patch b/scilab-lucene.patch
new file mode 100644
index 000000000000..14ba0b55ce28
--- /dev/null
+++ b/scilab-lucene.patch
@@ -0,0 +1,36 @@
+--- modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java	2017-02-15 19:48:09.065311738 +0100
++++ modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java.new	2017-02-15 19:43:03.057878902 +0100
+@@ -52,7 +52,7 @@
+      */
+     public List<Document> search(String str) {
+         List<Document> found = new ArrayList<>();
+-        try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter(), true)) {
++        try (IndexReader reader = DirectoryReader.open(mgr.getIndexWriter())) {
+             IndexSearcher searcher = new IndexSearcher(reader);
+
+             StandardQueryParser queryParserHelper = new StandardQueryParser();
+@@ -57,7 +57,6 @@
+
+             StandardQueryParser queryParserHelper = new StandardQueryParser();
+             queryParserHelper.setAllowLeadingWildcard(true);
+-            queryParserHelper.setLowercaseExpandedTerms(true);
+             queryParserHelper.setAnalyzer(mgr.getAnalyzer());
+             queryParserHelper.setMultiFields(new String[] {"refname", "refpurpose", "content"});
+
+--- modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java	2018-01-04 15:55:54.019390755 +0100
++++ modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java.new	2018-01-04 15:56:08.879485713 +0100
+@@ -162,7 +162,6 @@
+
+             // add the block name
+             Field refname = new TextField("refname", basename, Field.Store.YES);
+-            refname.setBoost(100f);
+             doc.add(refname);
+
+             // add the refpurpose
+@@ -176,7 +175,6 @@
+                     refpurpose = new TextField("refpurpose", "", Field.Store.YES);
+                 }
+
+-                refpurpose.setBoost(10f);
+                 doc.add(refpurpose);
+             }