Fix for seqf on zterm, thanks Maciej Szmigiero for the patch , #301625

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/sci-mathematics/scilab/ChangeLog b/sci-mathematics/scilab/ChangeLog
index 94b7e1c26cdc98d1556a732a89901afffb072528..1b0bc8eabe2bf1bc6a79112b1e43708d4f7162bc 100644 (file)
--- a/sci-mathematics/scilab/ChangeLog
+++ b/sci-mathematics/scilab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/scilab
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.59 2011/08/02 05:49:16 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/ChangeLog,v 1.60 2011/09/19 15:30:17 jlec Exp $
+
+  19 Sep 2011; Justin Lecher <jlec@gentoo.org> scilab-4.1.2-r2.ebuild,
+  +files/scilab-4.1.2-gcc45-2.patch:
+  Fix for seqf on zterm, thanks Maciej Szmigiero for the patch , #301625
 
   02 Aug 2011; Matt Turner <mattst88@gentoo.org> scilab-4.1.2-r1.ebuild,
   scilab-4.1.2-r2.ebuild:

diff --git a/sci-mathematics/scilab/Manifest b/sci-mathematics/scilab/Manifest
index 45fa6ae9b2156a5c2bc2610890adf6b50e501fa4..0f31d773ff7ea92082f4bc233389ed176ec78c34 100644 (file)
--- a/sci-mathematics/scilab/Manifest
+++ b/sci-mathematics/scilab/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX scilab-4.0-configure-gfortran.patch 14731 RMD160 be5367c2dc91d582fed58ad17733770474690cf3 SHA1 3208c8f48ade5a4934f72cb613400a177abebeb8 SHA256 2e2ef24db30ad6c69fd9fd0c6690841ae9286256e2de71784d48f09d84e0222a
 AUX scilab-4.0-gtk-fix.patch 929 RMD160 d0b3c0c754431bdd33d41b632eee1af1ab3c18e3 SHA1 7a11bbaf84c784ad7ae86b5d56f7ccba6c512a36 SHA256 25ef3f5dacfb91adb3d239855d7f32655a554b21608a4b485bf2bf3937ae6b85
@@ -8,6 +8,7 @@ AUX scilab-4.0-makefile.patch 1190 RMD160 62627b2736ccf8ad7e56f11331bdb8540c5c0c
 AUX scilab-4.1-examples.patch 7399 RMD160 a026a9c0e585a74f9cb3d434e67f3375e5fa4f6a SHA1 19326db03cf4a4a26d3b8448d9c663a3d774d247 SHA256 99b49abc82d9a881c7d8d15c2ca8fec678ddb8b9efedc2ec3347f6156886716d
 AUX scilab-4.1-header-fix.patch 4145 RMD160 60225f4905f2be454bf2c1c72d4a5727e6295749 SHA1 717017dcd6a0eb25facff0ded30bdb0c2db98522 SHA256 aa1ab5bd1b0c261268191b3b47e52ddee8b5642222806b8813a97dd16e1cc3b0
 AUX scilab-4.1-java-pic.patch 1604 RMD160 cae9bd8923f69af53ef11de0301323d8964e135a SHA1 f50f90b0e66a8dbfa7abbfdb2b2d9882004ee32b SHA256 eab86feade8002a9edf2701b820847420b1ade7bcf96bb909e2a09b39850dd91
+AUX scilab-4.1.2-gcc45-2.patch 502 RMD160 bf9b81d20e499176882d66164d15a24985639253 SHA1 bdae3c44f00aea4d5ae5bbc24109e20100027c1a SHA256 adcd2cd3fda64dfd3d76f2b204f3e54cec922cb2b4dde0d9aa81e63e07aaa7b2
 AUX scilab-4.1.2-gcc45.patch 668 RMD160 ee01d732636c4ce69f0409a9d5e84dc5843bf281 SHA1 98003edd07a34512d8b4e2d57426c4ac2420ab7d SHA256 391d03173c866815a12e9a01f15e57c550b36f0b4a4eca5147caabfdc185b42b
 AUX scilab-4.1.2-header-fix.patch 4240 RMD160 33941b2da653b0b4579fc6e3e01a55f2b87248a4 SHA1 24a7946359679785634257ae9bfd8fe03b5c5eea SHA256 1f103b1e08068cd9c813dd5f0f067ab0430ff6a4e608603fd2bf1f07adc5556b
 AUX scilab-4.1.2-java-config.patch 446 RMD160 300d2ac4d0bf34e5842696644735af78c6b579d4 SHA1 61656b20211e3a345c2fe42e05471324355961ac SHA256 650cb6dcce4a7883318cd553140516ced6ab32dc325eb1c56a013df272e3fd0f
@@ -15,13 +16,13 @@ AUX scilab-4.1.2-tmp-fix.patch 6067 RMD160 63f217f41edb721d1717724931410c228ad92
 AUX scilab-ppc-gcc4.patch 1045 RMD160 db4219fc04b5555e702d823425735125f3000c00 SHA1 ba001966a62202f66188ba4be1abe483f56f8fbe SHA256 0844c4edad45ba23219b8d3405104a8bbb2b45e2b7b742f7aaeb10ce5e92388a
 DIST scilab-4.1.2-src.tar.gz 15892277 RMD160 f708b966143ccbf989f7a0dbed95e4dab324e66f SHA1 d3f3190bd11fe23eebec03fe9feaced0406ddfe3 SHA256 4c0318a316c62a1206e53b936bbb1262d940e390c1d14da77c231e49b134b3a9
 EBUILD scilab-4.1.2-r1.ebuild 4334 RMD160 6b12bcbe55b076ffcfd4442c84cb4906cd6338ec SHA1 814e06e38e3451beb5567b8aea192b0c8adeb26b SHA256 35e7d3edbe51dfa1fb30797004b1aaec9153b0acd4973d1b81b5150a9e17cbdd
-EBUILD scilab-4.1.2-r2.ebuild 4248 RMD160 897b12a20bf0e3ffc0deb4a724b6fd4de4baba5a SHA1 646445143b96adb66fe426d34b45eeb9121de319 SHA256 df2894fa2fb33581f1e09b3d6fe8367b197cc365232c3be47e065e08c981ec51
-MISC ChangeLog 13091 RMD160 5f2c3a1961529549586c9cab6dac301286991680 SHA1 6fcb2972e4668c3f1f5366c38135f76e37ef5211 SHA256 960b8453675e88f14cdce4a4ca5d5aefb2a74e5e52d5942172ad516675cca104
+EBUILD scilab-4.1.2-r2.ebuild 4281 RMD160 1052c47c3c2d1612643af7b64bfa6d509e1b806e SHA1 897a2e46a3386354dfaebdf3b92ac15fe70e6bb1 SHA256 ff2ff90b952697640bfa17070a52e696f1b96a32076d1fe61e3f7a50a420869e
+MISC ChangeLog 13269 RMD160 bb80eb8b9f87f4862e1d0dc813f367ab8ab6a592 SHA1 0d92271ddd0055cdc9985369cb10804773e60f19 SHA256 0cd1bb83bd6443071fc450e372d1387669180542f97cca47600dc7a0b20c89fa
 MISC metadata.xml 169 RMD160 a8b2671842bbec7d36e587fbf53c4eb111498347 SHA1 604114857745acb6253b121cda619e3c35771cc7 SHA256 7a9f25879c1299572cfaf2a3efb47313412564a1ef12c828224194f4e96edcd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk43j+EACgkQTVUdg23rv53bTACeL5jc6fYa/OYGDwmEInfUZ+Pf
-nwMAn241lerghk0E8G0YaaONYPwcLfz7
-=BO5c
+iEYEAREKAAYFAk53YA8ACgkQgAnW8HDreRbgTwCgqfexOvLc4BU83NGjLLckvvrX
+KMkAoMgixJjPbat9dlqWZ/v8q1He0XEy
+=LvlL
 -----END PGP SIGNATURE-----

diff --git a/sci-mathematics/scilab/files/scilab-4.1.2-gcc45-2.patch b/sci-mathematics/scilab/files/scilab-4.1.2-gcc45-2.patch
new file mode 100644 (file)
index 0000000..201f4f6
--- /dev/null
+++ b/sci-mathematics/scilab/files/scilab-4.1.2-gcc45-2.patch
@@ -0,0 +1,12 @@
+--- routines/gzvt2/vte.c.old   2011-06-05 01:08:52.000000000 +0200
++++ routines/gzvt2/vte.c       2011-06-05 01:09:11.612332604 +0200
+@@ -80,7 +80,8 @@
+   geometry.min_width = xpad + terminal->char_width * 2;
+   geometry.min_height = ypad + terminal->char_height * 2;
+ 
+-  gtk_window_set_geometry_hints(window, widget, &geometry,
++  if (gtk_widget_get_realized(widget))
++    gtk_window_set_geometry_hints(window, widget, &geometry,
+                               GDK_HINT_RESIZE_INC |
+                               GDK_HINT_BASE_SIZE |
+                               GDK_HINT_MIN_SIZE);

diff --git a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
index 586df5b61a7286a7c8a5dd0130c8649b9032e099..17117670e37be4749913b7c7036ef79000cea220 100644 (file)
--- a/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
+++ b/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.12 2011/08/02 05:49:16 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/scilab/scilab-4.1.2-r2.ebuild,v 1.13 2011/09/19 15:30:17 jlec Exp $
 
 EAPI=4
 
@@ -51,7 +51,8 @@ src_prepare() {
                "${FILESDIR}"/${PN}-4.1-examples.patch \
                "${FILESDIR}"/${P}-java-config.patch \
                "${FILESDIR}"/${P}-tmp-fix.patch \
-               "${FILESDIR}"/${P}-gcc45.patch
+               "${FILESDIR}"/${P}-gcc45.patch \
+               "${FILESDIR}"/${P}-gcc45-2.patch
        eautoconf
 
        sed \