Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2019-11-21 12:58:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Thu Nov 21 12:58:42 2019 rev:32 rq:749784 version:6.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2019-03-14 22:42:48.670631315 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new.26869/scilab.changes 2019-11-21 12:58:48.082525400 +0100 @@ -1,0 +2,18 @@ +Tue Nov 19 20:15:57 UTC 2019 - Fridrich Strba <[email protected]> + +- Added patch scilab-fix-build-with-modern-lucene.patch in order + to fix build against lucene 7 + +------------------------------------------------------------------- +Mon Oct 21 16:03:40 UTC 2019 - [email protected] + +- Newer versions of ocaml require usage of scilab-ocaml.patch +- Use autosetup in prep section + +------------------------------------------------------------------- +Fri Oct 4 06:55:37 UTC 2019 - [email protected] + +- Ocaml code requires the num library, but it was not explicit + required at build time + +------------------------------------------------------------------- New: ---- scilab-fix-build-with-modern-lucene.patch scilab-ocaml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.o6fp50/_old 2019-11-21 12:58:49.398524994 +0100 +++ /var/tmp/diff_new_pack.o6fp50/_new 2019-11-21 12:58:49.398524994 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,13 +26,14 @@ Group: Productivity/Scientific/Math Version: 6.0.2 Release: 0 -Url: http://www.scilab.org +URL: http://www.scilab.org # FOR STABLE RELEASE Source0: http://www.scilab.org/download/%{version}/%{name}-%{version}-src.tar.gz # FOR BETA RELEASE #Source0: http://www.scilab.org/download/%%{beta_version}/%%{name}-%%{beta_version}-src.tar.gz Source1: %{name}-rpmlintrc +Patch0: scilab-ocaml.patch # Bug 767102 - help() should suggest scilab-doc Patch1: %{name}-0001-Use-pkcon-to-install-doc-package.patch # PATCH-FIX-UPSTREAM scilab-fix-64bit-portability-issue.patch [email protected] -- Fix compiler warnings w.r.t 64bit portability @@ -57,6 +58,8 @@ Patch26: scilab-java_source_target.patch # PATCH-FIX-UPSTREAM scilab-drop-javax-annotation.patch [email protected] -- Remove references to javax.annotation as it is unavailable with java >= 11 and the code referencing this doesn't do anything anyway Patch27: scilab-drop-javax-annotation.patch +# PATCH-FIX-OPENSUSE scilab-fix-build-with-modern-lucene.patch - Build against lucene 7 +Patch28: scilab-fix-build-with-modern-lucene.patch ExcludeArch: i586 ppc64 # SECTION Dependency to rebuild configure after patching autotools files @@ -154,6 +157,7 @@ # Modelica BuildRequires: ocaml BuildRequires: ocaml(ocaml.opt) +BuildRequires: ocamlfind(num) # Documentation BuildRequires: saxon9 @@ -297,23 +301,9 @@ %lang_package -n %{name}-modules-doc %prep -%setup -q - -%patch1 -p1 -# PATCH5 and PATCH13 have to be applied before PATCH2; all affect ./configure -%patch5 -p1 -%patch3 -p1 - -%patch8 -p1 -%patch9 -p1 -%patch17 -p1 -%patch21 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 +%autosetup -p1 +%build # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig @@ -322,7 +312,6 @@ sed -i '/name="Class-Path"/d' modules/javasci/build.xml sed -i '/name="Class-Path"/d' modules/scirenderer/build.xml -%build autoreconf -fvi %configure \ --disable-static-system-lib \ ++++++ scilab-fix-build-with-modern-lucene.patch ++++++ Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java =================================================================== --- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java +++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteIndexer.java @@ -162,7 +162,6 @@ public final class PaletteIndexer { // 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 @@ public final class PaletteIndexer { refpurpose = new TextField("refpurpose", "", Field.Store.YES); } - refpurpose.setBoost(10f); doc.add(refpurpose); } Index: scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java =================================================================== --- scilab-6.0.2.orig/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java +++ scilab-6.0.2/modules/xcos/src/java/org/scilab/modules/xcos/palette/PaletteSearcher.java @@ -57,7 +57,6 @@ public final class PaletteSearcher { StandardQueryParser queryParserHelper = new StandardQueryParser(); queryParserHelper.setAllowLeadingWildcard(true); - queryParserHelper.setLowercaseExpandedTerms(true); queryParserHelper.setAnalyzer(mgr.getAnalyzer()); queryParserHelper.setMultiFields(new String[] {"refname", "refpurpose", "content"}); ++++++ scilab-ocaml.patch ++++++ --- a/modules/scicos/Makefile.modelica.am +++ b/modules/scicos/Makefile.modelica.am @@ -23,7 +23,7 @@ if OCAML TARGET = modelicac XML2Modelica modelicat BASE_PATH = $(srcdir)/src/ bin_PROGRAMS = $(TARGET) -OCAMLLIBS=nums.cma +OCAMLLIBS=$(shell cd "`ocamlc -where`" ; for i in nums.cma num/num.cma ; do test -f $$i || continue ; f="`readlink -f $$i`" ; echo "-I `dirname $$f`" ; echo "`basename $$i`" ; break ; done) ### XML2Modelica --- a/modules/scicos/src/modelica_compiler/optimization.ml +++ b/modules/scicos/src/modelica_compiler/optimization.ml @@ -20,6 +20,7 @@ * *) +open Num open SymbolicExpression @@ -162,8 +163,7 @@ let num_of_float f = let num_of_positive_float f = let m, e = frexp f in let sm = string_of_float m in - let s = String.make 16 '0' in - String.blit sm 2 s 0 (String.length sm - 2); + let s = String.sub sm 2 (String.length sm - 2) in let e' = Num.power_num (Num.Int 2) (Num.num_of_int e) in Num.div_num (Num.mult_num (Num.num_of_string s) e') scaling_factor in --- a/modules/scicos/src/modelica_compiler/xMLCodeGeneration.ml +++ b/modules/scicos/src/modelica_compiler/xMLCodeGeneration.ml @@ -20,6 +20,7 @@ * *) +open Num type 'a tree = Leaf of (string * 'a) | Node of string * 'a tree list (* function used to hide XML special characters *)
