commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2020-02-28 15:22:08 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new.26092 (New) Package is "scilab" Fri Feb 28 15:22:08 2020 rev:33 rq:780196 version:6.1.0 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2019-11-21 12:58:48.082525400 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new.26092/scilab.changes 2020-02-28 15:22:14.702003517 +0100 @@ -1,0 +2,13 @@ +Tue Feb 25 14:11:32 UTC 2020 - Atri Bhattacharya + +- Update to version 6.1.0: + See https://help.scilab.org/docs/6.1.0/en_US/CHANGES.html. +- Drop scilab-fix-build-with-modern-lucene.patch: incorporated + upstream. +- Add scilab-unicode-in-copyright-header.patch: Replace a unicode + character in a copyright header as compilation fails due to it. +- GCC >= 8 is now required. +- Minor rebase of existing patches to apply cleanly against + updated sources. + +--- Old: scilab-6.0.2-src.tar.gz scilab-fix-build-with-modern-lucene.patch New: scilab-6.1.0-src.tar.gz scilab-unicode-in-copyright-header.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.158006481 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.162006490 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ Summary:High Level Programming Language/Numerical Analysis Software License:GPL-2.0-only AND BSD-3-Clause Group: Productivity/Scientific/Math -Version:6.0.2 +Version:6.1.0 Release:0 URL:http://www.scilab.org # FOR STABLE RELEASE @@ -58,8 +58,8 @@ Patch26:scilab-java_source_target.patch # PATCH-FIX-UPSTREAM scilab-drop-javax-annotation.patch badshah...@gmail.com -- 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 +# PATCH-FIX-UPSTREAM scilab-unicode-in-copyright-header.patch badshah...@gmail.com -- Compilation fails due to unicode in copyight header +Patch28:scilab-unicode-in-copyright-header.patch ExcludeArch:i586 ppc64 # SECTION Dependency to rebuild configure after patching autotools files @@ -76,15 +76,15 @@ %endif BuildRequires: eigen3-devel >= 3.3.2 BuildRequires: f2c -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: gcc-fortran +BuildRequires: gcc >= 8 +BuildRequires: gcc-c++ >= 8 +BuildRequires: gcc-fortran >= 8 BuildRequires: time ## for dynamic link features -Requires: gcc -Requires: gcc-c++ -Requires: gcc-fortran +Requires: gcc >= 8 +Requires: gcc-c++ >= 8 +Requires: gcc-fortran >= 8 # Core BuildRequires: libcurl-devel BuildRequires: libxml2-devel ++ scilab-6.0.2-src.tar.gz -> scilab-6.1.0-src.tar.gz ++ /work/SRC/openSUSE:Factory/scilab/scilab-6.0.2-src.tar.gz /work/SRC/openSUSE:Factory/.scilab.new.26092/scilab-6.1.0-src.tar.gz differ: char 5, line 1 ++ scilab-bin-correct-java9-path.patch ++ --- /var/tmp/diff_new_pack.DY7264/_old 2020-02-28 15:22:16.194006554 +0100 +++ /var/tmp/diff_new_pack.DY7264/_new 2020-02-28 15:22:16.194006554 +0100 @@ -1,8 +1,8 @@ -Index: scilab-6.0.2/bin/scilab +Index: scilab-6.1.0/bin/scilab === scilab-6.0.2.orig/bin/scilab -+++ scilab-6.0.2/bin/scilab -@@ -493,12 +493,7 @@ detect_java_vm() { +--- scilab-6.1.0.orig/bin/scilab scilab-6.1.0/bin/scilab +@@ -523,12 +523,7 @@ detect_java_vm() { if test $SCIVERBOSE -ne 0; then echo "JAVA_HOME : $JAVA_HOME" fi @@ -16,7 +16,7 @@ # Configuring LD_LIBRARY_PATH for libjava.so libhpi.so and lib.so case $OS in -@@ -604,7 +599,7 @@ detect_java_vm() { +@@ -634,7 +629,7 @@ detect_java_vm() { fi # IS_SCILAB_BINARY # Check if the lib exists @@ -25,7 +25,7 @@ if test ! -f "$LIBJAVA"; then if test $SCIVERBOSE -ne 0; then echo "Cannot find $LIBJAVA" -@@ -613,7 +608,7 @@ detect_java_vm() { +@@ -643,7 +638,7 @@ detect_java_vm() { CLASSPATH="${CLASSPATH:+:$CLASSPA
commit scilab for openSUSE:Factory
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.changes2019-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 + +- 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 - o...@aepfle.de + +- Newer versions of ocaml require usage of scilab-ocaml.patch +- Use autosetup in prep section + +--- +Fri Oct 4 06:55:37 UTC 2019 - o...@aepfle.de + +- 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 badshah...@gmail.com -- 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 badshah...@gmail.com -- 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
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2019-03-14 22:42:43 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new.28833 (New) Package is "scilab" Thu Mar 14 22:42:43 2019 rev:31 rq:684803 version:6.0.2 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-12-19 13:50:45.607172991 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new.28833/scilab.changes 2019-03-14 22:42:48.670631315 +0100 @@ -1,0 +2,34 @@ +Thu Mar 7 13:55:18 UTC 2019 - Atri B + +- Update to version 6.0.2: + * See https://help.scilab.org/docs/6.0.2/en_US/CHANGES.html. +- Drop patches either directly incorporated upstream or otherwise + fixed: + * scilab-0003-fix-desktop-categories.patch (fixed because of +updated desktop menu categories on openSUSE). + * scilab_ppc64le_java_archinstall_changed.patch. + * scilab-hdf5-1_10-compat.patch. + * scilab-hdf5-function-return-compatibility.patch. + * scilab-launch-from-xterm.patch (also drop xterm Requires). + * scilab-gfortran8-errors.patch. +- Modify scilab-java9-ClassLoader.patch to add java modules to + _JAVA_OPTIONS using "--add-modules" as opposed to + "-Djava.add.modules" which does not work. +- Add scilab-drop-javax-annotation.patch: Remove references to + javax.annotation as it is unavailable with java >= 11 and the + code referencing this doesn't do anything anyway. +- Modify patches touching configure directly to instead work on m4 + and configure.ac and regenerate configure script before + building; this makes the patches cleaner and simpler to + maintain. Add libtool BuildRequires for autoreconf dependencies. +- Minor rebase of other patches to apply cleanly. +- Use suse_update_desktop_file macro to install .desktop files + instead of desktop-file-install (less clunky). +- New BuildRequires: time. +- Update java version in Requires and BuildRequires: >= 11 now + needed. +- Drop scilab-dont-test-for-jaf.patch as JAF has been added back + to openjdk >= 11 packages for openSUSE 15.0 and newer; drop + BuildRequires and Requires on external jaf. + +--- Old: scilab-0003-fix-desktop-categories.patch scilab-6.0.1-src.tar.gz scilab-dont-test-for-jaf.patch scilab-gfortran8-errors.patch scilab-hdf5-1_10-compat.patch scilab-hdf5-function-return-compatibility.patch scilab-launch-from-xterm.patch scilab_ppc64le_java_archinstall_changed.patch New: scilab-6.0.2-src.tar.gz scilab-drop-javax-annotation.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.uqPB9v/_old 2019-03-14 22:42:51.074630481 +0100 +++ /var/tmp/diff_new_pack.uqPB9v/_new 2019-03-14 22:42:51.078630479 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,25 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define sover 6 %define soname lib%{name}%{sover} -#%define beta_version 5.5.0-beta-1 +#%%define beta_version 5.5.0-beta-1 Name: scilab Summary:High Level Programming Language/Numerical Analysis Software License:GPL-2.0-only AND BSD-3-Clause Group: Productivity/Scientific/Math -Version:6.0.1 +Version:6.0.2 Release:0 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 +#Source0: http://www.scilab.org/download/%%{beta_version}/%%{name}-%%{beta_version}-src.tar.gz Source1:%{name}-rpmlintrc # Bug 767102 - help() should suggest scilab-doc @@ -39,25 +39,14 @@ Patch3: scilab-fix-64bit-portability-issue.patch # PATCH-FIX-OPENSUSE scilab-special-jarnames.patch badshah...@gmail.com -- Adapt configure script for a few java library names peculiar to openSUSE Patch5: scilab-special-jarnames.patch -# PATCH-FIX-OPENSUSE scilab-0003-fix-xcos-desktop.patch sfal...@opensuse.org -- Change Desktop categories in xcos.desktop to clear brp-check-suse failure -Patch7: %{name}-0003-fix-desktop-categories.patch # PATCH-FIX-U
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-12-19 13:50:33 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new.28833 (New) Package is "scilab" Wed Dec 19 13:50:33 2018 rev:30 rq:657994 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-12-04 20:58:31.440574065 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new.28833/scilab.changes 2018-12-19 13:50:45.607172991 +0100 @@ -1,0 +2,6 @@ +Wed Dec 12 06:40:45 UTC 2018 - Fridrich Strba + +- BuildRequire objectweb-asm only for distro versions that use + cobertura. This avoids a moot dependency on an unused package. + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.EpFhjA/_old 2018-12-19 13:50:48.495168991 +0100 +++ /var/tmp/diff_new_pack.EpFhjA/_new 2018-12-19 13:50:48.503168979 +0100 @@ -74,7 +74,11 @@ # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory +%if 0%{?suse_version} > 1500 BuildRequires: asm5 +%else +BuildRequires: asm2 +%endif BuildRequires: eigen3-devel >= 3.3.2 BuildRequires: f2c BuildRequires: gcc @@ -183,6 +187,7 @@ %if 0%{?suse_version} <= 1230 BuildRequires: checkstyle BuildRequires: cobertura +BuildRequires: objectweb-asm %endif BuildRequires: junit4
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-12-04 20:58:20 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new.19453 (New) Package is "scilab" Tue Dec 4 20:58:20 2018 rev:29 rq:653852 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-10-15 09:43:17.003382358 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new.19453/scilab.changes 2018-12-04 20:58:31.440574065 +0100 @@ -1,0 +2,25 @@ +Sat Nov 24 01:21:25 UTC 2018 - badshah...@gmail.com + +- Add scilab-dont-test-for-jaf.patch: Disable the autoconf tests + for jar-based activation framework (JAF); JAF is available for + openjdk-11 (for openSUSE anyway), but uses jmod instead. +- Change BuildRequires to require java >= 11 following above + patch. + +--- +Mon Nov 12 00:28:27 UTC 2018 - Atri Bhattacharya + +- Enforce back java-devel = 10 requirement, JAF not found when + building against java-openjdk 11 causing build failures. + +--- +Sat Nov 3 06:27:25 UTC 2018 - Fridrich Strba + +- Build against asm5, which is the newest that we have. In any case + the configure does not find cobertura, so this is kind of a moot + dependency +- Build for suse_version >= 1500 with any java-devel >= 9, since + we merged back into our java-11-openjdk packages the Java + Activation Framework and other selected JavaEE modules + +--- New: scilab-dont-test-for-jaf.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.iWvKLR/_old 2018-12-04 20:58:32.736572635 +0100 +++ /var/tmp/diff_new_pack.iWvKLR/_new 2018-12-04 20:58:32.736572635 +0100 @@ -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/ # @@ -68,11 +68,13 @@ Patch26:scilab-java_source_target.patch # PATCH-FIX-UPSTREAM scilab-gfortran8-errors.patch badshah...@gmail.com -- Fix argument size mismatch in variable sizes; these crop up as errors when compiling against gfortran >= 8. Patch27:scilab-gfortran8-errors.patch +# PATCH-FIX-UPSTREAM scilab-dont-test-for-jaf.patch badshah...@gmail.com -- Disable the autoconf tests for jar-based activation framework (JAF); JAF is available for openjdk-11 (for openSUSE anyway), but uses jmod instead +Patch28:scilab-dont-test-for-jaf.patch ExcludeArch:i586 ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory -BuildRequires: asm2 +BuildRequires: asm5 BuildRequires: eigen3-devel >= 3.3.2 BuildRequires: f2c BuildRequires: gcc @@ -100,7 +102,7 @@ BuildRequires: ant BuildRequires: ecj %if 0%{?suse_version} >= 1500 -BuildRequires: java-devel = 10 +BuildRequires: java-devel >= 11 %else BuildRequires: java-devel = 1.8.0 %endif @@ -334,6 +336,7 @@ %endif %patch26 -p1 %patch27 -p1 +%patch28 -p1 # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig ++ scilab-dont-test-for-jaf.patch ++ Index: scilab-6.0.1/configure === --- scilab-6.0.1.orig/configure +++ scilab-6.0.1/configure @@ -809,7 +809,6 @@ FREEHEP_GRAPHICSIO FREEHEP_GRAPHICS2D FOP JEUCLID_CORE -JAF JROSETTA_ENGINE JROSETTA_API LUCENE_PARSER @@ -17826,225 +17825,6 @@ $as_echo "$as_me: WARNING: Could not fin JEUCLID_CORE=$PACKAGE_JAR_FILE -# JavaBeans Activation Framework - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking jaf" >&5 -$as_echo_n "checking jaf... " >&6; } -PACKAGE_JAR_FILE= - -DEFAULT_JAR_DIR="$(pwd)/thirdparty/ $(pwd)/jar/ /usr/local/java/ /usr/local/java/jar /usr/local/share/java/ /usr/local/share/java/jar/ /usr/local/lib/java/ $(find /usr/share/java/ -maxdepth 1 -type d 2>/dev/null | sort) $(find /usr/lib64/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/lib/ -maxdepth 1 -type d 2>/dev/null) $(find /usr/share/*/lib -maxdepth 1 -type d 2>/dev/null) /opt/java/lib/" - -jar_resolved="$(find $DEFAULT_JAR_DIR -maxdepth 1 \( -type f -name 'jaf.jar' -or -name 'libjaf.jar' -or -name 'libjaf-java.jar' -or -name 'jaf*.jar' \) 2>/dev/null |tr '\n' ':')." - -if test ! -f conftestSharedChecker.class ; then - -cat << \EOF > conftestSharedChecker.java -//
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-10-15 09:42:49 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Mon Oct 15 09:42:49 2018 rev:28 rq:641727 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-04-24 15:33:33.409294347 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-10-15 09:43:17.003382358 +0200 @@ -1,0 +2,9 @@ +Fri Oct 12 12:29:09 UTC 2018 - badshah...@gmail.com + +- Require java 10 stringently, as java >= 11 has dropped JAF (Java + Activation Framework) and scilab does not build without it. +- Add scilab-gfortran8-errors.patch: Fix size mismatch between + function arguments and variables; these crop up as errors when + compiling against gfortran >= 8. + +--- New: scilab-gfortran8-errors.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.eUIoMN/_old 2018-10-15 09:43:18.171381046 +0200 +++ /var/tmp/diff_new_pack.eUIoMN/_new 2018-10-15 09:43:18.171381046 +0200 @@ -66,6 +66,8 @@ Patch25:scilab-java9-ClassLoader.patch # PATCH-FIX-OPENSUSE scilab-java_source_target.patch fridrich.st...@suse.com -- Build with source and target 6 in order to avoid runtime errors of unrecognized bytecode Patch26:scilab-java_source_target.patch +# PATCH-FIX-UPSTREAM scilab-gfortran8-errors.patch badshah...@gmail.com -- Fix argument size mismatch in variable sizes; these crop up as errors when compiling against gfortran >= 8. +Patch27:scilab-gfortran8-errors.patch ExcludeArch:i586 ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" @@ -98,7 +100,7 @@ BuildRequires: ant BuildRequires: ecj %if 0%{?suse_version} >= 1500 -BuildRequires: java-devel >= 9 +BuildRequires: java-devel = 10 %else BuildRequires: java-devel = 1.8.0 %endif @@ -107,8 +109,8 @@ BuildRequires: lucene-analyzers-common >= 6.0 BuildRequires: lucene-queryparser >= 6.0 -Requires: java >= 9 Requires: ecj +Requires: java = 10 Requires: lucene >= 6.0 Requires: lucene-analyzers-common >= 6.0 Requires: lucene-queryparser >= 6.0 @@ -331,6 +333,7 @@ %patch25 -p1 %endif %patch26 -p1 +%patch27 -p1 # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig ++ scilab-gfortran8-errors.patch ++ Index: scilab-6.0.1/modules/differential_equations/src/fortran/twodq.f === --- scilab-6.0.1.orig/modules/differential_equations/src/fortran/twodq.f +++ scilab-6.0.1/modules/differential_equations/src/fortran/twodq.f @@ -900,7 +900,7 @@ C END subroutine tridv(node,node1,node2,coef,rank) - double precision node(10),node1(10),node2(10),coef + double precision node(9),node1(9),node2(9),coef integer rank double precision s(3),coef1,temp integer t(3)
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-04-24 15:33:25 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Tue Apr 24 15:33:25 2018 rev:27 rq:600016 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-04-05 15:33:35.399929170 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-04-24 15:33:33.409294347 +0200 @@ -1,0 +2,6 @@ +Fri Apr 20 20:20:34 UTC 2018 - badshah...@gmail.com + +- Explicitly add Requires: java >= 9 to make sure the correct + version of java is installed in the system. + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.h7HX1h/_old 2018-04-24 15:33:36.233192177 +0200 +++ /var/tmp/diff_new_pack.h7HX1h/_new 2018-04-24 15:33:36.237192032 +0200 @@ -107,6 +107,7 @@ BuildRequires: lucene-analyzers-common >= 6.0 BuildRequires: lucene-queryparser >= 6.0 +Requires: java >= 9 Requires: ecj Requires: lucene >= 6.0 Requires: lucene-analyzers-common >= 6.0
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-04-05 15:33:32 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Thu Apr 5 15:33:32 2018 rev:26 rq:593521 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-03-14 19:40:17.994512351 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-04-05 15:33:35.399929170 +0200 @@ -1,0 +2,9 @@ +Wed Apr 4 10:30:35 UTC 2018 - fst...@suse.com + +- Add scilab-java_source_target.patch: Build with source and target + 6 in order to avoid runtime errors with unrecognized class + version. +- Make build with any java-devel >= 9 for openSUSE >= 1500, in + order not to depend on a particular exact java version. + +--- New: scilab-java_source_target.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.ZzOdvI/_old 2018-04-05 15:33:37.127866719 +0200 +++ /var/tmp/diff_new_pack.ZzOdvI/_new 2018-04-05 15:33:37.131866574 +0200 @@ -64,6 +64,8 @@ Patch24:scilab-xcos-java9.patch # PATCH-FIX-UPSTREAM scilab-java9-ClassLoader.patch badshah...@gmail.com -- Hack frontloading of all necessary jar classpaths by passing them to _JAVA_OPTIONS since dynamic classpath loading doesn not work any more; see http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-java-9-td4037645.html Patch25:scilab-java9-ClassLoader.patch +# PATCH-FIX-OPENSUSE scilab-java_source_target.patch fridrich.st...@suse.com -- Build with source and target 6 in order to avoid runtime errors of unrecognized bytecode +Patch26:scilab-java_source_target.patch ExcludeArch:i586 ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" @@ -96,7 +98,7 @@ BuildRequires: ant BuildRequires: ecj %if 0%{?suse_version} >= 1500 -BuildRequires: java-devel = 9 +BuildRequires: java-devel >= 9 %else BuildRequires: java-devel = 1.8.0 %endif @@ -327,6 +329,7 @@ %patch24 -p1 %patch25 -p1 %endif +%patch26 -p1 # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig ++ scilab-java_source_target.patch ++ --- scilab-6.0.1/modules/scirenderer/build.xml 2018-02-15 09:40:51.0 +0100 +++ scilab-6.0.1/modules/scirenderer/build.xml 2018-03-20 16:39:49.477864166 +0100 @@ -102,7 +102,7 @@ - - - -
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-03-14 19:39:55 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Wed Mar 14 19:39:55 2018 rev:25 rq:586375 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-03-08 10:58:43.610673836 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-03-14 19:40:17.994512351 +0100 @@ -1,0 +2,10 @@ +Mon Mar 12 14:12:13 UTC 2018 - badshah...@gmail.com + +- Drop scilab-self-closing-br.patch: No longer required as the + offending issues have been fixed upstream and we don't care for + the minor pieces enough to carry around this patch; see + https://bugzilla.scilab.org/show_bug.cgi?id=14695. +- Require xterm for scilab since the desktop launchers now launch + the executable via xterm. + +--- Old: scilab-self-closing-br.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.6FhKnN/_old 2018-03-14 19:40:21.438390019 +0100 +++ /var/tmp/diff_new_pack.6FhKnN/_new 2018-03-14 19:40:21.450389593 +0100 @@ -22,7 +22,7 @@ Name: scilab Summary:High Level Programming Language/Numerical Analysis Software -License:GPL-2.0 AND BSD-3-Clause +License:GPL-2.0-only AND BSD-3-Clause Group: Productivity/Scientific/Math Version:6.0.1 Release:0 @@ -47,8 +47,6 @@ Patch9: scilab-timestamp.patch # to sync with java-1_8_0-openjdk sr #365892 Patch11:scilab_ppc64le_java_archinstall_changed.patch -# PATCH-FIX-UPSTREAM scilab-self-closing-br.patch badshah...@gmail.com -- Fix build failures with updated javadoc -Patch13:scilab-self-closing-br.patch # PATCH-FIX-UPSTREAM scilab-hdf5-1_10-compat.patch badshah...@gmail.com -- 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 @@ -199,6 +197,9 @@ Requires: scilab-devel = %{version} Requires: scilab-modules = %{version} +# Scilab needs to be run from a running terminal, so require xterm [http://bugzilla.scilab.org/show_bug.cgi?id=14682] +Requires: xterm + Recommends: scilab-lang = %{version} Requires(post): shared-mime-info @@ -315,7 +316,6 @@ %if 0%{?suse_version} > 1320 || 0%{?leap_version} == 420300 %patch11 -p1 %endif -%patch13 -p1 %patch14 -p1 %patch17 -p1 %patch20 -p1
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-03-08 10:58:43 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Thu Mar 8 10:58:43 2018 rev:24 rq:583871 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-03-04 12:50:17.172658673 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-03-08 10:58:43.610673836 +0100 @@ -1,0 +2,23 @@ +Mon Feb 26 12:29:17 UTC 2018 - badshah...@gmail.com + +- Update License in keeping with upstream: Scilab is now + distributed under the terms of GPL-2.0. +- Modify scilab-launch-from-xterm.patch: also add scinotes and + xcos desktop launchers to patch, and make them launch via xterm; + add xterm to Requires. +- Modify scilab-openjdk9-no-javah.patch: enclose JAVAH variable + declaration in quotes. +- Document the addition of jaf = 1.1 to [Build]Requires; added in + previous commit, and required for building documentation in + conjunction with scilab-java9-ClassLoader.patch; not required + for openSUSE < 1500 where jdk 1.8 is used. +- Restore sed commands to clear Class-Path from Manifest files; + this was erroneously removed in previous commit. +- Use jdk 9 only for openSUSE >= 1500; disable patches relating + to jdk 9+ for older openSUSE. +- Enforce minimum version on eigen3-devel BuildRequires: at least + version 3.3.2 required. +- Add i586 to ExcludeArch, building no longer supported by + upstream. + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.SVKamo/_old 2018-03-08 10:58:45.378609932 +0100 +++ /var/tmp/diff_new_pack.SVKamo/_new 2018-03-08 10:58:45.382609787 +0100 @@ -22,7 +22,7 @@ Name: scilab Summary:High Level Programming Language/Numerical Analysis Software -License:CECILL-2.0 and BSD-3-Clause +License:GPL-2.0 AND BSD-3-Clause Group: Productivity/Scientific/Math Version:6.0.1 Release:0 @@ -66,12 +66,12 @@ Patch24:scilab-xcos-java9.patch # PATCH-FIX-UPSTREAM scilab-java9-ClassLoader.patch badshah...@gmail.com -- Hack frontloading of all necessary jar classpaths by passing them to _JAVA_OPTIONS since dynamic classpath loading doesn not work any more; see http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-java-9-td4037645.html Patch25:scilab-java9-ClassLoader.patch -ExcludeArch:ppc64 +ExcludeArch:i586 ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory BuildRequires: asm2 -BuildRequires: eigen3-devel +BuildRequires: eigen3-devel >= 3.3.2 BuildRequires: f2c BuildRequires: gcc BuildRequires: gcc-c++ @@ -97,7 +97,11 @@ # GUI/Console BuildRequires: ant BuildRequires: ecj +%if 0%{?suse_version} >= 1500 BuildRequires: java-devel = 9 +%else +BuildRequires: java-devel = 1.8.0 +%endif BuildRequires: jpackage-utils BuildRequires: lucene >= 6.0 BuildRequires: lucene-analyzers-common >= 6.0 @@ -158,9 +162,11 @@ Requires: saxon9 #BuildRequires: docbook-style-xsl BuildRequires: docbook-xsl-stylesheets +%if 0%{?suse_version} >= 1500 BuildRequires: jaf = 1.1 -BuildRequires: liberation-fonts Requires: jaf = 1.1 +%endif +BuildRequires: liberation-fonts # make doc now requires access to display BuildRequires: Mesa-libGL-devel BuildRequires: xorg-x11-server @@ -315,13 +321,21 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 +%if 0%{?suse_version} >= 1500 %patch23 -p1 %patch24 -p1 %patch25 -p1 +%endif # Remove a bad merge remnant (.orig file) to prevent trigerring rpmlint's suse-filelist-forbidden rm ./modules/cacsd/tests/unit_tests/dscr.tst.orig +# Fix Class-Path in manifest +sed -i '/name="Class-Path"/d' build.incl.xml +sed -i '/name="Class-Path"/d' modules/javasci/build.xml +sed -i '/name="Class-Path"/d' modules/scirenderer/build.xml + %build %configure \ --disable-static-system-lib \ @@ -332,10 +346,13 @@ make -C modules/scicos modelicac modelicat XML2Modelica make %{?_smp_mflags} +# JAVA 9 IS ONLY USED FOR openSUSE >= 1500 +%if 0%{?suse_version} >= 1500 export SCI_ALL_JAR_CLASSPATHS=`grep -Eo "\".*.jar" etc/classpath.xml | sed 's/$SCILAB/$SCI/' | tr -d "\"" | tr "\n" ":"` sed -i "s|@SPEC_ALL_JAR_CLASSPATHS@|${SCI_ALL_JAR_CLASSPATHS}|" bin/scilab export SCI_LIB_PATH=%{_libdir}/scilab sed -i "s|@SPEC_SCI_LIB_PATH@|${SCI_LIB_PATH}|" bin/scilab +%endif # SED HACK TO FRONTLOAD ALL NECESSARY JARS WHEN STARTING SCILAB # See discussion http://mailinglists.scilab
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-03-04 12:49:48 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Sun Mar 4 12:49:48 2018 rev:23 rq:580961 version:6.0.1 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2018-02-14 10:51:55.821017984 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-03-04 12:50:17.172658673 +0100 @@ -1,0 +2,52 @@ +Thu Feb 22 13:26:14 UTC 2018 - badshah...@gmail.com + +- Enforce java 9 for building, as there are runtime error when + java 10 is used +- Add scilab-xcos-java9.patch: Fix xcos compilation against + openjdk-java 9; enable building xcos during configure. +- Add scilab-java9-ClassLoader.patch: Hack frontloading of all + necessary jar classpaths by passing them to _JAVA_OPTIONS since + dynamic classpath loading doesn not work any more; see + http://mailinglists.scilab.org/Scilab-GUI-and-adv-cli-fail-to-launch-with-java-9-td4037645.html +- Enable documentation; building fixed due to above patch. +- Add scilab-bin-correct-java9-path.patch +- Drop scilab-batik-1.8.patch + +--- +Fri Feb 16 16:47:27 UTC 2018 - badshah...@gmail.com + +- Update to version 6.0.1: + * Long list of changes, see +https://help.scilab.org/docs/6.0.1/en_US/CHANGES.html +- Update BuildRequires and Requires: eigen3-devel [only + BuildRequires], ecj, java-devel >= 9, lucene* >= 6.0. +- Add scilab-launch-from-xterm.patch: Modify Exec key for .desktop + file so that scilab is launched via xterm; this is needed + because of upstream's negligence: + http://bugzilla.scilab.org/show_bug.cgi?id=14682. +- Disable documentation module: does not build with java >= 9; see + http://bugzilla.scilab.org/show_bug.cgi?id=15328. + Workaround: Use + https://help.scilab.org/docs/6.0.1/en_US/index.html. +- Add scilab-openjdk9-no-javah.patch: configure + should not error out when javah is not found, instead should + simply use javac -h. See + http://bugzilla.scilab.org/show_bug.cgi?id=15328. +- Exclude nullpotent post[un] scriptlets for main package: these + are instead hndled by rpm file-triggers. +- Add scilab-no-return-in-non-void.patch: Fix non-void functions + to return some trivial values. +- Add scilab-hdf5-function-return-compatibility.patch: Make + function writeDoubleComplexMatrix6's definition and + implementation return same data type. +- Minor rebase of carried over patches. +- Drop patches incorporated upstream: + * scilab-0002-always-use-dynamic-stack.patch + * scilab-allow-batik-1.9.patch + * scilab-build-with-fop-2_1.patch + * scilab-gcc7-nullptr-fix.patch + * scilab-build-with-xmlgraphics-commons-2_0.patch + * scilab-ocaml.patch + * scilab-openjdk9-support.patch. + +--- Old: scilab-0002-always-use-dynamic-stack.patch scilab-5.5.2-src.tar.gz scilab-batik-1.8.patch scilab-build-with-fop-2_1.patch scilab-build-with-xmlgraphics-commons-2_0.patch scilab-gcc7-nullptr-fix.patch scilab-ocaml.patch scilab-openjdk9-support.patch New: scilab-6.0.1-src.tar.gz scilab-bin-correct-java9-path.patch scilab-hdf5-function-return-compatibility.patch scilab-java9-ClassLoader.patch scilab-launch-from-xterm.patch scilab-no-return-in-non-void.patch scilab-openjdk9-no-javah.patch scilab-xcos-java9.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.tgqsqS/_old 2018-03-04 12:50:19.800562903 +0100 +++ /var/tmp/diff_new_pack.tgqsqS/_new 2018-03-04 12:50:19.804562757 +0100 @@ -16,7 +16,7 @@ # -%define sover 5 +%define sover 6 %define soname lib%{name}%{sover} #%define beta_version 5.5.0-beta-1 @@ -24,7 +24,7 @@ Summary:High Level Programming Language/Numerical Analysis Software License:CECILL-2.0 and BSD-3-Clause Group: Productivity/Scientific/Math -Version:5.5.2 +Version:6.0.1 Release:0 Url:http://www.scilab.org # FOR STABLE RELEASE @@ -35,43 +35,43 @@ # 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 # PATCH-FIX-UPSTREAM scilab-fix-64bit-portability-issue.patch badshah...@gmail.com -- Fix compiler warnings w.r.t 64bit portability Patch3: scilab-fix-64bit-portability-issue.patch -# PATCH-FIX-UPSTREAM scilab-ocaml.patch o...@aepfle.de -- Fix build wit
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2018-02-14 10:51:48 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Wed Feb 14 10:51:48 2018 rev:22 rq:576308 version:5.5.2 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2017-07-21 22:49:37.462822866 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2018-02-14 10:51:55.821017984 +0100 @@ -1,0 +2,11 @@ +Sun Feb 11 20:19:06 UTC 2018 - badshah...@gmail.com + +- Disable Xcos until building with java >=9 can be fixed. + +--- +Sun Dec 10 17:14:21 UTC 2017 - badshah...@opensuse.org + +- Add scilab-openjdk9-support.patch: Add support for openjdk 9; + patch taken from upstream git and rebased for version 5.5.2. + +--- New: scilab-openjdk9-support.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.oI9Hzg/_old 2018-02-14 10:51:57.816946148 +0100 +++ /var/tmp/diff_new_pack.oI9Hzg/_new 2018-02-14 10:51:57.824945860 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -65,6 +65,8 @@ # 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 badshah...@gmail.com -- Replace the character-literal '\0' by appropriate null pointer '0' to fix compilation with gcc >= 7 Patch15:scilab-gcc7-nullptr-fix.patch +# PATCH-FIX-UPSTREAM scilab-openjdk9-support.patch badshah...@opensuse.org -- Add support for openjdk 9; patch taken from upstream git and rebased for version 5.5.2 +Patch16:scilab-openjdk9-support.patch ExcludeArch:ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" @@ -94,7 +96,7 @@ # GUI/Console BuildRequires: ant -BuildRequires: java-devel >= 1.8.0 +BuildRequires: java-devel = 9 BuildRequires: jpackage-utils BuildRequires: Mesa-devel @@ -308,6 +310,7 @@ %patch14 -p1 %if 0%{?suse_version} > 1320 %patch15 -p1 +%patch16 -p1 %endif # Fix Class-Path in manifest @@ -316,18 +319,15 @@ sed -i '/name="Class-Path"/d' modules/scirenderer/build.xml %build +# Disable xcos until it can build with java >= 9 %configure \ --disable-static-system-lib \ --without-umfpack \ ---without-emf +--without-emf \ +--without-xcos make -export DISPLAY=%{X_display} -Xvfb %{X_display} >& Xvfb.log & -sleep 5 -make doc - %install make install DESTDIR=%{buildroot} @@ -348,7 +348,7 @@ rm -fr %{buildroot}%{_datadir}/applications/%{name}-*.desktop # Fix categories and install .desktop files -for i in scilab scinotes xcos; \ +for i in scilab scinotes; \ do desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ @@ -435,7 +435,7 @@ %defattr(-,root,root) %{_datadir}/%{name}/modules/ # part of scilab-doc -%exclude %{_datadir}/%{name}/modules/helptools/jar/%{name}_*.jar +#%exclude %{_datadir}/%{name}/modules/helptools/jar/%{name}_*.jar %exclude %{_datadir}/%{name}/modules/*/examples %exclude %{_datadir}/%{name}/modules/*/help # part of scilab-tests @@ -445,8 +445,8 @@ %defattr(-,root,root) %{_datadir}/%{name}/modules/*/examples %{_datadir}/%{name}/modules/*/help -%{_datadir}/%{name}/modules/helptools/jar/%{name}_images.jar -%{_datadir}/%{name}/modules/helptools/jar/%{name}_en_US_help.jar +#%{_datadir}/%{name}/modules/helptools/jar/%{name}_images.jar +#%{_datadir}/%{name}/modules/helptools/jar/%{name}_en_US_help.jar %files modules-doc-lang -f %{name}-modules-doc.lang %defattr(-,root,root) ++ scilab-openjdk9-support.patch ++ From: Clément DAVID Date: Fri, 8 Dec 2017 12:56:53 + (+0100) Subject: configure: detect Java 9 correctly X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=commitdiff_plain;h=34213c9e5ca5dbb2f421eeb173a67da236b9327f;hp=5cf6aebe58a73d759b4e53978fdd60bd8b0e0191 configure: detect Java 9 correctly Change-Id: I9b77db62a6fea7ceb1176df1bbf513268dca7e37 --- Index: scilab-5.5.2/build.incl.xml === --- scilab-5.5.2.orig/build.incl.xml +++ scilab-5.5.2/build.incl.xml @@ -89,7 +89,8 @@ - + + Index: scilab-5.5.2/configure
commit scilab for openSUSE:Factory
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.changes2017-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 - o...@aepfle.de + +- 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 badshah...@gmail.com -- Fix compiler warnings w.r.t 64bit portability Patch3: scilab-fix-64bit-portability-issue.patch +# PATCH-FIX-UPSTREAM scilab-ocaml.patch o...@aepfle.de -- Fix build with ocaml-4.05 with scilab-ocaml.patch (bug#15107) +Patch4: scilab-ocaml.patch # PATCH-FIX-OPENSUSE scilab-special-jarnames.patch badshah...@gmail.com -- 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 badshah...@gmail.com -- 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 \
commit scilab for openSUSE:Factory
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.changes2017-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 - badshah...@gmail.com + +- 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 badshah...@gmail.com -- 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 badshah...@gmail.com -- 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); }
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2017-05-08 19:03:44 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Mon May 8 19:03:44 2017 rev:19 rq:493314 version:5.5.2 Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2016-08-11 18:53:33.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2017-05-08 19:04:19.153081572 +0200 @@ -1,0 +2,9 @@ +Sun Apr 30 22:12:15 UTC 2017 - badshah...@gmail.com + +- Also apply patches scilab-batik-1.8.patch, + scilab-batik-1.8.patch, + scilab_ppc64le_java_archinstall_changed.patch for Leap:42.3 as + the versions of dependencies have been upgraded to sync with + Factory. + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.Yr4Q3Q/_old 2017-05-08 19:04:20.956826761 +0200 +++ /var/tmp/diff_new_pack.Yr4Q3Q/_new 2017-05-08 19:04:20.956826761 +0200 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -294,7 +294,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?leap_version} == 420300 %patch10 -p1 %patch11 -p1 %patch12 -p1
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-08-11 18:53:30 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2016-07-01 10:00:38.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-08-11 18:53:33.0 +0200 @@ -1,0 +2,8 @@ +Thu Aug 4 18:17:01 UTC 2016 - badshah...@gmail.com + +- Add scilab-hdf5-1_10-compat.patch to adapt code to HDF5 (>= + 1.10) and fix build failures. +- Add scilab-self-closing-br.patch to fix building with updated + javadoc. + +--- New: scilab-hdf5-1_10-compat.patch scilab-self-closing-br.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.ThdR6z/_old 2016-08-11 18:53:36.0 +0200 +++ /var/tmp/diff_new_pack.ThdR6z/_new 2016-08-11 18:53:36.0 +0200 @@ -56,7 +56,10 @@ Patch11:scilab_ppc64le_java_archinstall_changed.patch # PATCH-FIX-UPSTREAM scilab-build-with-fop-2_1.patch badshah...@gmail.com -- Fix build failures when using xmlgraphics-fop >= 2.1 which has now landed in openSUSE:Factory; patch taken from upstream Patch12:scilab-build-with-fop-2_1.patch - +# PATCH-FIX-UPSTREAM scilab-self-closing-br.patch badshah...@gmail.com -- Fix build failures with updated javadoc +Patch13:scilab-self-closing-br.patch +# PATCH-FIX-UPSTREAM scilab-hdf5-1_10-compat.patch badshah...@gmail.com -- 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 ExcludeArch:ppc64 # Dependencies are extracted from : @@ -296,6 +299,8 @@ %patch11 -p1 %patch12 -p1 %endif +%patch13 -p1 +%patch14 -p1 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++ scilab-hdf5-1_10-compat.patch ++ Index: scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c === --- scilab-5.5.2.orig/modules/hdf5/src/c/h5_readDataFromFile.c +++ scilab-5.5.2/modules/hdf5/src/c/h5_readDataFromFile.c @@ -716,7 +716,11 @@ int readCommonPolyMatrix(int _iDatasetId /* * Open the referenced object, get its name and type. */ -obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pData[i]); +obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pData[i]); if (_iComplex) { status = readComplexPoly(obj, &_piNbCoef[i], &_pdblReal[i], &_pdblImg[i]); @@ -950,7 +954,11 @@ int readCommonSparseComplexMatrix(int _i } //read Row data -obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); +obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[0]); status = readInteger32Matrix(obj, _piNbItemRow); if (status < 0) { @@ -958,7 +966,11 @@ int readCommonSparseComplexMatrix(int _i } //read cols data -obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); +obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[1]); status = readInteger32Matrix(obj, _piColPos); if (status < 0) { @@ -966,7 +978,11 @@ int readCommonSparseComplexMatrix(int _i } //read sparse data -obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[2]); +obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[2]); if (_iComplex) { @@ -1017,7 +1033,11 @@ int readBooleanSparseMatrix(int _iDatase } //read Row data -obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[0]); +obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DATASET_ACCESS_DEFAULT, +#endif + H5R_OBJECT, &pRef[0]); status = readInteger32Matrix(obj, _piNbItemRow); if (status < 0) { @@ -1027,7 +1047,11 @@ int readBooleanSparseMatrix(int _iDatase if (_iNbItem != 0) { //read cols data -obj = H5Rdereference(_iDatasetId, H5R_OBJECT, &pRef[1]); +obj = H5Rdereference(_iDatasetId, +#if H5_VERSION_GE(1,10,0) + H5P_DA
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-07-01 10:00:37 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2016-06-26 23:52:11.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-07-01 10:00:38.0 +0200 @@ -1,0 +2,5 @@ +Mon Jun 20 06:54:59 UTC 2016 - o...@aepfle.de + +- BuildRequire ocaml.opt to avoid failure in bytecode-only projects + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.DkWbqq/_old 2016-07-01 10:00:40.0 +0200 +++ /var/tmp/diff_new_pack.DkWbqq/_new 2016-07-01 10:00:40.0 +0200 @@ -133,6 +133,7 @@ # Modelica BuildRequires: ocaml +BuildRequires: ocaml(ocaml.opt) # Documentation BuildRequires: saxon9
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-06-26 23:52:09 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2016-04-28 16:56:57.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-06-26 23:52:11.0 +0200 @@ -1,0 +2,5 @@ +Tue Jun 14 11:05:01 UTC 2016 - o...@aepfle.de + +- Sources do not handle make -j N, remove _smp_mflags usage + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.GFq3wE/_old 2016-06-26 23:52:13.0 +0200 +++ /var/tmp/diff_new_pack.GFq3wE/_new 2016-06-26 23:52:13.0 +0200 @@ -307,15 +307,15 @@ --without-umfpack \ --without-emf -make %{?_smp_mflags} +make export DISPLAY=%{X_display} Xvfb %{X_display} >& Xvfb.log & sleep 5 -make %{?_smp_mflags} doc +make doc %install -make %{?_smp_mflags} install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} # Install .conf file so that ldconfig can find shared libs in non-std location mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-04-28 16:54:03 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2016-03-26 15:25:58.0 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-04-28 16:56:57.0 +0200 @@ -1,0 +2,7 @@ +Wed Apr 13 21:33:52 UTC 2016 - badshah...@gmail.com + +- Add scilab-build-with-fop-2_1.patch to fix build failures when + using xmlgraphics-fop >= 2.1 which has now landed in + openSUSE:Factory; patch taken from upstream. + +--- New: scilab-build-with-fop-2_1.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.6CYk6S/_old 2016-04-28 16:56:59.0 +0200 +++ /var/tmp/diff_new_pack.6CYk6S/_new 2016-04-28 16:56:59.0 +0200 @@ -54,6 +54,9 @@ Patch10:scilab-batik-1.8.patch # to sync with java-1_8_0-openjdk sr #365892 Patch11:scilab_ppc64le_java_archinstall_changed.patch +# PATCH-FIX-UPSTREAM scilab-build-with-fop-2_1.patch badshah...@gmail.com -- Fix build failures when using xmlgraphics-fop >= 2.1 which has now landed in openSUSE:Factory; patch taken from upstream +Patch12:scilab-build-with-fop-2_1.patch + # exclude ppc64 build as long as upstream open http://bugzilla.scilab.org/show_bug.cgi?id=13826 ExcludeArch:ppc64 # Dependencies are extracted from : @@ -290,6 +293,7 @@ %if 0%{?suse_version} > 1320 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %endif # Fix Class-Path in manifest ++ scilab-build-with-fop-2_1.patch ++ --- a/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java +++ b/modules/helptools/src/java/org/scilab/modules/helptools/FopConverter.java @@ -43,10 +43,10 @@ public class FopConverter extends Contai String fileName = outputDirectory + "/" + baseName + "." + format.name().toLowerCase(); try { -FopFactory fopFactory = FopFactory.newInstance(); +final File configuration = new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml"); +FopFactory fopFactory = FopFactory.newInstance(configuration); fopFactory.addElementMapping(new JLaTeXMathElementMapping()); fopFactory.getXMLHandlerRegistry().addXMLHandler(new JLaTeXMathXMLHandler()); -fopFactory.setUserConfig(new File(System.getenv("SCI") + "/modules/helptools/etc/fopconf.xml")); // Step 3: Construct fop with desired output format OutputStream out = new BufferedOutputStream(new FileOutputStream(fileName)); --- a/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java +++ b/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/CodeExporter.java @@ -114,11 +114,10 @@ public class CodeExporter extends FOCode * @param format the page format */ public void convert(String code, int[] lineNumberArray, String fileName, String type, String title, PageFormat format) { -FopFactory fopFactory = FopFactory.newInstance(); OutputStream out = null; try { -fopFactory.setUserConfig(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); +FopFactory fopFactory = FopFactory.newInstance(new File(ScilabConstants.SCI + "/modules/helptools/etc/fopconf.xml")); FOUserAgent userAgent = fopFactory.newFOUserAgent(); userAgent.setProducer(CREATOR); userAgent.setTitle(title);
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-03-26 15:25:53 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2016-03-17 16:48:16.0 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-03-26 15:25:58.0 +0100 @@ -1,0 +2,8 @@ +Mon Mar 21 12:31:45 UTC 2016 - norm...@linux.vnet.ibm.com + +- new scilab_ppc64le_java_archinstall_changed.patch + to sync with java-1_8_0-openjdk sr #365892 +- exclude ppc64 build as upstream still open bug + http://bugzilla.scilab.org/show_bug.cgi?id=13826 + +--- New: scilab_ppc64le_java_archinstall_changed.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.jft3WM/_old 2016-03-26 15:26:01.0 +0100 +++ /var/tmp/diff_new_pack.jft3WM/_new 2016-03-26 15:26:01.0 +0100 @@ -52,6 +52,10 @@ Patch9: scilab-timestamp.patch # PATCH-FIX-UPSTREAM scilab-batik-1.8.patch idoen...@suse.de -- Fix build with batik 1.8 Patch10:scilab-batik-1.8.patch +# to sync with java-1_8_0-openjdk sr #365892 +Patch11:scilab_ppc64le_java_archinstall_changed.patch +# exclude ppc64 build as long as upstream open http://bugzilla.scilab.org/show_bug.cgi?id=13826 +ExcludeArch:ppc64 # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -285,6 +289,7 @@ %patch9 -p1 %if 0%{?suse_version} > 1320 %patch10 -p1 +%patch11 -p1 %endif # Fix Class-Path in manifest ++ scilab_ppc64le_java_archinstall_changed.patch ++ --- bin/scilab |5 - configure |5 - m4/java.m4 |5 - 3 files changed, 12 insertions(+), 3 deletions(-) Index: scilab-5.5.2/m4/java.m4 === --- scilab-5.5.2.orig/m4/java.m4 +++ scilab-5.5.2/m4/java.m4 @@ -481,9 +481,12 @@ AC_DEFUN([AC_JAVA_JNI_LIBS], [ powerpc) machine=ppc ;; -ppc64|ppc64le) +ppc64) machine=ppc64 ;; +ppc64le) + machine=ppc64le + ;; armv*) machine=arm ;; Index: scilab-5.5.2/configure === --- scilab-5.5.2.orig/configure +++ scilab-5.5.2/configure @@ -11810,9 +11810,12 @@ $as_echo "$ac_cv_java_jvm_jni_working" > powerpc) machine=ppc ;; -ppc64|ppc64le) +ppc64) machine=ppc64 ;; +ppc64le) + machine=ppc64le + ;; armv*) machine=arm ;; Index: scilab-5.5.2/bin/scilab === --- scilab-5.5.2.orig/bin/scilab +++ scilab-5.5.2/bin/scilab @@ -528,9 +528,12 @@ detect_java_vm() { "ppc"|"powerpc") proc="ppc" ;; -"ppc64"|"ppc64el") +"ppc64") proc="ppc64" ;; +"ppc64le") +proc="ppc64le" +;; "s390") proc="s390" ;;
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-03-17 16:35:03 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2016-01-08 15:23:59.0 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-03-17 16:48:16.0 +0100 @@ -1,0 +2,11 @@ +Tue Mar 15 12:26:44 UTC 2016 - idon...@suse.com + +- Add scilab-batik-1.8.patch to fix build with Batik 1.8 + +--- +Mon Mar 7 13:33:34 UTC 2016 - o...@aepfle.de + +- Remove timestamps from binaries + scilab-timestamp.patch + +--- New: scilab-batik-1.8.patch scilab-timestamp.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.vf8Q1X/_old 2016-03-17 16:48:18.0 +0100 +++ /var/tmp/diff_new_pack.vf8Q1X/_new 2016-03-17 16:48:18.0 +0100 @@ -48,6 +48,10 @@ Patch7: %{name}-0003-fix-desktop-categories.patch # PATCH-FIX-UPSTREAM scilab-build-with-jogl-gluegen-2.3.patch badshah...@gmail.com -- Make scilab build with jogl and gluegen >= 2.3.0 Patch8: scilab-build-with-jogl-2.3.patch +# PATCH-FIX-OPENSUSE scilab-timestamp.patch o...@aepfle.de -- Remove timestamps from binaries +Patch9: scilab-timestamp.patch +# PATCH-FIX-UPSTREAM scilab-batik-1.8.patch idoen...@suse.de -- Fix build with batik 1.8 +Patch10:scilab-batik-1.8.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -278,6 +282,10 @@ %endif %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%if 0%{?suse_version} > 1320 +%patch10 -p1 +%endif # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++ scilab-batik-1.8.patch ++ Index: scilab-5.5.2/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java === --- scilab-5.5.2.orig/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java +++ scilab-5.5.2/modules/graph/src/java/org/scilab/modules/graph/utils/ScilabGraphUtils.java @@ -28,7 +28,7 @@ import org.apache.batik.bridge.DocumentL import org.apache.batik.bridge.GVTBuilder; import org.apache.batik.bridge.UserAgent; import org.apache.batik.bridge.UserAgentAdapter; -import org.apache.batik.dom.svg.SAXSVGDocumentFactory; +import org.apache.batik.anim.dom.SAXSVGDocumentFactory; import org.apache.batik.gvt.GraphicsNode; import org.apache.batik.util.XMLResourceDescriptor; import org.scilab.forge.jlatexmath.ParseException; ++ scilab-timestamp.patch ++ --- modules/core/src/c/getstaticDebugInfo_Windows.c | 14 -- modules/core/src/c/getstaticdebuginfo.c |6 -- 2 files changed, 20 deletions(-) Index: scilab-5.5.2/modules/core/src/c/getstaticDebugInfo_Windows.c === --- scilab-5.5.2.orig/modules/core/src/c/getstaticDebugInfo_Windows.c +++ scilab-5.5.2/modules/core/src/c/getstaticDebugInfo_Windows.c @@ -47,20 +47,6 @@ char **getStaticDebugInfo_Windows(int *s str_info = (char*)MALLOC(sizeof(char) * BUFFER_LEN); if (str_info) { -sprintf(str_info, "Compilation date: %s", __DATE__); -outputDynamicList = appendStringStaticDebugInfo(outputDynamicList, &nb_info, str_info); -} - -str_info = (char*)MALLOC(sizeof(char) * BUFFER_LEN); -if (str_info) -{ -sprintf(str_info, "Compilation time: %s", __TIME__); -outputDynamicList = appendStringStaticDebugInfo(outputDynamicList, &nb_info, str_info); -} - -str_info = (char*)MALLOC(sizeof(char) * BUFFER_LEN); -if (str_info) -{ #ifdef _WIN64 sprintf(str_info, "Compiler Architecture: %s", "X64"); #else Index: scilab-5.5.2/modules/core/src/c/getstaticdebuginfo.c === --- scilab-5.5.2.orig/modules/core/src/c/getstaticdebuginfo.c +++ scilab-5.5.2/modules/core/src/c/getstaticdebuginfo.c @@ -47,12 +47,6 @@ char **getStaticDebugInfo(int *sizeArray #ifdef SCI_VERSION_STRING {"Scilab Version", SCI_VERSION_STRING}, #endif -#ifdef __DATE__ -{"Compilation date", __DATE__}, -#endif -#ifdef __TIME__ -{"Compilation time", __TIME__}, -#endif #ifdef __VERSION__ {"Compileur version", __VERSION__}, #endif
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2016-01-08 15:23:52 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2015-08-31 22:59:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2016-01-08 15:23:59.0 +0100 @@ -1,0 +2,7 @@ +Fri Jan 8 01:12:43 UTC 2016 - badshah...@gmail.com + +- Remove scilab-disable-debian-specific-cflags.patch: This causes + unforeseen issues (see e.g. http://bugzilla.scilab.org/14262) + and the corresponding commit has also been reverted upstream. + +--- Old: scilab-disable-debian-specific-cflags.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.8H0BeJ/_old 2016-01-08 15:24:01.0 +0100 +++ /var/tmp/diff_new_pack.8H0BeJ/_new 2016-01-08 15:24:01.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -48,8 +48,6 @@ Patch7: %{name}-0003-fix-desktop-categories.patch # PATCH-FIX-UPSTREAM scilab-build-with-jogl-gluegen-2.3.patch badshah...@gmail.com -- Make scilab build with jogl and gluegen >= 2.3.0 Patch8: scilab-build-with-jogl-2.3.patch -# PATCH-FIX-UPSTREAM scilab-disable-debian-specific-cflags.patch badshah...@gmail.com -- Disable cflags meant excl. for Debian -Patch9: scilab-disable-debian-specific-cflags.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -280,7 +278,6 @@ %endif %patch7 -p1 %patch8 -p1 -%patch9 -p1 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2015-08-31 22:59:29 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2015-08-19 09:29:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2015-08-31 22:59:30.0 +0200 @@ -1,0 +2,6 @@ +Mon Aug 31 04:55:31 UTC 2015 - badshah...@gmail.com + +- Apply scilab-build-with-xmlgraphics-commons-2_0.patch also for + openSUSE:42 as it too has xmlgraphics-commons >= 2.0. + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.ma7MMJ/_old 2015-08-31 22:59:32.0 +0200 +++ /var/tmp/diff_new_pack.ma7MMJ/_new 2015-08-31 22:59:32.0 +0200 @@ -274,8 +274,8 @@ %patch2 -p1 %patch3 -p1 -# Only Factory has xmlgraphics-commons > 2.0 -%if 0%{?suse_version} > 1320 +# Only > 13.2 and Leap have xmlgraphics-commons > 2.0 +%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 %patch6 -p1 %endif %patch7 -p1
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2015-08-19 09:29:08 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2015-05-27 12:53:18.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2015-08-19 09:29:17.0 +0200 @@ -1,0 +2,6 @@ +Sun Jul 26 11:46:46 UTC 2015 - badshah...@gmail.com + +- Add scilab-disable-debian-specific-cflags.patch to disable + cflags meant excl. for Debian. + +--- New: scilab-disable-debian-specific-cflags.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.UVKCEc/_old 2015-08-19 09:29:20.0 +0200 +++ /var/tmp/diff_new_pack.UVKCEc/_new 2015-08-19 09:29:20.0 +0200 @@ -48,6 +48,8 @@ Patch7: %{name}-0003-fix-desktop-categories.patch # PATCH-FIX-UPSTREAM scilab-build-with-jogl-gluegen-2.3.patch badshah...@gmail.com -- Make scilab build with jogl and gluegen >= 2.3.0 Patch8: scilab-build-with-jogl-2.3.patch +# PATCH-FIX-UPSTREAM scilab-disable-debian-specific-cflags.patch badshah...@gmail.com -- Disable cflags meant excl. for Debian +Patch9: scilab-disable-debian-specific-cflags.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -278,6 +280,7 @@ %endif %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++ scilab-disable-debian-specific-cflags.patch ++ >From 9c245277d95bc541bcee16c76e9aa11051a51e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20DAVID?= Date: Wed, 20 May 2015 10:14:09 +0200 Subject: [PATCH] Configure: disable Ubuntu/Debian specific flags These flags were used to avoid dependency on a recent glibc and thus allow the binary release to run on older systems than the compilation chain. As the compilation chain now use the older system where a Scilab runs such quirks are no more needed. Let distribution packagers perform their own choices ! Change-Id: I15683378286ec2439483aafb838ca8c7996ea6cf --- scilab/configure| 11 --- scilab/configure.ac | 11 --- 2 files changed, 22 deletions(-) --- a/configure +++ b/configure @@ -9850,7 +9850,6 @@ case "$CXX" in else DEBUG_CXXFLAGS="-DNDEBUG" fi -COMPILER_CXXFLAGS="-fno-stack-protector " # bug 3131 ;; esac @@ -9890,16 +9889,6 @@ case "$CC" in DEBUG_CFLAGS="-DNDEBUG" fi - COMPILER_CFLAGS="-fno-stack-protector " # bug 3131 - # Explictly disable the as needed. It was disable by default but Ubuntu - # activated it by default since release 11.04. See bug #8961. - # Once all cyclic dependencies have been dropped, this line could be removed. - # Check if linker supports --as-needed and --no-as-needed options - if $LD --help 2>/dev/null | grep no-as-needed > /dev/null; then - LDFLAGS="$LDFLAGS -Wl,--no-as-needed" - fi - - case "$host" in x86_64-*-linux-gnu | x86_64-linux-gnu) ARCH_CFLAGS="-m64" --- a/configure.ac +++ b/configure.ac @@ -545,7 +545,6 @@ case "$CXX" in else DEBUG_CXXFLAGS="-DNDEBUG" fi -COMPILER_CXXFLAGS="-fno-stack-protector " # bug 3131 ;; esac @@ -585,16 +584,6 @@ case "$CC" in DEBUG_CFLAGS="-DNDEBUG" fi - COMPILER_CFLAGS="-fno-stack-protector " # bug 3131 - # Explictly disable the as needed. It was disable by default but Ubuntu - # activated it by default since release 11.04. See bug #8961. - # Once all cyclic dependencies have been dropped, this line could be removed. - # Check if linker supports --as-needed and --no-as-needed options - if $LD --help 2>/dev/null | grep no-as-needed > /dev/null; then - LDFLAGS="$LDFLAGS -Wl,--no-as-needed" - fi - - case "$host" in x86_64-*-linux-gnu | x86_64-linux-gnu) ARCH_CFLAGS="-m64"
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2015-05-27 12:53:17 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2015-04-13 20:31:51.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2015-05-27 12:53:18.0 +0200 @@ -1,0 +2,7 @@ +Tue May 26 01:34:01 UTC 2015 - badshah...@gmail.com + +- Build without external scirenderer; remove Requires and + BuildRequires on external scirenderer which is discontinued as a + standalone library by upstream. + +--- Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.EChnBg/_old 2015-05-27 12:53:20.0 +0200 +++ /var/tmp/diff_new_pack.EChnBg/_new 2015-05-27 12:53:20.0 +0200 @@ -82,11 +82,9 @@ BuildRequires: Mesa-devel BuildRequires: flexdock BuildRequires: jogl2 >= 2.2.4 -BuildRequires: scirenderer Requires: flexdock Requires: jogl2 >= 2.2.4 -Requires: scirenderer BuildRequires: jrosetta Requires: jrosetta
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2015-04-13 20:31:48 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2015-03-03 11:16:38.0 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2015-04-13 20:31:51.0 +0200 @@ -1,0 +2,17 @@ +Thu Apr 9 15:58:37 UTC 2015 - badshah...@gmail.com + +- Use java-devel >= 1.8.0 for building, older java causes build + failures. + +--- +Thu Apr 2 22:07:32 UTC 2015 - badshah...@gmail.com + +- Update to version 5.5.2: + + Release notes at +http://www.scilab.org/community/news/20150401/release_notes. +- Requires jogl2 >= 2.2.4 to build. +- Add scilab-build-with-jogl-2.3.patch to make building with + jogl and gluegen >= 2.3.0, + http://bugzilla.scilab.org/show_bug.cgi?id=13809. + +--- Old: scilab-5.5.1-src.tar.gz New: scilab-5.5.2-src.tar.gz scilab-build-with-jogl-2.3.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.U1Svnp/_old 2015-04-13 20:31:54.0 +0200 +++ /var/tmp/diff_new_pack.U1Svnp/_new 2015-04-13 20:31:54.0 +0200 @@ -24,7 +24,7 @@ Summary:High Level Programming Language/Numerical Analysis Software License:CECILL-2.0 and BSD-3-Clause Group: Productivity/Scientific/Math -Version:5.5.1 +Version:5.5.2 Release:0 Url:http://www.scilab.org # FOR STABLE RELEASE @@ -46,6 +46,8 @@ Patch6: scilab-build-with-xmlgraphics-commons-2_0.patch # PATCH-FIX-OPENSUSE scilab-0003-fix-xcos-desktop.patch sfal...@opensuse.org -- Change Desktop categories in xcos.desktop to clear brp-check-suse failure Patch7: %{name}-0003-fix-desktop-categories.patch +# PATCH-FIX-UPSTREAM scilab-build-with-jogl-gluegen-2.3.patch badshah...@gmail.com -- Make scilab build with jogl and gluegen >= 2.3.0 +Patch8: scilab-build-with-jogl-2.3.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -74,16 +76,16 @@ # GUI/Console BuildRequires: ant -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8.0 BuildRequires: jpackage-utils BuildRequires: Mesa-devel BuildRequires: flexdock -BuildRequires: jogl2 +BuildRequires: jogl2 >= 2.2.4 BuildRequires: scirenderer Requires: flexdock -Requires: jogl2 +Requires: jogl2 >= 2.2.4 Requires: scirenderer BuildRequires: jrosetta @@ -277,6 +279,7 @@ %patch6 -p1 %endif %patch7 -p1 +%patch8 -p1 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++ scilab-5.5.1-src.tar.gz -> scilab-5.5.2-src.tar.gz ++ /work/SRC/openSUSE:Factory/scilab/scilab-5.5.1-src.tar.gz /work/SRC/openSUSE:Factory/.scilab.new/scilab-5.5.2-src.tar.gz differ: char 5, line 1 ++ scilab-build-with-jogl-2.3.patch ++ http://bugzilla.scilab.org/show_bug.cgi?id=13809 Index: scilab-5.5.2/configure === --- scilab-5.5.2.orig/configure +++ scilab-5.5.2/configure @@ -14264,7 +14264,7 @@ $as_echo_n "checking jogl2... " >&6; } // #line 14264 "configure" import java.util.regex.Pattern; -import javax.media.opengl.glu.GLUnurbs; +import com.jogamp.opengl.glu.GLUnurbs; public class conftest { public static void main(String[] argv) { @@ -14350,10 +14350,10 @@ $as_echo "$jar_resolved" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if test "" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&5 -$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package javax.media.opengl.glu.GLUnurbs)" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" >&5 +$as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package com.jogamp.opengl.glu.GLUnurbs)" >&2;} else - as_fn_error $? "Could not find or use the Java package/jar jogl2 used by Scilab 3D rendering - Version 2.0 (looking for package ja
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2015-03-03 11:16:02 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2015-01-25 21:16:20.0 +0100 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2015-03-03 11:16:38.0 +0100 @@ -1,0 +2,7 @@ +Mon Mar 2 17:52:59 UTC 2015 - sfal...@opensuse.org + +- Added patch to fix desktop file categories, they were causing + brp-check-suse failure in Factory. + + Added: scilab-0003-fix-desktop-categories.patch + +--- New: scilab-0003-fix-desktop-categories.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.6g43w8/_old 2015-03-03 11:16:40.0 +0100 +++ /var/tmp/diff_new_pack.6g43w8/_new 2015-03-03 11:16:40.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,8 @@ Patch5: scilab-special-jarnames.patch # PATCH-FIX-UPSTREAM scilab-build-with-xmlgraphics-commons-2_0.patch badshah...@gmail.com -- Fix compilation with xmlgraphics-commons >= 2.0 Patch6: scilab-build-with-xmlgraphics-commons-2_0.patch +# PATCH-FIX-OPENSUSE scilab-0003-fix-xcos-desktop.patch sfal...@opensuse.org -- Change Desktop categories in xcos.desktop to clear brp-check-suse failure +Patch7: %{name}-0003-fix-desktop-categories.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -274,6 +276,7 @@ %if 0%{?suse_version} > 1320 %patch6 -p1 %endif +%patch7 -p1 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml @@ -317,7 +320,7 @@ do desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ ---add-category="Education;" desktop/$i.desktop; +desktop/$i.desktop; done %find_lang %{name} %{?no_lang_C} ++ scilab-0003-fix-desktop-categories.patch ++ Index: scilab-5.5.1/desktop/xcos.desktop === --- scilab-5.5.1.orig/desktop/xcos.desktop +++ scilab-5.5.1/desktop/xcos.desktop @@ -12,4 +12,4 @@ Name=Xcos StartupNotify=false Terminal=false Type=Application -Categories=Science;Physics; +Categories=Education;Science;Math; Index: scilab-5.5.1/desktop/scilab-adv-cli.desktop === --- scilab-5.5.1.orig/desktop/scilab-adv-cli.desktop +++ scilab-5.5.1/desktop/scilab-adv-cli.desktop @@ -15,4 +15,4 @@ Name[ru]=Scilab передовой CLI StartupNotify=false Terminal=true Type=Application -Categories=Science;Math; +Categories=Education;Science;Math; Index: scilab-5.5.1/desktop/scilab.desktop === --- scilab-5.5.1.orig/desktop/scilab.desktop +++ scilab-5.5.1/desktop/scilab.desktop @@ -14,4 +14,4 @@ Name=Scilab StartupNotify=false Terminal=false Type=Application -Categories=Science;Math; +Categories=Education;Science;Math; Index: scilab-5.5.1/desktop/scinotes.desktop === --- scilab-5.5.1.orig/desktop/scinotes.desktop +++ scilab-5.5.1/desktop/scinotes.desktop @@ -13,4 +13,4 @@ Name=Scinotes StartupNotify=false Terminal=false Type=Application -Categories=Science;Math; +Categories=Education;Science;Math; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2015-01-25 21:16:18 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2014-10-05 20:32:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2015-01-25 21:16:20.0 +0100 @@ -1,0 +2,7 @@ +Sat Jan 24 09:58:24 UTC 2015 - badshah...@gmail.com + +- Add scilab-build-with-xmlgraphics-commons-2_0.patch to fix + compilation with xmlgraphics-commons >= 2.0 + (http://bugzilla.scilab.org/show_bug.cgi?id=13724). + +--- New: scilab-build-with-xmlgraphics-commons-2_0.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.Rj49Pa/_old 2015-01-25 21:16:21.0 +0100 +++ /var/tmp/diff_new_pack.Rj49Pa/_new 2015-01-25 21:16:21.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package scilab # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,6 +42,8 @@ Patch3: scilab-fix-64bit-portability-issue.patch # PATCH-FIX-OPENSUSE scilab-special-jarnames.patch badshah...@gmail.com -- 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 badshah...@gmail.com -- Fix compilation with xmlgraphics-commons >= 2.0 +Patch6: scilab-build-with-xmlgraphics-commons-2_0.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -268,6 +270,11 @@ %patch2 -p1 %patch3 -p1 +# Only Factory has xmlgraphics-commons > 2.0 +%if 0%{?suse_version} > 1320 +%patch6 -p1 +%endif + # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml sed -i '/name="Class-Path"/d' modules/javasci/build.xml ++ scilab-build-with-xmlgraphics-commons-2_0.patch ++ http://bugzilla.scilab.org/show_bug.cgi?id=13724 Index: scilab-5.5.1/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java === --- scilab-5.5.1.orig/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java +++ scilab-5.5.1/modules/graphic_export/src/java/org/scilab/modules/graphic_export/Export.java @@ -832,7 +832,7 @@ public class Export { } @Override -public int processShape(Shape s) throws IOException { +public int processShape(Shape s, boolean b) throws IOException { if (s instanceof Ellipse2D.Double) { Ellipse2D.Double ell = (Ellipse2D.Double) s; if (ell.height == ell.width) { @@ -855,10 +855,10 @@ public class Export { buffer.append("[").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); it.next(); } else { -return super.processShape(s); +return super.processShape(s,true); } } else { -return super.processShape(s); +return super.processShape(s,true); } for (; !it.isDone(); it.next()) { @@ -866,7 +866,7 @@ public class Export { if (type == PathIterator.SEG_LINETO) { buffer.append(" ").append(gen.formatDouble(coords[0])).append(" ").append(gen.formatDouble(coords[1])); } else { -return super.processShape(s); +return super.processShape(s,true); } } buffer.append("] DP"); @@ -874,7 +874,7 @@ public class Export { return PathIterator.WIND_NON_ZERO; } -return super.processShape(s); +return super.processShape(s,true); } }; g2d.setG
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2014-10-05 20:31:25 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2014-07-22 09:55:48.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2014-10-05 20:32:40.0 +0200 @@ -1,0 +2,16 @@ +Thu Oct 2 18:43:41 UTC 2014 - badshah...@gmail.com + +- Update to version 5.5.1: + + See release notes at +http://www.scilab.org/index.php/community/news/20141002 +- Remove upstreamed patches: + + scilab-make-doc-ja_JP.patch + + scilab-gluegen-path.patch + + scilab-intg-crash.patch + + scilab-fileio-hang-with-incorrect-format.patch + + scilab-translation-build.patch + + scilab-fix-arpack-detection.patch + + scilab-pkconfig-use-system-tcltk-version.patch +- Rebase existing patches for current version. + +--- Old: scilab-5.5.0-src.tar.gz scilab-fileio-hang-with-incorrect-format.patch scilab-fix-arpack-detection.patch scilab-gluegen-path.patch scilab-intg-crash.patch scilab-make-doc-ja_JP.patch scilab-pkconfig-use-system-tcltk-version.patch scilab-translation-build.patch New: scilab-5.5.1-src.tar.gz Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.NbSa3O/_old 2014-10-05 20:32:43.0 +0200 +++ /var/tmp/diff_new_pack.NbSa3O/_new 2014-10-05 20:32:43.0 +0200 @@ -24,7 +24,7 @@ Summary:High Level Programming Language/Numerical Analysis Software License:CECILL-2.0 and BSD-3-Clause Group: Productivity/Scientific/Math -Version:5.5.0 +Version:5.5.1 Release:0 Url:http://www.scilab.org # FOR STABLE RELEASE @@ -40,22 +40,8 @@ Patch2: %{name}-0002-always-use-dynamic-stack.patch # PATCH-FIX-UPSTREAM scilab-fix-64bit-portability-issue.patch badshah...@gmail.com -- Fix compiler warnings w.r.t 64bit portability Patch3: scilab-fix-64bit-portability-issue.patch -# PATCH-FIX-OPENSUSE scilab-gluegen-path.patch -- set correct path to gluegen2 library -Patch4: scilab-gluegen-path.patch # PATCH-FIX-OPENSUSE scilab-special-jarnames.patch badshah...@gmail.com -- Adapt configure script for a few java library names peculiar to openSUSE Patch5: scilab-special-jarnames.patch -# PATCH-FIX-UPSTREAM scilab-pkconfig-use-system-tcltk-version.patch badshah...@gmail.com -- Fix tcl/tk versions in scilab.pc file to be compatible with system tcl/tk; patch submitted upstream -Patch13:scilab-pkconfig-use-system-tcltk-version.patch -# PATCH-FIX-UPSTREAM scilab-translation-build.patch badshah...@gmail.com -- Fix building of lang package; patch taken from upstream git -Patch14:scilab-translation-build.patch -# PATCH-FIX-UPSTREAM scilab-make-doc-ja_JP.patch badshah...@gmail.com -- Fix building ja_JP locale -Patch15:scilab-make-doc-ja_JP.patch -# PATCH-FIX-UPSTREAM scilab-fix-arpack-detection.patch bnc#883233 badshah...@gmail.com -- Fix detection of arpack-ng library during configure stage -Patch16:scilab-fix-arpack-detection.patch -# PATCH-FIX-UPSTREAM scilab-intg-crash.patch badshah...@gmail.com -- Fix scilab crash when intg involved division by zero; patch came from upstream -Patch17:scilab-intg-crash.patch -# PATCH-FIX-UPSTREAM scilab-fileio-hang-with-incorrect-format.patch badshah...@gmail.com -- Fix scilab becoming unresponsive when incorrect format is specified for mfscanf; patch came from upstream, fixes http://bugzilla.scilab.org/13468 -Patch18:scilab-fileio-hang-with-incorrect-format.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -279,15 +265,8 @@ %patch1 -p1 # PATCH5 and PATCH13 have to be applied before PATCH2; all affect ./configure %patch5 -p1 -%patch13 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch14 -p2 -%patch15 -p1 -%patch16 -p1 -%patch17 -p2 -%patch18 -p2 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++ scilab-5.5.0-src.tar.gz -> scilab-5.5.1-src.tar.gz ++ /work/SRC/openSUSE:Factory/scilab/scilab-5.5.0-src.tar.gz /work/SRC/openSUSE:Factory/.scilab.new/scilab-5.5.1-src.tar.gz differ: char 5, line 1 ++ scilab-special-jarnames.patch ++ --- /var/tmp/diff_new_pack.NbSa3O/_old 2014-10-05 20:32:43.0 +0200 +++ /var/tmp/diff_new_pack.NbSa3O/_new 2014-10-05 20:32:43.0 +0200 @@ -1,8 +1,8 @@ -Index: scilab-5.5.0/configure +Index: scilab-5.5.1/configure ===
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2014-07-22 06:57:59 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2014-07-12 17:14:44.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2014-07-22 09:55:48.0 +0200 @@ -1,0 +2,8 @@ +Fri Jul 18 09:30:33 UTC 2014 - badshah...@gmail.com + +- Add scilab-fileio-hang-with-incorrect-format.patch to fix + scilab becoming unresponsive when incorrect format is specified + for mfscanf; patch came from upstream; fixes + http://bugzilla.scilab.org/13468. + +--- New: scilab-fileio-hang-with-incorrect-format.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.AfdT3i/_old 2014-07-22 09:55:51.0 +0200 +++ /var/tmp/diff_new_pack.AfdT3i/_new 2014-07-22 09:55:51.0 +0200 @@ -54,6 +54,8 @@ Patch16:scilab-fix-arpack-detection.patch # PATCH-FIX-UPSTREAM scilab-intg-crash.patch badshah...@gmail.com -- Fix scilab crash when intg involved division by zero; patch came from upstream Patch17:scilab-intg-crash.patch +# PATCH-FIX-UPSTREAM scilab-fileio-hang-with-incorrect-format.patch badshah...@gmail.com -- Fix scilab becoming unresponsive when incorrect format is specified for mfscanf; patch came from upstream, fixes http://bugzilla.scilab.org/13468 +Patch18:scilab-fileio-hang-with-incorrect-format.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -285,6 +287,7 @@ %patch15 -p1 %patch16 -p1 %patch17 -p2 +%patch18 -p2 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++ scilab-fileio-hang-with-incorrect-format.patch ++ X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Ffileio%2Fsrc%2Fc%2Fdo_xxscanf.c;h=e4b1be4c22adbd8f9b0b1628e14a94e76893f474;hp=969be74f3e2ab0f0618bd1e3b51e0a470f835a4f;hb=70f49342c5384aab56fd497c63a6b71fd99fd14c;hpb=350cde63b99c795a82ccab4f0e937583a1a8c81a diff --git a/scilab/modules/fileio/src/c/do_xxscanf.c b/scilab/modules/fileio/src/c/do_xxscanf.c index 969be74..e4b1be4 100644 --- a/scilab/modules/fileio/src/c/do_xxscanf.c +++ b/scilab/modules/fileio/src/c/do_xxscanf.c @@ -387,6 +387,12 @@ int do_xxscanf(char *fname, FILE * fp, char *format, int *nargs, char *strv, int ptrtab[90], ptrtab[91], ptrtab[92], ptrtab[93], ptrtab[94], ptrtab[95], ptrtab[96], ptrtab[97], ptrtab[98], ptrtab[MAXSCAN - 1]); +if (*retval == 0) +{ +Scierror(998, _("%s: An error occurred: Requested type does not match data type.\n"), fname); +return RET_BUG; +} + *nargs = Min(num_conversion + 1, Max(*retval + n_directive_count, 0)); for (i = 1; i <= *nargs; i++) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit scilab for openSUSE:Factory
Hello community, here is the log from the commit of package scilab for openSUSE:Factory checked in at 2014-07-12 17:14:36 Comparing /work/SRC/openSUSE:Factory/scilab (Old) and /work/SRC/openSUSE:Factory/.scilab.new (New) Package is "scilab" Changes: --- /work/SRC/openSUSE:Factory/scilab/scilab.changes2014-06-24 22:47:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.scilab.new/scilab.changes 2014-07-12 17:14:44.0 +0200 @@ -1,0 +2,7 @@ +Tue Jul 8 09:26:28 UTC 2014 - badshah...@gmail.com + +- Add scilab-intg-crash.patch to fix scilab crash when intg + involved division by zero; patch came from upstream; fixes + http://bugzilla.scilab.org/13491 . + +--- New: scilab-intg-crash.patch Other differences: -- ++ scilab.spec ++ --- /var/tmp/diff_new_pack.hdraJE/_old 2014-07-12 17:14:46.0 +0200 +++ /var/tmp/diff_new_pack.hdraJE/_new 2014-07-12 17:14:46.0 +0200 @@ -52,6 +52,8 @@ Patch15: scilab-make-doc-ja_JP.patch # PATCH-FIX-UPSTREAM scilab-fix-arpack-detection.patch bnc#883233 badshah...@gmail.com -- Fix detection of arpack-ng library during configure stage Patch16: scilab-fix-arpack-detection.patch +# PATCH-FIX-UPSTREAM scilab-intg-crash.patch badshah...@gmail.com -- Fix scilab crash when intg involved division by zero; patch came from upstream +Patch17:scilab-intg-crash.patch # Dependencies are extracted from : # "http://wiki.scilab.org/Dependencies of Scilab 5.X" # Mandatory @@ -136,8 +138,8 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: liberation-fonts # make doc now requires access to display -BuildRequires: xorg-x11-server BuildRequires: Mesa-libGL-devel +BuildRequires: xorg-x11-server %define X_display ":98" # QA tests and validation @@ -282,6 +284,7 @@ %patch14 -p2 %patch15 -p1 %patch16 -p1 +%patch17 -p2 # Fix Class-Path in manifest sed -i '/name="Class-Path"/d' build.incl.xml ++ scilab-intg-crash.patch ++ X-Git-Url: http://gitweb.scilab.org/?p=scilab.git;a=blobdiff_plain;f=scilab%2Fmodules%2Fdifferential_equations%2Fsrc%2Ffortran%2Fdqk21.f;h=29bd2e91b3f245fe08f3665e2a0a06a6b24b3ada;hp=9ea1458a55749699092c1b840b12bf6d7876a4b5;hb=f34a4175acea621acabbe625caed2cb4adb76128;hpb=1f9d8436bc683da2e52c21246d9188dd28d0a0dd diff --git a/scilab/modules/differential_equations/src/fortran/dqk21.f b/scilab/modules/differential_equations/src/fortran/dqk21.f index 9ea1458..29bd2e9 100644 --- a/scilab/modules/differential_equations/src/fortran/dqk21.f +++ b/scilab/modules/differential_equations/src/fortran/dqk21.f @@ -55,6 +55,7 @@ c * resg,resk,reskh,result,uflow,wg,wgk,xgk integer j,jtw,jtwm1 external f + common/ierajf/iero c dimension fv1(10),fv2(10),wg(5),wgk(11),xgk(11) c @@ -140,13 +141,16 @@ c the integral, and estimate the absolute error. c resg = 0.0d+00 fc = f(centr) + if(iero.gt.0) return resk = wgk(11)*fc resabs = dabs(resk) do 10 j=1,5 jtw = 2*j absc = hlgth*xgk(jtw) fval1 = f(centr-absc) +if(iero.gt.0) return fval2 = f(centr+absc) +if(iero.gt.0) return fv1(jtw) = fval1 fv2(jtw) = fval2 fsum = fval1+fval2 @@ -158,7 +162,9 @@ c jtwm1 = 2*j-1 absc = hlgth*xgk(jtwm1) fval1 = f(centr-absc) +if(iero.gt.0) return fval2 = f(centr+absc) +if(iero.gt.0) return fv1(jtwm1) = fval1 fv2(jtwm1) = fval2 fsum = fval1+fval2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org