[scilab] Update to 5.5.0
Clément David
davidcl at fedoraproject.org
Mon Apr 14 12:54:54 UTC 2014
commit 1b02552661e530676f979ac697de49217deba0d7
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date: Fri Apr 11 14:46:58 2014 +0200
Update to 5.5.0
scilab-0001-Use-pkcon-to-install-doc-package.patch | 2 +-
scilab-0002-always-use-dynamic-stack.patch | 44 --------------------
scilab-0002-enable-jdk8.patch | 23 ++++++++++
scilab-0003-fix-asan-issues.patch | 34 +++++++++++++++
scilab-0003-report-issues-on-arm-build.patch | 12 -----
scilab-0004-fix-make-doc-ja_JP.patch | 36 ++++++++++++++++
scilab-0005-fix-appdata.patch | 21 +++++++++
scilab.spec | 36 +++++++++++-----
sources | 2 +-
9 files changed, 141 insertions(+), 69 deletions(-)
---
diff --git a/scilab-0001-Use-pkcon-to-install-doc-package.patch b/scilab-0001-Use-pkcon-to-install-doc-package.patch
index 84eab35..969a201 100644
--- a/scilab-0001-Use-pkcon-to-install-doc-package.patch
+++ b/scilab-0001-Use-pkcon-to-install-doc-package.patch
@@ -1,6 +1,6 @@
--- a/modules/helptools/macros/help.sci
+++ b/modules/helptools/macros/help.sci
-@@ -48,7 +48,8 @@ function help(varargin)
+@@ -53,7 +53,8 @@ function help(varargin)
error(msprintf(gettext("%s: The help browser is disabled in %s mode.\n"), "help", getscilabmode()));
end
else
diff --git a/scilab-0002-enable-jdk8.patch b/scilab-0002-enable-jdk8.patch
new file mode 100644
index 0000000..b121325
--- /dev/null
+++ b/scilab-0002-enable-jdk8.patch
@@ -0,0 +1,23 @@
+--- a/build.incl.xml
++++ b/build.incl.xml
+@@ -85,16 +85,10 @@
+ <!-- Check the version of Java. If it changes after the configure
+ or if there is a mistake in the build system
+ -->
+- <fail message="JDK 1.6 or 1.7 required. Found ${ant.java.version}">
+- <condition>
+- <not>
+- <or>
+- <equals arg1="${ant.java.version}" arg2="1.6"/>
+- <equals arg1="${ant.java.version}" arg2="1.7"/>
+- </or>
+- </not>
+- </condition>
+- </fail>
++ <available property="jdk1.6+" classname="java.util.ServiceLoader"/>
++ <available property="jdk1.7+" classname="java.nio.file.Path"/>
++ <available property="jdk1.8+" classname="java.util.stream.DoubleStream"/>
++ <fail message="Require JDK 1.6 or higher. Found ${ant.java.version}" unless="jdk1.6+"/>
+ <mkdir dir="${classes.dir}"/>
+ <mkdir dir="${classes.test.dir}"/>
+ <mkdir dir="${build.jar.dir}"/>
diff --git a/scilab-0003-fix-asan-issues.patch b/scilab-0003-fix-asan-issues.patch
new file mode 100644
index 0000000..81312da
--- /dev/null
+++ b/scilab-0003-fix-asan-issues.patch
@@ -0,0 +1,34 @@
+--- a/modules/fileio/sci_gateway/c/sci_findfiles.c
++++ b/modules/fileio/sci_gateway/c/sci_findfiles.c
+@@ -34,7 +34,7 @@
+ /*--------------------------------------------------------------------------*/
+ int sci_findfiles(char *fname, unsigned long fname_len)
+ {
+- static int l1 = 0, n1 = 0, m1 = 0;
++ int l1 = 0, n1 = 0, m1 = 0;
+ char *pathextented = NULL;
+ char *path = NULL;
+ char *filespec = NULL;
+@@ -121,10 +121,10 @@ int sci_findfiles(char *fname, unsigned
+ }
+ else
+ {
++ double zero = 0;
+ n1 = 0;
+ m1 = 0;
+- l1 = 0;
+- CreateVarFromPtr(Rhs + 1, MATRIX_OF_DOUBLE_DATATYPE, &n1, &m1, &l1);
++ CreateVarFromPtr(Rhs + 1, MATRIX_OF_DOUBLE_DATATYPE, &n1, &m1, &zero);
+ LhsVar(1) = Rhs + 1;
+ }
+
+--- a/modules/string/sci_gateway/c/sci_convstr.c
++++ b/modules/string/sci_gateway/c/sci_convstr.c
+@@ -113,7 +113,6 @@ int sci_convstr(char *fname, unsigned lo
+ /* To input the string matrix */
+ if (getAllocatedMatrixOfWideString(pvApiCtx, piAddr1, &iRows1, &iCols1, &pstInput))
+ {
+- freeAllocatedMatrixOfWideString(iRows1, iCols1, pstInput);
+ Scierror(999, _("%s: Wrong type for input argument #%d: Matrix of strings expected.\n"), fname, 1);
+ return 0;
+ }
diff --git a/scilab-0004-fix-make-doc-ja_JP.patch b/scilab-0004-fix-make-doc-ja_JP.patch
new file mode 100644
index 0000000..9a6510b
--- /dev/null
+++ b/scilab-0004-fix-make-doc-ja_JP.patch
@@ -0,0 +1,36 @@
+--- a/modules/helptools/macros/xmltoformat.sci
++++ b/modules/helptools/macros/xmltoformat.sci
+@@ -1753,6 +1753,17 @@ function section_id = x2f_title2id(title
+
+ section_id = strsubst(section_id , "&" , "_" );
+
++ section_id = strsubst(section_id , ":" , "" );
++ section_id = strsubst(section_id , "\" , "_" );
++ section_id = strsubst(section_id , "/" , "_" );
++ section_id = strsubst(section_id , "''" , "_" );
++ section_id = strsubst(section_id , " " , " " );
++ section_id = strsubst(section_id , " " , "_" );
++ section_id = strsubst(section_id , "[" , "" );
++ section_id = strsubst(section_id , "]" , "" );
++
++ return;
++
+ section_id = strsubst(section_id , "À" , "A" );
+ section_id = strsubst(section_id , "Á" , "A" );
+ section_id = strsubst(section_id , "Â" , "A" );
+@@ -1810,15 +1821,6 @@ function section_id = x2f_title2id(title
+ section_id = strsubst(section_id , "ý" , "y" );
+ section_id = strsubst(section_id , "ÿ" , "y" );
+
+- section_id = strsubst(section_id , ":" , "" );
+- section_id = strsubst(section_id , "\" , "_" );
+- section_id = strsubst(section_id , "/" , "_" );
+- section_id = strsubst(section_id , "''" , "_" );
+- section_id = strsubst(section_id , " " , " " );
+- section_id = strsubst(section_id , " " , "_" );
+- section_id = strsubst(section_id , "[" , "" );
+- section_id = strsubst(section_id , "]" , "" );
+-
+ section_id = convstr(section_id,"l");
+
+ endfunction
diff --git a/scilab-0005-fix-appdata.patch b/scilab-0005-fix-appdata.patch
new file mode 100644
index 0000000..053de03
--- /dev/null
+++ b/scilab-0005-fix-appdata.patch
@@ -0,0 +1,21 @@
+--- a/desktop/scilab.appdata.xml
++++ b/desktop/scilab.appdata.xml
+@@ -4,8 +4,8 @@
+ <id type="desktop">scilab.desktop</id>
+ <licence>CC0</licence>
+ <description>
+- <p>Scilab includes hundreds of mathematical functions. It has a high level programming language allowing access to advanced data structures, 2-D and 3-D graphical functions.</p>
+- <p>A large number of functionalities is included in Scilab:</p>
++ <p>Scilab is free and open source software for numerical computation providing a powerful computing environment for engineering and scientific applications. Scilab is released as open source under the CeCILL license (GPL compatible), and is available for download free of charge. Scilab is available under GNU/Linux, Mac OS X and Windows XP/Vista/7/8.</p>
++ <p>Scilab includes hundreds of mathematical functions. It has a high level programming language allowing access to advanced data structures, 2-D and 3-D graphical functions. A large number of functionalities is included in Scilab:</p>
+ <ul>
+ <li>Maths & Simulation: For usual engineering and science applications</li>
+ <li>2-D & 3-D Visualization: Graphics functions to visualize, annotate and export data</li>
+@@ -16,6 +16,7 @@
+ <li>Application Development: Increase Scilab native functionalities and manage data exchanges</li>
+ <li>Xcos - Hybrid dynamic systems modeler and simulator: Modeling physical systems, control systems</li>
+ </ul>
++ <p>Thanks to its ability to interconnect with third-party technologies and applications, Scilab can also act as a unique platform to bring together codes written in different programming languages in a single, unified language, thus facilitating their distribution, their back-up and use.</p>
+ </description>
+ <screenshots>
+ <screenshot type="default" width="800" height="600">http://cgit.scilab.org/cgit.cgi/scilab/plain/scilab/desktop/images/scilab-desktop.png</screenshot>
diff --git a/scilab.spec b/scilab.spec
index 48eee33..6b25781 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -1,12 +1,12 @@
# baserelease defines which build revision of this version we're building.
# The magical name baserelease is matched by the rpmdev-bumpspec tool, which
# you should use.
-%global baserelease 3
+%global baserelease 1
# On a released (stable or beta) version set it to 1
%define is_release 1
# On a stable version set it to 1
-%define is_stable 0
+%define is_stable 1
# On a pre-release packages set this to the selected name
%define prerelease_name beta-1
@@ -32,7 +32,7 @@
Name: scilab
Version: 5.5.0
-Release: %{pkg_release}.1
+Release: %{pkg_release}
Summary: Scientific software package for numerical computations
Group: Applications/Engineering
@@ -53,11 +53,14 @@ Source0: http://downloadarea.scilab.org/download/%(date -d%{prerelease_da
# Bug 767102 - help() should suggest scilab-doc
Patch1: %{name}-0001-Use-pkcon-to-install-doc-package.patch
-# Bug 64307 - Use dynamic stack on 32-bit to avoid miscompilation
-# http://bugzilla.scilab.org/show_bug.cgi?id=12625
-Patch2: %{name}-0002-always-use-dynamic-stack.patch
-# Track heap space error on arm builders
-Patch3: %{name}-0003-report-issues-on-arm-build.patch
+# Fix jdk6, jdk7 or jdk8
+Patch2: %{name}-0002-enable-jdk8.patch
+# Fix some gcc-4.9 asan issues
+Patch3: %{name}-0003-fix-asan-issues.patch
+# Fix make doc-ja_JP
+Patch4: %{name}-0004-fix-make-doc-ja_JP.patch
+# Pass appdata-validate
+Patch5: %{name}-0005-fix-appdata.patch
# Dependencies are extracted from :
# "http://wiki.scilab.org/Dependencies of Scilab 5.X"
@@ -151,6 +154,7 @@ Requires: hdf5 = %{_hdf5_version}
# Specific dependencies for packaging purpose
BuildRequires: desktop-file-utils
+BuildRequires: appdata-tools
%description
Scilab is the free software for numerical computation providing a powerful
@@ -227,8 +231,10 @@ This package provide test files for Scilab.
%endif
%patch1 -p1 -b .pkgcon
-%patch2 -p1 -b .stack
-%patch3 -p1 -b .arm
+%patch2 -p1 -b .jdk8
+%patch3 -p1 -b .asan
+%patch4 -p1 -b .ja_JP-doc
+%patch5 -p1 -b .validate
# Fix Class-Path in manifest
sed -i '/name="Class-Path"/d' build.incl.xml
@@ -241,7 +247,10 @@ mv COPYING.utf8 COPYING
rm -fr ~/.Scilab
%build
-%configure --disable-static-system-lib
+# disable-static-system-lib: do not static link with compiler libs
+# without-emf: disabled because freehep-*.jar are not packaged in fedora and
+# it is a windows specific format
+%configure --disable-static-system-lib --without-emf
make %{?_smp_mflags}
make %{?_smp_mflags} doc
@@ -249,6 +258,7 @@ make %{?_smp_mflags} doc
%install
make %{?_smp_mflags} install DESTDIR=%{buildroot}
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+appdata-validate %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
%find_lang %{name}
# Remove more advanced repl, user should use CLI options instead
@@ -292,6 +302,7 @@ fi
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/*.desktop
+%{_datadir}/appdata/*.appdata.xml
%{_datadir}/icons/*/*/*/*.png
%{_datadir}/mime/packages/%{name}.xml
# part of scilab-devel
@@ -327,6 +338,9 @@ fi
%{_datadir}/%{name}/modules/*/tests
%changelog
+* Fri Apr 11 2014 Clément David <c.david86 at gmail.com> - 5.5.0-1
+- Update to 5.5.0
+
* Fri Dec 27 2013 Orion Poplawski <orion at cora.nwra.com> - 5.5.0-0.3.beta1.1
- Rebuild for hdf5 1.8.12
diff --git a/sources b/sources
index cd847fc..1e1f004 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17df63592380b46e59889a1685c934ef scilab-5.5.0-beta-1-src.tar.gz
+f35486e34735fce2e128e7f1f44839b5 scilab-5.5.0-src.tar.gz
More information about the scm-commits
mailing list