Fix bug that was emitting #line directives with a line number of 0, which

clang strenuously objects to. Fixes clang build of audio/gmpc and maybe
others. PKGREVISION -> 2.

4 files changed, 45 insertions, 3 deletions

diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 274a3ec66cd..08caf7aadf4 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2011/04/22 13:42:17 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/08/01 05:03:44 dholland Exp $
 
 DISTNAME=	gob2-2.0.18
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://ftp.5z.com/pub/gob/
 
diff --git a/devel/gob2/distinfo b/devel/gob2/distinfo
index 2a3039dd71a..1e62726d031 100644
--- a/devel/gob2/distinfo
+++ b/devel/gob2/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2011/01/12 20:40:55 drochner Exp $
+$NetBSD: distinfo,v 1.8 2011/08/01 05:03:44 dholland Exp $
 
 SHA1 (gob2-2.0.18.tar.gz) = eea5c748b69bc09379cd36f6894f641f6c290900
 RMD160 (gob2-2.0.18.tar.gz) = 9bed640b9050a4019a1a347a982b795b1ab42e52
 Size (gob2-2.0.18.tar.gz) = 271085 bytes
+SHA1 (patch-src_main_c) = 53c7d8e9ec4cf71a5718d0e35cc91539bd482a2a
+SHA1 (patch-src_out_c) = de643aab8b4ee4cb436fa44e62deea96cc0e2b72
diff --git a/devel/gob2/patches/patch-src_main_c b/devel/gob2/patches/patch-src_main_c
new file mode 100644
index 00000000000..2305b47569f
--- /dev/null
+++ b/devel/gob2/patches/patch-src_main_c
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_main_c,v 1.1 2011/08/01 05:03:45 dholland Exp $
+
+Avoid generating "#line 0" as clang objects strenuously. This patch
+fixes two cases that audio/gmpc ran into.
+
+--- src/main.c.orig	2011-01-03 19:50:33.000000000 +0000
++++ src/main.c
+@@ -652,6 +652,7 @@ make_inits(Class *cl)
+ 				 "method", CLASS_INIT_METHOD,
+ 				 "mtype:steal", type,
+ 				 "id", "class_init",
++				 "line_no", 1,
+ 				 "args:steal", make_func_arg (cl->otype,
+ 							      TRUE /* is_class */,
+ 							      "c" /* name */),
+@@ -668,6 +669,7 @@ make_inits(Class *cl)
+ 				 "method", INIT_METHOD,
+ 				 "mtype:steal", type,
+ 				 "id", "init",
++				 "line_no", 1,
+ 				 "args:steal", make_func_arg (cl->otype,
+ 							      FALSE /* is_class */,
+ 							      "o" /* name */),
diff --git a/devel/gob2/patches/patch-src_out_c b/devel/gob2/patches/patch-src_out_c
new file mode 100644
index 00000000000..dea2e392849
--- /dev/null
+++ b/devel/gob2/patches/patch-src_out_c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_out_c,v 1.1 2011/08/01 05:03:45 dholland Exp $
+
+Avoid generating "#line 0" as clang objects strenuously. This patch
+serves as an added precaution.
+
+--- src/out.c~	2009-07-10 14:43:05.000000000 +0000
++++ src/out.c
+@@ -69,6 +69,9 @@ out_addline_infile(FILE *fp, int line)
+ 	} else
+ 		g_assert_not_reached();
+ 
++	if (line == 0) {
++		line = 1;
++	}
+ 	fprintf(fp, "#line %d \"%s\"\n", line, filename);
+ }
+