ports/59138: [PATCH] port multimedia/avifile fails to build because of protected class in avm_map.h

[Ulf Lilleengen]

>Number:         59138
>Category:       ports
>Synopsis:       [PATCH] port multimedia/avifile fails to build because of protected class in avm_map.h
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 10 07:40:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ulf Lilleengen
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
< Blablabla >
>Environment:
System: FreeBSD lulflap.faugli 5.1-CURRENT FreeBSD 5.1-CURRENT #12: Sat Nov 8 18:30:50 CET 2003 lulf at lulflap.faugli:/usr/obj/usr/src/sys/LULFLAP i386
>Description:
	Avifile fails to build, complaining about a protected class const_iterator. The patch inserts the line "public:" before the decleration of the const_iterator class. This is a workaround for the problem.

The error: 
c++ -DHAVE_CONFIG_H -I. -I. -I../../include -I/usr/local/include -I/usr/local/include -I/usr/X11R6/include -D_GETOPT_H -Wall -Wno-unused -I../../include -O -pipe -mcpu=pentiumpro -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -c avm_output.cpp  -fPIC -DPIC -o .libs/avm_output.lo
../../include/avm_map.h: In member function `void 
   avm::AvmOutput::resetDebugLevels(int)':
../../include/avm_map.h:82: error: `class avm::avm_map<const char*, int, 
   avm::AvmOutput::AvmOutputPrivate::Less, 
   avm::AvmOutput::AvmOutputPrivate::Equal>::const_iterator' is protected
avm_output.cpp:154: error: within this context
gmake[2]: *** [avm_output.lo] Error 1
gmake[2]: Leaving directory `/usr/ports/multimedia/avifile/work/avifile0.7-0.7.34/lib/common'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/usr/ports/multimedia/avifile/work/avifile0.7-0.7.34/lib'
gmake: *** [all-recursive] Error 1
*** Error code 2

Stop in /usr/ports/multimedia/avifile.
*** Error code 1

Stop in /usr/ports/multimedia/avifile.

>How-To-Repeat:
	make multimedia/avifile
>Fix:

	

--- avm_map.h.diff begins here ---
--- avm_map.h	Sun Nov  9 00:21:18 2003
+++ avm_map.h.bak	Sun Nov  9 00:20:55 2003
@@ -78,7 +78,6 @@
     static void update_min_max_weights(void* node);
     _Tnode* find_private(const Key& key) const;
 #if 1
-public:
     class const_iterator
     {
 	_Tnode* p;
--- avm_map.h.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: