pkg/46428: editors/conglomerate needs another clone(2) patch

[noud4%home.nl@localhost]

>Number:         46428
>Category:       pkg
>Synopsis:       editors/conglomerate needs another clone(2) patch
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue May 08 22:40:00 +0000 2012
>Originator:     Noud de Brouwer
>Release:        6.99.4
>Organization:
-none-
>Environment:
NetBSD 10.0.2.17 6.99.4 NetBSD 6.99.4 (MONOLITHIC) #0: Wed Apr 18 09:37:46 UTC 
2012  mickey55@10.0.2.17:/obj-src/sys/arch/i386/compile/MONOLITHIC i386
>Description:
gcc -DHAVE_CONFIG_H -I. -I. -I.. -Wall -D_REENTRANT -pthread -DORBIT2=1 
-I/usr/pkg/include/gtk-2.0 -I/usr/pkg/lib/gtk-2.0/include 
-I/usr/pkg/include/atk-1.0 -I/usr/pkg/include/cairo 
-I/usr/pkg/include/gdk-pixbuf-2.0 -I/usr/pkg/include/pango-1.0 
-I/usr/pkg/include/glib/gio-unix-2.0/ -I/usr/pkg/include 
-I/usr/pkg/include/glib/glib-2.0 -I/usr/pkg/lib/glib-2.0/include 
-I/usr/pkg/include/pixman-1 -I/usr/pkg/include/freetype2 
-I/usr/pkg/include/libpng15 -I/usr/pkg/include/gconf/2 
-I/usr/pkg/include/orbit-2.0 -I/usr/pkg/include/libxml2 
-I/usr/pkg/include/libbonobo-2.0 -I/usr/pkg/include/bonobo-activation-2.0 
-I/usr/pkg/include/libbonoboui-2.0 -I/usr/pkg/include/libgnomecanvas-2.0 
-I/usr/pkg/include/libgnome-2.0 -I/usr/pkg/include/gail-1.0 
-I/usr/pkg/include/libart-2.0 -I/usr/pkg/include/gnome-vfs-2.0 
-I/usr/pkg/lib/gnome-vfs-2.0/include -I/usr/pkg/include/libgnomeui-2.0 
-I/usr/pkg/include/gnome-keyring-1 -I/usr/pkg/include/libglade-2.0   -pthread 
-D_REENTRANT -I/usr/pkg/include/libg
 nomeprint-2.2 -I/usr/pkg/include/libart-2.0 -I/usr/pkg/include/glib/glib-2.0 
-I/usr/pkg/lib/glib-2.0/include -I/usr/pkg/include/libxml2 
-I/usr/pkg/include/pango-1.0 -I/usr/pkg/include 
-I/usr/pkg/include/libgnomeprintui-2.2 -I/usr/pkg/include/libgnomecanvas-2.0 
-I/usr/pkg/include/gail-1.0 -I/usr/pkg/include/gtk-2.0 
-I/usr/pkg/include/freetype2 -I/usr/pkg/include/atk-1.0 
-I/usr/pkg/lib/gtk-2.0/include -I/usr/pkg/include/cairo 
-I/usr/pkg/include/gdk-pixbuf-2.0 -I/usr/pkg/include/glib/gio-unix-2.0/ 
-I/usr/pkg/include/pixman-1 -I/usr/pkg/include/libpng15   -DENABLE_PRINTING   
-D_REENTRANT -pthread -I/usr/pkg/include/gtksourceview-1.0 
-I/usr/pkg/include/gtk-2.0 -I/usr/pkg/include/libxml2 
-I/usr/pkg/include/libgnomeprint-2.2 -I/usr/pkg/lib/gtk-2.0/include 
-I/usr/pkg/include/atk-1.0 -I/usr/pkg/include/cairo 
-I/usr/pkg/include/gdk-pixbuf-2.0 -I/usr/pkg/include/pango-1.0 
-I/usr/pkg/include/glib/gio-unix-2.0/ -I/usr/pkg/include 
-I/usr/pkg/include/glib/glib-2.0 -I/usr/pkg/lib/glib-2.0/i
 nclude -I/usr/pkg/include/pixman-1 -I/usr/pkg/include/freetype2 
-I/usr/pkg/include/libpng15 -I/usr/pkg/include/libart-2.0   
-DENABLE_GTKSOURCEVIEW  -DLOCALEDIR=\""/usr/pkg/share/locale"\" 
-DPREFIX=\""/usr/pkg"\" -DSYSCONFDIR=\""/usr/pkg/etc/conglomerate"\" 
-DDATADIR=\""/usr/pkg/share"\" -DLIBDIR=\""/usr/pkg/lib/conglomerate"\" 
-I./recent-files/   -I/usr/pkg/include -I/usr/include 
-I/usr/pkg/include/freetype2  -O2 -I/usr/pkg/include -I/usr/include 
-I/usr/pkg/include/freetype2 -c cong-editor-line-iter-span-wrapper.c

cong-editor-line-iter-span-wrapper.c:29:1: error: conflicting types for 'clone'

/usr/include/sched.h:71:8: note: previous declaration of 'clone' was here

gmake[3]: *** [cong-editor-line-iter-span-wrapper.o] Error 1


>How-To-Repeat:
cd editors/conglomerate && make
>Fix:
patches/patch-src_cong-editor-line-iter-span-wrapper_c:
$NetBSD$

Avoid symbol conflict with clone(2).

--- src/cong-editor-line-iter-span-wrapper.c.orig       2012-05-08 
22:23:43.000000000 +0000
+++ src/cong-editor-line-iter-span-wrapper.c    2012-05-08 22:24:03.000000000 
+0000
@@ -26,13 +26,13 @@
 #include "cong-editor-line-iter-span-wrapper.h"
 
 static CongEditorLineIter*
-clone (CongEditorLineIter *line_iter);
+clone_ (CongEditorLineIter *line_iter);
 
 static CongEditorAreaLine*
 get_line (CongEditorLineIter *line_iter);
 
 CONG_DEFINE_CLASS_PUBLIC_DATA (CongEditorLineIterSpanWrapper, 
cong_editor_line_iter_span_wrapper, CONG_EDITOR_LINE_ITER_SPAN_WRAPPER, 
CongEditorLineIter, CONG_EDITOR_LINE_ITER_TYPE, 
-                              CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = 
clone;
+                              CONG_EDITOR_LINE_ITER_CLASS (klass)->clone = 
clone_;
                               CONG_EDITOR_LINE_ITER_CLASS (klass)->get_line = 
get_line;)
 
 /* Implementation of CongLineEditorIterSpanWrapper: */
@@ -80,7 +80,7 @@
 }
 
 static CongEditorLineIter*
-clone (CongEditorLineIter *line_iter)
+clone_ (CongEditorLineIter *line_iter)
 {
        CongEditorLineIterSpanWrapper* span_wrapper_iter = 
CONG_EDITOR_LINE_ITER_SPAN_WRAPPER (line_iter);
        CongEditorLineIterSpanWrapper* new_iter;