From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 987E7138A1C for ; Fri, 3 Apr 2015 20:25:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AB64E0957; Fri, 3 Apr 2015 20:25:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F122DE0957 for ; Fri, 3 Apr 2015 20:25:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B55B53407A4 for ; Fri, 3 Apr 2015 20:25:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 376A41524F for ; Fri, 3 Apr 2015 20:25:45 +0000 (UTC) From: "Guillaume Horel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guillaume Horel" Message-ID: <1428084564.43b68623b040f59c63c3e1f4037cf6d499edd6d0.guillaume_horel@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/scilab/, sci-mathematics/scilab/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/scilab/ChangeLog sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch sci-mathematics/scilab/files/scilab-5.5.2-missinglib.patch sci-mathematics/scilab/files/scilab-5.5.2-nogui.patch sci-mathematics/scilab/scilab-5.5.2.ebuild X-VCS-Directories: sci-mathematics/scilab/files/ sci-mathematics/scilab/ X-VCS-Committer: guillaume_horel X-VCS-Committer-Name: Guillaume Horel X-VCS-Revision: 43b68623b040f59c63c3e1f4037cf6d499edd6d0 X-VCS-Branch: master Date: Fri, 3 Apr 2015 20:25:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7f5757fe-40b2-421f-9868-4c4df19a091b X-Archives-Hash: 743cd78eacf649053be7ef99797a9160 commit: 43b68623b040f59c63c3e1f4037cf6d499edd6d0 Author: Guillaume Horel gmail com> AuthorDate: Fri Apr 3 18:09:24 2015 +0000 Commit: Guillaume Horel gmail com> CommitDate: Fri Apr 3 18:09:24 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=43b68623 sci-mathematics/scilab: version bump Package-Manager: portage-2.2.18 sci-mathematics/scilab/ChangeLog | 10 + .../files/scilab-5.5.2-accessviolation.patch | 21 ++ .../scilab-5.5.2-fix-random-runtime-failure.patch | 12 + .../scilab/files/scilab-5.5.2-followlinks.patch | 11 + .../scilab/files/scilab-5.5.2-gluegen.patch | 11 + .../scilab/files/scilab-5.5.2-java-heap.patch | 11 + .../scilab/files/scilab-5.5.2-missinglib.patch | 11 + .../scilab/files/scilab-5.5.2-nogui.patch | 13 + sci-mathematics/scilab/scilab-5.5.2.ebuild | 261 +++++++++++++++++++++ 9 files changed, 361 insertions(+) diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog index 4a619b9..f6c4a45 100644 --- a/sci-mathematics/scilab/ChangeLog +++ b/sci-mathematics/scilab/ChangeLog @@ -2,6 +2,16 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*scilab-5.5.2 (03 Apr 2015) + + 03 Apr 2015; Guillaume Horel + +files/scilab-5.5.2-accessviolation.patch, + +files/scilab-5.5.2-fix-random-runtime-failure.patch, + +files/scilab-5.5.2-followlinks.patch, +files/scilab-5.5.2-gluegen.patch, + +files/scilab-5.5.2-java-heap.patch, +files/scilab-5.5.2-missinglib.patch, + +files/scilab-5.5.2-nogui.patch, +scilab-5.5.2.ebuild: + sci-mathematics/scilab: version bump + 01 Feb 2015; Guillaume Horel scilab-5.5.1.ebuild: sci-mathematics/scilab: more precise dependencies diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch new file mode 100644 index 0000000..a84de9a --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.2-accessviolation.patch @@ -0,0 +1,21 @@ +diff -urN scilab-5.5.0-orig/bin/scilab scilab-5.5.0/bin/scilab +--- scilab-5.5.0-orig/bin/scilab 2014-07-12 15:24:17.105686656 -0400 ++++ scilab-5.5.0/bin/scilab 2014-07-12 15:25:29.307725409 -0400 +@@ -647,17 +647,6 @@ + GTK_MODULES=$(echo $GTK_MODULES | sed s/gnomebreakpad//g) + export GTK_MODULES + +-# libEGL may be partially supported by the closed-source NVIDIA driver. +-# Until they release an EGL driver, we force the egl_glx driver. +-# http://bugzilla.scilab.org/show_bug.cgi?id=12940 +-if test -x /usr/bin/glxinfo; then +- NVIDIA_GLX_VENDOR=$(/usr/bin/glxinfo |grep "NVIDIA Corporation") +- if test ! -z "$NVIDIA_GLX_VENDOR"; then +- EGL_DRIVER=egl_glx +- export EGL_DRIVER +- fi +-fi +- + if test $SCIVERBOSE -ne 0; then + echo "SCI : $SCI" + echo "SCIBIN : $SCIBIN" diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch new file mode 100644 index 0000000..92ac453 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.2-fix-random-runtime-failure.patch @@ -0,0 +1,12 @@ +diff -urN scilab-orig/modules/api_scilab/src/cpp/api_double.cpp scilab/modules/api_scilab/src/cpp/api_double.cpp +--- scilab-orig/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:26:31.342617365 -0400 ++++ scilab/modules/api_scilab/src/cpp/api_double.cpp 2012-08-06 23:27:34.838621420 -0400 +@@ -497,7 +497,7 @@ + /*--------------------------------------------------------------------------*/ + int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal) + { +- return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL); ++ return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, 0); + } + /*--------------------------------------------------------------------------*/ + int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg) diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch new file mode 100644 index 0000000..fd6aa7b --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.2-followlinks.patch @@ -0,0 +1,11 @@ +--- m4/java.m4.orig 2014-02-11 23:43:03.030430258 -0500 ++++ m4/java.m4 2014-02-11 23:43:54.008428766 -0500 +@@ -839,7 +839,7 @@ + for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do + + # TODO check the behaviour when spaces +- jars_resolved=`ls $jar 2>/dev/null` ++ jars_resolved=$(realpath $(ls $jar 2>/dev/null) 2>/dev/null) + for jar_resolved in $jars_resolved; do # If several jars matches + if test -e "$jar_resolved"; then + export ac_java_classpath="$jar_resolved:$ac_java_classpath" diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch new file mode 100644 index 0000000..1514439 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.2-gluegen.patch @@ -0,0 +1,11 @@ +--- scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java.orig 2014-03-24 22:38:00.928934500 -0400 ++++ scilab/modules/gui/src/java/org/scilab/modules/gui/SwingView.java 2014-03-24 22:37:33.947567043 -0400 +@@ -157,7 +157,7 @@ + + static { + try { +- System.loadLibrary("gluegen2-rt"); ++ System.loadLibrary("gluegen-rt"); + } catch (Exception e) { + System.err.println(e); + } diff --git a/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch new file mode 100644 index 0000000..31060d7 --- /dev/null +++ b/sci-mathematics/scilab/files/scilab-5.5.2-java-heap.patch @@ -0,0 +1,11 @@ +--- etc/jvm_options.xml.orig 2014-02-12 00:05:34.323390688 -0500 ++++ etc/jvm_options.xml 2014-02-12 00:05:53.977390112 -0500 +@@ -22,7 +22,7 @@ + +