Add patch from upstream to fix building with OpenGL enabled. Thanks to Nikoli in bug #308937.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 27 insertions, 7 deletions

diff --git a/media-video/subtitleeditor/ChangeLog b/media-video/subtitleeditor/ChangeLog
index be2e85dba80c..92b86db4f395 100644
--- a/media-video/subtitleeditor/ChangeLog
+++ b/media-video/subtitleeditor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/subtitleeditor
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.5 2010/03/10 20:50:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/ChangeLog,v 1.6 2010/03/11 13:09:12 flameeyes Exp $
+
+  11 Mar 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  subtitleeditor-0.36.0.ebuild, +files/subtitleeditor-0.36.0-r681.patch:
+  Add patch from upstream to fix building with OpenGL enabled. Thanks to
+  Nikoli in bug #308937.
 
 *subtitleeditor-0.36.0 (10 Mar 2010)
 
diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest
index 2ad3644f61b2..cf9d05428913 100644
--- a/media-video/subtitleeditor/Manifest
+++ b/media-video/subtitleeditor/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX subtitleeditor-0.36.0-r681.patch 420 RMD160 5b3773489b5b395cd781ae9ed2b0cfe2e241405a SHA1 ded640b338e261f86bc7e66df1022b99a4acd126 SHA256 39d8d937e4755c2481dc165e855e52952a92152120dca8636fb024659cf704f2
 DIST subtitleeditor-0.31.0.tar.gz 1098896 RMD160 3c0ef9ac8762c9ea6bc1332e3e1812914d75a5f3 SHA1 183d892e2a5afb99d1a3d99e6d59155b4bbce61a SHA256 6cac56eabf091933ddd23d39fbefea29d0af900810e2e831c11a0b4c7027ccfc
 DIST subtitleeditor-0.33.0.tar.gz 1120158 RMD160 8fdbbc48128af1526aa590b0d7ebb44e1e26e937 SHA1 7d31c99e6da384a9b5636148f7cee79cc371d279 SHA256 a0ee98878ec69f9d641e5162ccbe81ff8f16cffdc5aab8ae4baeb036fe477f47
 DIST subtitleeditor-0.36.0.tar.gz 1199584 RMD160 ed96147c8091e46a18ffdf6f1d3106d41422d540 SHA1 d3d57378b0fcd3ca461c1a2510a1516b3b25ca87 SHA256 bd4f0a2c58dbf0f356e1cf6248ba58e3354cec8904850bb9c9665154f5be517a
 EBUILD subtitleeditor-0.31.0.ebuild 1392 RMD160 1455ee5dd4bb8242398fbd4498de2bad7a779e0a SHA1 4c2cfc4268ecff9a0ba679a784ee4ccc39768a9c SHA256 eabb875c4b57f793e66b2124ffa4c0c4df2166e4a758475eca5289b422c0d40e
 EBUILD subtitleeditor-0.33.0.ebuild 1592 RMD160 3f610479cf8697e22371f79ca87f903bde97564f SHA1 0e96d477618ebb62b37f7a1d23dfd3ab3ddeb29b SHA256 d40708709d0b2bc0c1da6f8c9da8e75a8a12562d6a907c3cdb9cacf6ff26c02c
-EBUILD subtitleeditor-0.36.0.ebuild 1849 RMD160 ff8a3a932fef0a464c341fd11fbdd1933efe815d SHA1 592078f3a25eed3124fc8e703a1e83a8f6519255 SHA256 7090180ac31a619d7f1512d608db7ce29e4b8c09a0a53f4f2d7d62419dc166eb
-MISC ChangeLog 1397 RMD160 e4d8b8a87f02fb908bd0bfb0fb6b6bcc8b6eb223 SHA1 5837bebfd1bb87c5e5c6a22500772cd7c07877f2 SHA256 ad9ea8ff3aee7997e7806f9cfe3677fe59dea5e71f4e48b345b618c5199d8578
+EBUILD subtitleeditor-0.36.0.ebuild 1903 RMD160 b60defe775c1a4025a517fb62311395b75680871 SHA1 8c9bfb9c705d3059f03300c573df111755b17291 SHA256 c245f60ce82b050df65318de147a8e88b2943d4b253023ea148a3468cb3d7375
+MISC ChangeLog 1625 RMD160 d67e402f3a02ab1d4f757ecb63e5c7035edcb94f SHA1 9f42db97a15e36fb5e9f54318c18417d691a9d8f SHA256 469e4c96f721d3b27c6ad06793a9c36bddf851f25c8b73dd79cc7870562d7267
 MISC metadata.xml 633 RMD160 7e00fdae57f03f5272fad843f52f46379fbaf503 SHA1 c06f3018039b1997ea0eaff59db634736686b93c SHA256 b0e1e281ff7cd751f87ec7c7897a850f55f62589bda8efd1d107bd8dbcb09e77
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuYBgUACgkQAiZjviIA2Xj5TwCghB7xHwkbGRL9EwOmsEOQP0DH
-WsgAn2Ah6KbxXUK/tH9mZXsjymNh4pji
-=1tDY
+iEYEARECAAYFAkuY63gACgkQAiZjviIA2XjdvgCfVA7WuoPpbSAtybVR7ESxP2k3
+4JIAoMBM4G2RgeTthGVEwC8MATC8oj6X
+=T0xH
 -----END PGP SIGNATURE-----
diff --git a/media-video/subtitleeditor/files/subtitleeditor-0.36.0-r681.patch b/media-video/subtitleeditor/files/subtitleeditor-0.36.0-r681.patch
new file mode 100644
index 000000000000..8b3db12769b0
--- /dev/null
+++ b/media-video/subtitleeditor/files/subtitleeditor-0.36.0-r681.patch
@@ -0,0 +1,11 @@
+--- src/we/waveformrenderergl.cc	(revisione 680)
++++ src/we/waveformrenderergl.cc	(revisione 681)
+@@ -722,7 +722,7 @@
+ 	int text_width = get_text_width("0:00:00");
+ 
+ 	float margin = text_width + text_width * 0.5;
+-	while(get_pos_by_time(sec_1) < marker)
++	while(get_pos_by_time(sec_1) < margin)
+ 	{
+ 		// for a sufficiently long duration sec_* will overflow before
+ 		// the loop terminates. check the largest of them.
diff --git a/media-video/subtitleeditor/subtitleeditor-0.36.0.ebuild b/media-video/subtitleeditor/subtitleeditor-0.36.0.ebuild
index 5cceabc113d0..63040f6d898f 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.36.0.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.36.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.36.0.ebuild,v 1.1 2010/03/10 20:50:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/subtitleeditor/subtitleeditor-0.36.0.ebuild,v 1.2 2010/03/11 13:09:12 flameeyes Exp $
 
 EAPI="2"
 
@@ -38,6 +38,9 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# bug #308937
+	epatch "${FILESDIR}"/${P}-r681.patch
 }
 
 src_configure() {