summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-08-30 10:06:03 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-08-30 10:06:03 +0800
commit13e475e5006bb5b72d54f1fb235f86151e0cc542 (patch)
tree7ba188b9faeb209a7abc2d72fd22853f8493929b
parent73225ee3126e67fbe9b91797b31705e88c3e56ce (diff)
downloadmarcuscom-ports-13e475e5006bb5b72d54f1fb235f86151e0cc542.tar
marcuscom-ports-13e475e5006bb5b72d54f1fb235f86151e0cc542.tar.gz
marcuscom-ports-13e475e5006bb5b72d54f1fb235f86151e0cc542.tar.bz2
marcuscom-ports-13e475e5006bb5b72d54f1fb235f86151e0cc542.tar.lz
marcuscom-ports-13e475e5006bb5b72d54f1fb235f86151e0cc542.tar.xz
marcuscom-ports-13e475e5006bb5b72d54f1fb235f86151e0cc542.tar.zst
marcuscom-ports-13e475e5006bb5b72d54f1fb235f86151e0cc542.zip
Commit the patch I tested instead of the first draft which declared the
at_eof boolean in the wrong place. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7171 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c17
2 files changed, 11 insertions, 10 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 3f5b73dca..510545d9a 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.109 2006/08/29 14:57:02 marcus Exp $
+# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.110 2006/08/29 20:43:26 marcus Exp $
#
PORTNAME= nautilus-cd-burner
PORTVERSION= 2.15.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c
index 79fdef26c..5c4ba403a 100644
--- a/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c
+++ b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c
@@ -1,5 +1,5 @@
--- src/mapping-protocol.c.orig Sun Aug 20 08:47:20 2006
-+++ src/mapping-protocol.c Tue Aug 29 16:39:11 2006
++++ src/mapping-protocol.c Tue Aug 29 22:06:18 2006
@@ -26,6 +26,8 @@
#include "config.h"
@@ -9,15 +9,16 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
-@@ -86,6 +88,7 @@ static gboolean handle_write
- #ifdef DEBUG_ENABLE
+@@ -36,6 +38,8 @@
+
+ G_LOCK_DEFINE_STATIC (channel_lock);
- static FILE *debug_out = NULL;
+static gboolean at_eof = FALSE;
++
+ #define MINIMUM_MESSAGE_SIZE 16
- static void
- debug_init (void)
-@@ -1189,6 +1192,9 @@ mapping_protocol_channel_fill_read_buffe
+ struct MappingProtocolChannel {
+@@ -1189,6 +1193,9 @@ mapping_protocol_channel_fill_read_buffe
status = g_io_channel_read_chars (channel->iochannel, data, count, &length, NULL);
@@ -27,7 +28,7 @@
if (status != G_IO_STATUS_NORMAL) {
return;
}
-@@ -1340,7 +1346,7 @@ handle_read (GIOChannel *sou
+@@ -1340,7 +1347,7 @@ handle_read (GIOChannel *sou
mapping_protocol_channel_do_iteration (channel);
}