Description: fixing the build of the doc by skipping the Japanese part,
 including the shared libs in the modules in java.library.path and also loading
 the native libraries in a clean, non-reflective way.
Author: Pierre Gruet <pgt@debian.org>
Forwarded: no
Last-Update: 2023-03-10

--- a/scilab/modules/jvm/src/java/org/scilab/modules/jvm/LibraryPath.java
+++ b/scilab/modules/jvm/src/java/org/scilab/modules/jvm/LibraryPath.java
@@ -66,7 +66,7 @@
             /* The order matter here... see bug #4022 */
             String newLibPath = System.getProperty(JAVALIBRARYPATH) + File.pathSeparator + p;
             System.setProperty(JAVALIBRARYPATH, newLibPath);
-            // First try the new initLibraryPaths method
+            /*// First try the new initLibraryPaths method
             try {
                 final Method initLibraryPaths = ClassLoader.class.getDeclaredMethod("initLibraryPaths");
                 initLibraryPaths.setAccessible(true);
@@ -87,7 +87,7 @@
                 throw new IOException("Error InvocationTargetException, could not add path to " + JAVALIBRARYPATH);
             } catch (IllegalAccessException e) {
                 throw new IOException("Error IllegalAccessException, could not add path to " + JAVALIBRARYPATH);
-            }
+            }*/
         }
     }
 
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -306,7 +306,7 @@
 				LANG=$$l.UTF-8 SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
 			else \
 				echo "LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e \"$$COMMAND\"";\
-				LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS='-Djava.awt.headless=true' HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
+				LANG=$$l.UTF-8 LC_ALL=C SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 _JAVA_OPTIONS="-Djava.awt.headless=true -Djava.library.path=/usr/lib/jni:$$(find . -name "*.so" -a -wholename "*modules*" | sed 's/\/[^/]*$$//' | sort | uniq | tr '\n' ':' | sed 's/:$$//')" HOME=/tmp $(top_builddir)/bin/scilab-adv-cli -noatomsautoload -nb -l $$l -nouserstartup -e "$$COMMAND" || exit 1;\
 			fi; \
 		done; \
 	else \
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1537,7 +1537,7 @@
 #######################
 
 ALL_LINGUAS="en_US fr_FR zh_CN zh_TW ru_RU ca_ES de_DE es_ES pt_BR ja_JP it_IT uk_UA pl_PL cs_CZ"
-ALL_LINGUAS_DOC="en_US fr_FR pt_BR ja_JP ru_RU"
+ALL_LINGUAS_DOC="en_US fr_FR pt_BR ja_JP"
 
 AC_ARG_ENABLE(build-localization,
         AS_HELP_STRING([--disable-build-localization],[Disable the localization build])