Fri Jul 30 07:10:51 2010 UTC ()
Work around namespace pollution breaking the build on OpenSolaris.
>From Aleksey Cheusov in PR 43638.


(dholland)
diff -r1.20 -r1.21 pkgsrc/misc/libcdio/distinfo
diff -r0 -r1.7 pkgsrc/misc/libcdio/patches/patch-ab
cvs diff -r1.20 -r1.21 pkgsrc/misc/libcdio/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libcdio/distinfo 2009/10/31 02:49:09 1.20
+++ pkgsrc/misc/libcdio/distinfo 2010/07/30 07:10:50 1.21
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.20 2009/10/31 02:49:09 wiz Exp $ 1$NetBSD: distinfo,v 1.21 2010/07/30 07:10:50 dholland Exp $
2 2
3SHA1 (libcdio-0.82.tar.gz) = b3a87283a373eed816c15584c373ad6d2f95f09a 3SHA1 (libcdio-0.82.tar.gz) = b3a87283a373eed816c15584c373ad6d2f95f09a
4RMD160 (libcdio-0.82.tar.gz) = 48dc71f349235ab501985a296fd3deee295c167f 4RMD160 (libcdio-0.82.tar.gz) = 48dc71f349235ab501985a296fd3deee295c167f
5Size (libcdio-0.82.tar.gz) = 2240599 bytes 5Size (libcdio-0.82.tar.gz) = 2240599 bytes
6SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e 6SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
 7SHA1 (patch-ab) = 73bd86ecfa0c728eab231bce36317ab7f616fa4c
7SHA1 (patch-ac) = 7bea49d753bb88d8fa2b5b87a4e9a327c5d7f05f 8SHA1 (patch-ac) = 7bea49d753bb88d8fa2b5b87a4e9a327c5d7f05f
File Added: pkgsrc/misc/libcdio/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.7 2010/07/30 07:10:50 dholland Exp $

Work around namespace pollution on OpenSolaris (PR 43638, Aleksey Cheusov)

--- include/cdio++/iso9660.hpp.orig	2008-11-29 04:52:43.000000000 +0000
+++ include/cdio++/iso9660.hpp
@@ -33,6 +33,10 @@
 #include <cstring>
 using namespace std;
 
+#ifdef FS
+#undef FS
+#endif
+
 /** ISO 9660 class.
 */
 class ISO9660