| 1 |
commit: 6e72cf55459ff6f744f963001d1c957c94d30554 |
| 2 |
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 29 18:15:11 2012 +0000 |
| 4 |
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 18:15:11 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=6e72cf55 |
| 7 |
|
| 8 |
sci-mathematics/scilab: fix bug #375769 |
| 9 |
|
| 10 |
(Portage version: 2.1.10.63/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-mathematics/scilab/ChangeLog | 4 +++ |
| 14 |
.../scilab/files/scilab-5.3.3-gui-no-xcos.patch | 26 ++++++++++++++++++++ |
| 15 |
sci-mathematics/scilab/scilab-5.3.3-r1.ebuild | 3 +- |
| 16 |
3 files changed, 32 insertions(+), 1 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog |
| 19 |
index c318d61..71aae68 100644 |
| 20 |
--- a/sci-mathematics/scilab/ChangeLog |
| 21 |
+++ b/sci-mathematics/scilab/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 29 May 2012; Sébastien Fabbro <bicatali@g.o> scilab-5.3.3-r1.ebuild, |
| 27 |
+ +files/scilab-5.3.3-gui-no-xcos.patch: |
| 28 |
+ fix bug #375769 |
| 29 |
+ |
| 30 |
29 May 2012; Sébastien Fabbro <bicatali@g.o> scilab-5.3.3-r1.ebuild: |
| 31 |
More fixing for deps for gui and xcos |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch b/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..82ebbde |
| 37 |
--- /dev/null |
| 38 |
+++ b/sci-mathematics/scilab/files/scilab-5.3.3-gui-no-xcos.patch |
| 39 |
@@ -0,0 +1,26 @@ |
| 40 |
+diff -Nur scilab-5.3.3.orig/modules/graph/Makefile.am scilab-5.3.3/modules/graph/Makefile.am |
| 41 |
+--- scilab-5.3.3.orig/modules/graph/Makefile.am 2012-05-29 18:59:31.000000000 +0100 |
| 42 |
++++ scilab-5.3.3/modules/graph/Makefile.am 2012-05-29 19:02:11.000000000 +0100 |
| 43 |
+@@ -87,5 +87,7 @@ |
| 44 |
+ libscigraph_la_sci_gateway_DATA = |
| 45 |
+ |
| 46 |
+ if GUI |
| 47 |
++if XCOS |
| 48 |
+ USEANT=1 |
| 49 |
+ endif |
| 50 |
++endif |
| 51 |
+diff -Nur scilab-5.3.3.orig/modules/hdf5/Makefile.am scilab-5.3.3/modules/hdf5/Makefile.am |
| 52 |
+--- scilab-5.3.3.orig/modules/hdf5/Makefile.am 2012-05-29 18:59:42.000000000 +0100 |
| 53 |
++++ scilab-5.3.3/modules/hdf5/Makefile.am 2012-05-29 19:03:04.000000000 +0100 |
| 54 |
+@@ -10,9 +10,11 @@ |
| 55 |
+ if HDF5 |
| 56 |
+ |
| 57 |
+ if GUI |
| 58 |
++if XCOS |
| 59 |
+ # No GUI. Disable the Java build |
| 60 |
+ USEANT=1 |
| 61 |
+ endif |
| 62 |
++endif |
| 63 |
+ |
| 64 |
+ |
| 65 |
+ HDF5_SOURCES = src/c/h5_fileManagement.c \ |
| 66 |
|
| 67 |
diff --git a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |
| 68 |
index 2791ec5..69e71e9 100644 |
| 69 |
--- a/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |
| 70 |
+++ b/sci-mathematics/scilab/scilab-5.3.3-r1.ebuild |
| 71 |
@@ -123,7 +123,8 @@ src_prepare() { |
| 72 |
"${FILESDIR}"/${P}-blas-libs.patch \ |
| 73 |
"${FILESDIR}"/${P}-no-xcos-deps.patch \ |
| 74 |
"${FILESDIR}"/${P}-javadoc-utf8.patch \ |
| 75 |
- "${FILESDIR}"/${P}-fix-random-runtime-failures.patch |
| 76 |
+ "${FILESDIR}"/${P}-fix-random-runtime-failures.patch \ |
| 77 |
+ "${FILESDIR}"/${P}-gui-no-xcos.patch |
| 78 |
|
| 79 |
# need serious as-needed work (inter-dependencies among modules) |
| 80 |
# "${FILESDIR}"/${P}-as-needed.patch \ |
Archives