Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2017-06-21 13:53:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scilab" Wed Jun 21 13:53:51 2017 rev:20 rq:504437 version:5.5.2 Changes: -------- --- /work/SRC/openSUSE:Factory/scilab/scilab.changes 2017-05-08 19:04:19.153081572 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2017-06-21 13:53:52.535435694 +0200 @@ -1,0 +2,7 @@ +Fri Jun 16 12:16:55 UTC 2017 - [email protected] + +- Add scilab-gcc7-nullptr-fix.patch: Replace the character-literal + '\0' by appropriate null pointer '0' to fix compilation with + gcc >= 7. + +------------------------------------------------------------------- New: ---- scilab-gcc7-nullptr-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scilab.spec ++++++ --- /var/tmp/diff_new_pack.v4VRfb/_old 2017-06-21 13:53:54.455164897 +0200 +++ /var/tmp/diff_new_pack.v4VRfb/_new 2017-06-21 13:53:54.459164333 +0200 @@ -61,6 +61,8 @@ # PATCH-FIX-UPSTREAM scilab-hdf5-1_10-compat.patch [email protected] -- Adapt to updated HDF5 (>= 1.10) API Patch14: scilab-hdf5-1_10-compat.patch # exclude ppc64 build as long as upstream open http://bugzilla.scilab.org/show_bug.cgi?id=13826 +# PATCH-FIX-UPSTREAM scilab-gcc7-nullptr-fix.patch [email protected] -- Replace the character-literal '\0' by appropriate null pointer '0' to fix compilation with gcc >= 7 +Patch15: scilab-gcc7-nullptr-fix.patch ExcludeArch: ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" @@ -301,6 +303,9 @@ %endif %patch13 -p1 %patch14 -p1 +%if 0%{?suse_version} > 1320 +%patch15 -p1 +%endif # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++++++ scilab-gcc7-nullptr-fix.patch ++++++ Index: scilab-5.5.2/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp =================================================================== --- scilab-5.5.2.orig/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp +++ scilab-5.5.2/modules/xcos/sci_gateway/cpp/sci_xcosPalLoad.cpp @@ -54,7 +54,7 @@ int sci_xcosPalLoad(char *fname, unsigne { // FIXME #7266 workaround // check category emptyness - if (category == NULL || (lenCategory == 1 && *category == '\0')) + if (category == NULL || (lenCategory == 1 && *category == nullptr)) { Palette::loadPal(getScilabJavaVM(), name); }
