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

Package-Manager: portage-2.1.2.7

6 files changed, 140 insertions, 5 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/Manifest b/app-cdr/gnomebaker/Manifest
index 1fbe9cda5f80..c48a109ee320 100644
--- a/app-cdr/gnomebaker/Manifest
+++ b/app-cdr/gnomebaker/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnomebaker-0.5.1-headerfix.patch 362 RMD160 7122e3a5571ec5ae198a9cc7580ae6371e45012b SHA1 593d43cbe96f28c8ea162011256abf7f0e3bb845 SHA256 2ea9014c04dbfcaaae5300358cba07cdf318a41a2eb0ba97095f96997194e00a
 MD5 24a9da81b7fd060b4ee8806869371b64 files/gnomebaker-0.5.1-headerfix.patch 362
 RMD160 7122e3a5571ec5ae198a9cc7580ae6371e45012b files/gnomebaker-0.5.1-headerfix.patch 362
 SHA256 2ea9014c04dbfcaaae5300358cba07cdf318a41a2eb0ba97095f96997194e00a files/gnomebaker-0.5.1-headerfix.patch 362
+AUX gnomebaker-0.6.1-export-dynamic_for_glade.patch 757 RMD160 6baea894c72f5e832ba1da719bbe34e36e4419c2 SHA1 674a9c78ac4d39d1a5d618f46d83cddf59bc8183 SHA256 26d12231a3960831802306793ff3c89b4ce528a708be82046407ddd79b5c023c
+MD5 68068df8bc09c9f9c483cdbc353c8ed0 files/gnomebaker-0.6.1-export-dynamic_for_glade.patch 757
+RMD160 6baea894c72f5e832ba1da719bbe34e36e4419c2 files/gnomebaker-0.6.1-export-dynamic_for_glade.patch 757
+SHA256 26d12231a3960831802306793ff3c89b4ce528a708be82046407ddd79b5c023c files/gnomebaker-0.6.1-export-dynamic_for_glade.patch 757
+AUX gnomebaker-0.6.1-thread_init.patch 840 RMD160 7a512a1719d8f86e1ce42416794d0482c97dd801 SHA1 6346085435d62455d68a6b7b6231484f6472319f SHA256 6f64206d107cca34823f81f0de045c683228488c15f36c4290431229de169eaa
+MD5 b12c27c40709af9b0ab481a0b76d3476 files/gnomebaker-0.6.1-thread_init.patch 840
+RMD160 7a512a1719d8f86e1ce42416794d0482c97dd801 files/gnomebaker-0.6.1-thread_init.patch 840
+SHA256 6f64206d107cca34823f81f0de045c683228488c15f36c4290431229de169eaa files/gnomebaker-0.6.1-thread_init.patch 840
 DIST gnomebaker-0.5.1.tar.bz2 941026 RMD160 f8944a7e7db5d714b7a0492e962baf9bbf726d72 SHA1 7568d9531fc94862cbd73c113368b621e6128d98 SHA256 71a902cf66859a9eaeccedda2f400b978e5ef06911fce43da2ebb4a718e84d0c
 DIST gnomebaker-0.6.0.tar.gz 1232464 RMD160 6cf272c77773df926dfaf23b21d271ecacdcbe40 SHA1 66880a0eb0add92833af9aee7fa5a592b2c8336d SHA256 b1639296a7c5de7fbc37464ed70d68007edcb884eb4b5983a1c5f9028f50fb0b
 DIST gnomebaker-0.6.1.tar.gz 1235841 RMD160 86ba9efd07700e6fedab7a5bd8d59011048998ec SHA1 27be843a1d5a33848bb37cd549984ea9b7ecfd52 SHA256 bca2306042405779881bd72fb4824c93ccd79328a811f52b3dcd037b01d3b129
@@ -17,14 +28,18 @@ EBUILD gnomebaker-0.6.1-r1.ebuild 1411 RMD160 4a525b5be7f344586c9b60f8f877ce0510
 MD5 095808ae1c1285f082fc6792aeb8808e gnomebaker-0.6.1-r1.ebuild 1411
 RMD160 4a525b5be7f344586c9b60f8f877ce0510ed4b09 gnomebaker-0.6.1-r1.ebuild 1411
 SHA256 e84a0569b5603004419a79fdf594ca851dad58cf315e578f00b666fb4794df89 gnomebaker-0.6.1-r1.ebuild 1411
+EBUILD gnomebaker-0.6.1-r2.ebuild 1512 RMD160 cde96e9a3717e0b3fd375e965c5f9d984ae3fb77 SHA1 94848221d89ee31fb24d91ab388449c9df85654a SHA256 a75df87652d233b4d95ffbcf43e1286b7b8b21732e85493e17c4a35a2072384f
+MD5 09b07de45829793a0ecc07525fd935d5 gnomebaker-0.6.1-r2.ebuild 1512
+RMD160 cde96e9a3717e0b3fd375e965c5f9d984ae3fb77 gnomebaker-0.6.1-r2.ebuild 1512
+SHA256 a75df87652d233b4d95ffbcf43e1286b7b8b21732e85493e17c4a35a2072384f gnomebaker-0.6.1-r2.ebuild 1512
 EBUILD gnomebaker-0.6.1.ebuild 1230 RMD160 c1fafff0ed02f205a471115710f86763cbb6fe02 SHA1 bb4f69ee666e7bea0fc19529c953c4dda18ffb79 SHA256 10807889c05e582631821ddf69c6e3c002ac24d0841e4fc3031fb3b738ebbf3c
 MD5 c6e124f20ae042d43e0127a629e80a77 gnomebaker-0.6.1.ebuild 1230
 RMD160 c1fafff0ed02f205a471115710f86763cbb6fe02 gnomebaker-0.6.1.ebuild 1230
 SHA256 10807889c05e582631821ddf69c6e3c002ac24d0841e4fc3031fb3b738ebbf3c gnomebaker-0.6.1.ebuild 1230
-MISC ChangeLog 5049 RMD160 3f856f54c50dabcba3a87012f0fa3190df3d2cc4 SHA1 48394cd0633241c3369214c6f2ef68f8d2ddd955 SHA256 9840be841ebf4b5d9c9672f7e0d27ba062120c6e065de49cad926dd545e8c43e
-MD5 cfcb6ec5a79d8c0dd78e75ce91fcaa13 ChangeLog 5049
-RMD160 3f856f54c50dabcba3a87012f0fa3190df3d2cc4 ChangeLog 5049
-SHA256 9840be841ebf4b5d9c9672f7e0d27ba062120c6e065de49cad926dd545e8c43e ChangeLog 5049
+MISC ChangeLog 5338 RMD160 27fcb4bb70d3a234b8ab20d3491379b179cb84c5 SHA1 7a2f113bd0b4c7507d14ec4beb98d10614fdb43c SHA256 a61dbf829778010543c6c1bafb0e6d764c2bebc8b50436dba2d6d041c7e8c767
+MD5 0cdbcd93ef68af678af63447a1d3aeee ChangeLog 5338
+RMD160 27fcb4bb70d3a234b8ab20d3491379b179cb84c5 ChangeLog 5338
+SHA256 a61dbf829778010543c6c1bafb0e6d764c2bebc8b50436dba2d6d041c7e8c767 ChangeLog 5338
 MISC metadata.xml 168 RMD160 0f4531db7705cd8bc36b75d29d850bf7104855ae SHA1 d5eb7a704881bd8a8a83d83679d791b1e17633b4 SHA256 78253ccb8cd8df7179b1776b7e98a02f8df32368476727fef07ad0c9d164e180
 MD5 261972da02920d2246124b6fc395ac37 metadata.xml 168
 RMD160 0f4531db7705cd8bc36b75d29d850bf7104855ae metadata.xml 168
@@ -41,3 +56,13 @@ SHA256 5f78d5549e8468ca204a1e3d8542d98b7ea33dd951b8b86e8b7743fa4d7c7519 files/di
 MD5 c21ccedf036135acbcae2048648cd8ea files/digest-gnomebaker-0.6.1-r1 253
 RMD160 c9370627b46c2dd702a647f4388dace6c8bad383 files/digest-gnomebaker-0.6.1-r1 253
 SHA256 5f78d5549e8468ca204a1e3d8542d98b7ea33dd951b8b86e8b7743fa4d7c7519 files/digest-gnomebaker-0.6.1-r1 253
+MD5 c21ccedf036135acbcae2048648cd8ea files/digest-gnomebaker-0.6.1-r2 253
+RMD160 c9370627b46c2dd702a647f4388dace6c8bad383 files/digest-gnomebaker-0.6.1-r2 253
+SHA256 5f78d5549e8468ca204a1e3d8542d98b7ea33dd951b8b86e8b7743fa4d7c7519 files/digest-gnomebaker-0.6.1-r2 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGWiZTkeYb6olFHJcRAqymAJ9nQ8+chcZy4sb55oAEX2YyZ3HyiACgmP/r
++sHADektJDMqKr3iPCtwax4=
+=wbor
+-----END PGP SIGNATURE-----
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
+}