Fix UI signal handlers and thread initialization - bugs 157537 and 177975

(Portage version: 2.1.2.7)

5 files changed, 111 insertions, 1 deletions

diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index cbadd3e7f8e0..0b93292d90da 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-cdr/gnomebaker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.34 2007/03/09 02:30:17 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.35 2007/05/28 00:47:24 leio Exp $
+
+*gnomebaker-0.6.1-r2 (28 May 2007)
+
+  28 May 2007; Mart Raudsepp <leio@gentoo.org>
+  +files/gnomebaker-0.6.1-export-dynamic_for_glade.patch,
+  +files/gnomebaker-0.6.1-thread_init.patch, +gnomebaker-0.6.1-r2.ebuild:
+  Fix UI signal handlers and thread initialization - bugs 157537 and 177975
 
 *gnomebaker-0.6.1-r1 (09 Mar 2007)
 
diff --git a/app-cdr/gnomebaker/files/digest-gnomebaker-0.6.1-r2 b/app-cdr/gnomebaker/files/digest-gnomebaker-0.6.1-r2
new file mode 100644
index 000000000000..6a78931cdcc1
--- /dev/null
+++ b/app-cdr/gnomebaker/files/digest-gnomebaker-0.6.1-r2
@@ -0,0 +1,3 @@
+MD5 5ddffd4ae02417a3fd91b08951e7f434 gnomebaker-0.6.1.tar.gz 1235841
+RMD160 86ba9efd07700e6fedab7a5bd8d59011048998ec gnomebaker-0.6.1.tar.gz 1235841
+SHA256 bca2306042405779881bd72fb4824c93ccd79328a811f52b3dcd037b01d3b129 gnomebaker-0.6.1.tar.gz 1235841
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.1-export-dynamic_for_glade.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.1-export-dynamic_for_glade.patch
new file mode 100644
index 000000000000..90e75fdc3752
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.1-export-dynamic_for_glade.patch
@@ -0,0 +1,21 @@
+diff -Nur gnomebaker-0.6.0.dist/src/Makefile.am gnomebaker-0.6.0/src/Makefile.am
+--- gnomebaker-0.6.0.dist/src/Makefile.am	2006-05-06 00:54:15.000000000 +0200
++++ gnomebaker-0.6.0/src/Makefile.am	2007-01-22 01:45:33.000000000 +0100
+@@ -36,3 +36,6 @@
+ 	cairofillbar.c cairofillbar.h
+ 	
+ gnomebaker_LDADD =  @GNOMEBAKER_LIBS@
++
++gnomebaker_LDFLAGS = -export-dynamic 
++
+diff -Nur gnomebaker-0.6.0.dist/src/Makefile.in gnomebaker-0.6.0/src/Makefile.in
+--- gnomebaker-0.6.0.dist/src/Makefile.in	2006-09-16 01:06:13.000000000 +0200
++++ gnomebaker-0.6.0/src/Makefile.in	2007-01-22 01:45:33.000000000 +0100
+@@ -249,6 +249,7 @@
+ 	cairofillbar.c cairofillbar.h
+ 
+ gnomebaker_LDADD = @GNOMEBAKER_LIBS@
++gnomebaker_LDFLAGS = -export-dynamic 
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.6.1-thread_init.patch b/app-cdr/gnomebaker/files/gnomebaker-0.6.1-thread_init.patch
new file mode 100644
index 000000000000..2668bcc54b83
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.6.1-thread_init.patch
@@ -0,0 +1,27 @@
+--- src/main.c	2006-08-31 01:41:15.000000000 +0200
++++ src/main_fixed.c	2007-05-10 23:22:33.000000000 +0200
+@@ -49,6 +49,9 @@ static GOptionEntry entries[] =
+ gint
+ main(gint argc, gchar *argv[])
+ {
++    /* This must happen before any other GLib function is called */
++    if (!g_thread_supported ()) g_thread_init(NULL);
++
+ 	GError *error = NULL;
+ 	GOptionContext *context = g_option_context_new(_(" - GNOME CD/DVD burning application"));
+ 	/* add main entries */
+@@ -71,12 +74,11 @@ main(gint argc, gchar *argv[])
+     textdomain (GETTEXT_PACKAGE);
+ #endif
+ 
++    gdk_threads_init();
++
+ #ifdef GST_010
+     struct poptOption* options = NULL;
+ #else
+-    if (!g_thread_supported ()) g_thread_init(NULL);
+-    gdk_threads_init();
+-
+ 	struct poptOption options[] =
+ 	{
+     	{NULL, '\0', POPT_ARG_INCLUDE_TABLE, NULL, 0, "GStreamer", NULL},
diff --git a/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild b/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild
new file mode 100644
index 000000000000..f04030b60f02
--- /dev/null
+++ b/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.6.1-r2.ebuild,v 1.1 2007/05/28 00:47:24 leio Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="GnomeBaker is a GTK2/Gnome cd burning application."
+HOMEPAGE="http://gnomebaker.sf.net"
+SRC_URI="mirror://sourceforge/gnomebaker/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dvdr nls mp3 flac vorbis libnotify"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+DEPEND=">=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.10
+	>=media-libs/gstreamer-0.10.0
+	dev-perl/XML-Parser
+	libnotify? ( x11-libs/libnotify )
+	app-text/scrollkeeper"
+RDEPEND="${DEPEND}
+	dvdr? ( app-cdr/dvd+rw-tools )
+	mp3? ( >=media-plugins/gst-plugins-mad-0.10.0
+		media-libs/gst-plugins-good	)
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.0
+		>=media-libs/libogg-1.1.2
+		media-libs/gst-plugins-good )
+	flac? ( >=media-plugins/gst-plugins-flac-0.10.0
+		media-libs/gst-plugins-good )
+	app-cdr/cdrdao
+	virtual/cdrtools"
+
+G2CONF="${G2CONF} \
+	$(use_enable libnotify)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-export-dynamic_for_glade.patch"
+	epatch "${FILESDIR}/${P}-thread_init.patch"
+
+	gnome2_omf_fix
+}
+
+src_install() {
+	gnome2_src_install \
+		gnomebakerdocdir=/usr/share/doc/${P} \
+		docdir=/usr/share/gnome/help/${PN}/C \
+		gnomemenudir=/usr/share/applications
+	rm -rf ${D}/usr/share/doc/${P}/*.make ${D}/var
+	use nls || rm -rf ${D}/usr/share/locale
+}