Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2017-07-21 22:49:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Fri Jul 21 22:49:28 2017 rev:21 rq:511423 version:5.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2017-06-21 13:53:52.535435694 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2017-07-21 22:49:37.462822866 +0200 @@ -1,0 +2,5 @@ +Tue Jul 18 16:39:23 UTC 2017 - [email protected] + +- Fix build with ocaml-4.05 with scilab-ocaml.patch (bug#15107) + +------------------------------------------------------------------- New: ---- scilab-ocaml.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.kfftl2/_old 2017-07-21 22:49:39.490536832 +0200 +++ /var/tmp/diff_new_pack.kfftl2/_new 2017-07-21 22:49:39.490536832 +0200 @@ -40,6 +40,8 @@ Patch2: %{name}-0002-always-use-dynamic-stack.patch # PATCH-FIX-UPSTREAM scilab-fix-64bit-portability-issue.patch [email protected] -- Fix compiler warnings w.r.t 64bit portability Patch3: scilab-fix-64bit-portability-issue.patch +# PATCH-FIX-UPSTREAM scilab-ocaml.patch [email protected] -- Fix build with ocaml-4.05 with scilab-ocaml.patch (bug#15107) +Patch4: scilab-ocaml.patch # PATCH-FIX-OPENSUSE scilab-special-jarnames.patch [email protected] -- Adapt configure script for a few java library names peculiar to openSUSE Patch5: scilab-special-jarnames.patch # PATCH-FIX-UPSTREAM scilab-build-with-xmlgraphics-commons-2_0.patch [email protected] -- Fix compilation with xmlgraphics-commons >= 2.0 @@ -288,6 +290,7 @@ %patch5 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Only > 13.2 and Leap have xmlgraphics-commons > 2.0 %if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 ++++++ scilab-ocaml.patch ++++++ http://bugzilla.scilab.org/show_bug.cgi?id=15107 https://codereview.scilab.org/#/c/19232 --- a/modules/scicos/Makefile.in +++ b/modules/scicos/Makefile.in @@ -438,7 +438,7 @@ libscisundials_la_OBJECTS = $(am_libscis @OCAML_TRUE@@XCOS_TRUE@ modelicat$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \ - $(srcdir)/src/xml2modelica/linenum.mll \ + $(srcdir)/src/modelica_compiler/linenum.mll \ $(srcdir)/src/xml2modelica/stringParser.ml \ $(srcdir)/src/xml2modelica/stringLexer.ml \ $(srcdir)/src/xml2modelica/xMLParser.ml \ @@ -1146,7 +1146,7 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR ### XML2Modelica @OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES = \ @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/xMLTree.ml \ -@OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/linenum.mll \ +@OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/modelica_compiler/linenum.mll \ @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/stringParser.ml \ @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/stringLexer.ml \ @OCAML_TRUE@@XCOS_TRUE@ $(srcdir)/src/xml2modelica/xMLParser.ml \
