Add patch to fix burning on 64bit archs.

(Portage version: 2.0.53_rc7)

5 files changed, 78 insertions, 11 deletions

diff --git a/app-cdr/gnomebaker/ChangeLog b/app-cdr/gnomebaker/ChangeLog
index f9a0856f8775..2efecd41c92a 100644
--- a/app-cdr/gnomebaker/ChangeLog
+++ b/app-cdr/gnomebaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/gnomebaker
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.11 2005/11/14 14:19:04 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/ChangeLog,v 1.12 2005/11/28 16:08:51 herbs Exp $
+
+*gnomebaker-0.5.0-r1 (28 Nov 2005)
+
+  28 Nov 2005; Herbie Hopkins <herbs@gentoo.org>
+  +files/gnomebaker-0.5.0-64bit.diff, +gnomebaker-0.5.0-r1.ebuild:
+  Add patch to fix burning on 64bit archs (now in upstream cvs).
 
   14 Nov 2005; Luis Medinas <metalgod@gentoo.org> gnomebaker-0.4.2.ebuild:
   Marked Stable on amd64.
diff --git a/app-cdr/gnomebaker/Manifest b/app-cdr/gnomebaker/Manifest
index 5dbfaf7929cc..799a63178292 100644
--- a/app-cdr/gnomebaker/Manifest
+++ b/app-cdr/gnomebaker/Manifest
@@ -1,20 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e84b4f4f334e9f19b0f11b3e760a661a ChangeLog 1733
 MD5 ff6373ca4279d6a59fe72ef52ecc0308 files/digest-gnomebaker-0.4 66
 MD5 03f2e1218314d8536e6757a270fd361c files/digest-gnomebaker-0.4.1 68
 MD5 f1f3df84ffcb90188e6f78e6f42ea6f4 files/digest-gnomebaker-0.4.2 68
 MD5 dc88a6c8a1a049ee0aa85387225bdc3d files/digest-gnomebaker-0.5.0 69
+MD5 dc88a6c8a1a049ee0aa85387225bdc3d files/digest-gnomebaker-0.5.0-r1 69
+MD5 d97702da8c806d494cd6a864b6b787b4 files/gnomebaker-0.5.0-64bit.diff 1178
 MD5 d208ff69b17a886c9f8904a65a9b7f63 gnomebaker-0.4.1.ebuild 1078
 MD5 7d0a633c42c40264574594dbb270979c gnomebaker-0.4.2.ebuild 1099
 MD5 1e83d407e119c06c0950cff283758e71 gnomebaker-0.4.ebuild 1075
+MD5 ccd1ec15d89d1db8bf12a6eaabdcedb5 gnomebaker-0.5.0-r1.ebuild 1191
 MD5 1bb1c1ea903117c01423888e9cce475e gnomebaker-0.5.0.ebuild 1108
 MD5 261972da02920d2246124b6fc395ac37 metadata.xml 168
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDeJz9wUpWvClEHQoRAgpOAJ9wkHDfNDytU+LnN03ZqI4BUWrnEwCcCcud
-AC1Im52CJ0siCyG7M+0LZZU=
-=9jMC
------END PGP SIGNATURE-----
diff --git a/app-cdr/gnomebaker/files/digest-gnomebaker-0.5.0-r1 b/app-cdr/gnomebaker/files/digest-gnomebaker-0.5.0-r1
new file mode 100644
index 000000000000..fe2e66cb8a9f
--- /dev/null
+++ b/app-cdr/gnomebaker/files/digest-gnomebaker-0.5.0-r1
@@ -0,0 +1 @@
+MD5 728c471403ac35a156eac6680d507388 gnomebaker-0.5.0.tar.gz 1184251
diff --git a/app-cdr/gnomebaker/files/gnomebaker-0.5.0-64bit.diff b/app-cdr/gnomebaker/files/gnomebaker-0.5.0-64bit.diff
new file mode 100644
index 000000000000..caa49878d56e
--- /dev/null
+++ b/app-cdr/gnomebaker/files/gnomebaker-0.5.0-64bit.diff
@@ -0,0 +1,24 @@
+diff -ru ../gnomebaker-0.5.0.orig/src/exec.c ./src/exec.c
+--- ../gnomebaker-0.5.0.orig/src/exec.c	2005-10-05 17:45:05.000000000 -0300
++++ ./src/exec.c	2005-10-17 17:44:00.000000000 -0200
+@@ -85,7 +85,7 @@
+         static const gint BUFF_SIZE = 1024;
+         gchar buffer[BUFF_SIZE];
+         memset(buffer, 0x0, BUFF_SIZE * sizeof(gchar));
+-        guint bytes = 0;
++        gsize bytes = 0;
+         const GIOStatus status = g_io_channel_read_chars(channel, buffer, (BUFF_SIZE - 1) * sizeof(gchar), &bytes, NULL);  
+         if (status == G_IO_STATUS_ERROR || status == G_IO_STATUS_AGAIN) /* need to check what to do for again */
+         {
+diff -ru ../gnomebaker-0.5.0.orig/src/gbcommon.h ./src/gbcommon.h
+--- ../gnomebaker-0.5.0.orig/src/gbcommon.h	2005-09-30 21:06:58.000000000 -0300
++++ ./src/gbcommon.h	2005-10-17 17:43:41.000000000 -0200
+@@ -74,7 +74,7 @@
+ 
+ 
+ #define GB_LOG_FUNC											\
+-	if(showtrace) g_print("[%x] [%s] [%s] [%d]\n", (guint)g_thread_self(), __FUNCTION__, __FILE__, __LINE__);	\
++	if(showtrace) g_print("[%p] [%s] [%s] [%d]\n", (gpointer)g_thread_self(), __FUNCTION__, __FILE__, __LINE__);	\
+ 		
+ #define GB_TRACE			\
+ 	if(showtrace) g_message	\
diff --git a/app-cdr/gnomebaker/gnomebaker-0.5.0-r1.ebuild b/app-cdr/gnomebaker/gnomebaker-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..1e881f225b1a
--- /dev/null
+++ b/app-cdr/gnomebaker/gnomebaker-0.5.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gnomebaker/gnomebaker-0.5.0-r1.ebuild,v 1.1 2005/11/28 16:08:51 herbs Exp $
+
+inherit gnome2 eutils
+
+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"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND=">=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.10
+	>=media-libs/libogg-1.1.2
+	media-libs/gstreamer"
+
+RDEPEND="${DEPEND}
+	dvdr? ( app-cdr/dvd+rw-tools )
+	mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
+	vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
+	flac? ( >=media-plugins/gst-plugins-flac-0.8 )
+	app-cdr/cdrdao
+	virtual/cdrtools"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Fix crash when burning on 64bit archs
+	epatch ${FILESDIR}/${P}-64bit.diff
+}
+
+src_install() {
+	gnome2_src_install \
+		gnomebakerdocdir=${D}/usr/share/doc/${P} \
+		docdir=${D}/usr/share/gnome/help/${PN}/C \
+		gnomemenudir=${D}/usr/share/applications
+	rm -rf ${D}/usr/share/doc/${P}/*.make ${D}/var
+	use nls || rm -rf ${D}/usr/share/locale
+}