Patching around another crash.

6 files changed, 39 insertions, 19 deletions

diff --git a/media-video/gsubedit/ChangeLog b/media-video/gsubedit/ChangeLog
index e8a8320661c6..dfd6d72263dd 100644
--- a/media-video/gsubedit/ChangeLog
+++ b/media-video/gsubedit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/gsubedit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/ChangeLog,v 1.1 2003/09/30 07:23:14 phosphan Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/ChangeLog,v 1.2 2004/06/15 07:18:08 phosphan Exp $
+
+*gsubedit-0.4_pre1-r1 (15 Jun 2004)
+
+  15 Jun 2004; Patrick Kursawe <phosphan@gentoo.org>
+  gsubedit-0.4_pre1-r1.ebuild, gsubedit-0.4_pre1.ebuild, files/crashes.patch,
+  files/langlist.patch:
+  Fixing another stupid segfault. See bug #52776.
 
 *gsubedit-0.4_pre1 (30 Sep 2003)
 
diff --git a/media-video/gsubedit/Manifest b/media-video/gsubedit/Manifest
index 188c7819691d..16f02ee7e8db 100644
--- a/media-video/gsubedit/Manifest
+++ b/media-video/gsubedit/Manifest
@@ -1,5 +1,6 @@
-MD5 f1dfc4f03f4ef0983b684f6f1905b535 ChangeLog 395
+MD5 699efeb6fcbfb912bd0f8bdf0d91b4c3 gsubedit-0.4_pre1-r1.ebuild 773
+MD5 b34b1d02960a6874f49e39027c76a779 ChangeLog 638
 MD5 5ef11878179d451985ee7157a416c27e metadata.xml 222
-MD5 6bd41e7065a2018d57869171fd25a3d7 gsubedit-0.4_pre1.ebuild 774
+MD5 a08b3a299e0b28b84e9e96c34f3504f7 files/crashes.patch 861
 MD5 8b179a14b86d986d420f5e622fb1859e files/digest-gsubedit-0.4_pre1 68
-MD5 34a1d4d956763e5b83fb24367c26daa1 files/langlist.patch 426
+MD5 8b179a14b86d986d420f5e622fb1859e files/digest-gsubedit-0.4_pre1-r1 68
diff --git a/media-video/gsubedit/files/crashes.patch b/media-video/gsubedit/files/crashes.patch
new file mode 100644
index 000000000000..557140096133
--- /dev/null
+++ b/media-video/gsubedit/files/crashes.patch
@@ -0,0 +1,23 @@
+--- src/callbacks.c	2002-06-05 13:47:11.000000000 +0200
++++ src/callbacks.c.new	2004-06-15 09:08:54.324083974 +0200
+@@ -806,6 +806,9 @@
+     update = cfg.auto_update_clist;
+     cfg.auto_update_clist = FALSE;
+     
++    if(!GTK_CLIST(mwin_clist)->selection) {
++    	return;
++    } 
+     row = (int) GTK_CLIST (mwin_clist)->selection->data;
+     gtk_clist_get_text (GTK_CLIST (mwin_clist), row, 1, &txt);
+     start_frame = atoi (txt);
+--- src/cfg.c   2003-09-30 09:14:32.000000000 +0200
++++ src/cfg.c.new       2003-09-30 09:15:00.000000000 +0200
+@@ -241,7 +241,7 @@
+     gtk_clist_set_selection_mode (GTK_CLIST (tab3.clist_lang), GTK_SELECTION_BROWSE);
+     
+     i = 0;
+-    while (cfg.lang_list[i])
++    if(cfg.lang_list) while (cfg.lang_list[i])
+     {
+        gtk_clist_append (GTK_CLIST (tab3.clist_lang), (gchar **) &(cfg.lang_list[i]));
+        i += 2;
diff --git a/media-video/gsubedit/files/digest-gsubedit-0.4_pre1 b/media-video/gsubedit/files/digest-gsubedit-0.4_pre1-r1
index 8eb51bda1e70..8eb51bda1e70 100644
--- a/media-video/gsubedit/files/digest-gsubedit-0.4_pre1
+++ b/media-video/gsubedit/files/digest-gsubedit-0.4_pre1-r1
diff --git a/media-video/gsubedit/files/langlist.patch b/media-video/gsubedit/files/langlist.patch
deleted file mode 100644
index 07ccbbd34f3c..000000000000
--- a/media-video/gsubedit/files/langlist.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cfg.c   2003-09-30 09:14:32.000000000 +0200
-+++ src/cfg.c.new       2003-09-30 09:15:00.000000000 +0200
-@@ -241,7 +241,7 @@
-     gtk_clist_set_selection_mode (GTK_CLIST (tab3.clist_lang), GTK_SELECTION_BROWSE);
-     
-     i = 0;
--    while (cfg.lang_list[i])
-+    if(cfg.lang_list) while (cfg.lang_list[i])
-     {
-        gtk_clist_append (GTK_CLIST (tab3.clist_lang), (gchar **) &(cfg.lang_list[i]));
-        i += 2;
diff --git a/media-video/gsubedit/gsubedit-0.4_pre1.ebuild b/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild
index 4255e660f5f7..35d8b640033b 100644
--- a/media-video/gsubedit/gsubedit-0.4_pre1.ebuild
+++ b/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/gsubedit-0.4_pre1.ebuild,v 1.1 2003/09/30 07:23:14 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gsubedit/gsubedit-0.4_pre1-r1.ebuild,v 1.1 2004/06/15 07:18:08 phosphan Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ S=${WORKDIR}/${P/_}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/langlist.patch
+	epatch ${FILESDIR}/crashes.patch
 }
 
 src_compile() {