pkg/42699: graphics/cpia2view compile error with jpeg-8 (+FIX)

[kre%munnari.OZ.AU@localhost]

>Number:         42699
>Category:       pkg
>Synopsis:       graphics/cpia2view compile error with jpeg-8   (+FIX
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Jan 30 07:25:00 +0000 2010
>Originator:     Robert Elz
>Release:        NetBSD 4.0 / i386
>Organization:
        Prince of Songkla University
>Environment:
System: NetBSD jade.coe.psu.ac.th 4.0_STABLE NetBSD 4.0_STABLE 
(JADE-1.696-20080517) #9: Fri May 23 18:55:13 ICT 2008 
kre%jade.coe.psu.ac.th@localhost:/usr/obj/4/kernels/JADE i386
Architecture: i386
Machine: i386
>Description:
        jpeg-8 added a prototype for jpeg_mem_src() info jpeglib.h
        graphics/cpia2view's jpeg functions had their own version
        of that function with different parameters.

>How-To-Repeat:
        I use pkg_comp (blah blah - all irrelevant for this one)....

        With jpeg-8 (or 8nb1 - this is not the symtab issue), and
        building graphics/cpia2view expect to see:

#   compile  cpia2_driver-1.0/jpeg_decode.o
cc -O2 -I/usr/pkg/include -I/usr/include -Wall -I/usr/pkg/include/gtk-1.2 
-I/usr/pkg/include/glib/glib-1.2 -I/usr/pkg/lib/glib/include 
-I/usr/pkg/include/gtk-1.2 -I/usr/pkg/include/glib/glib-1.2 
-I/usr/pkg/lib/glib/include -I/usr/pkg/include -I/usr/pkg/include 
-I/usr/pkg/include     -I/usr/pkg/include -I/usr/include    -c    jpeg_decode.c
jpeg_decode.c:86: error: conflicting types for 'jpeg_mem_src'
/pkg_comp/obj/pkgsrc/graphics/cpia2view/4x/.buildlink/include/jpeglib.h:959: 
error: previous declaration of 'jpeg_mem_src' was here
*** Error code 1

Stop.
make: stopped in /pkg_comp/obj/pkgsrc/graphics/cpia2view/4x/cpia2_driver-1.0
*** Error code 1

Stop.

        ps: if you notice a similarity between this PR and pkg/42698
        that's not surprising, this is mostly cut/paste from that one.

>Fix:
        Extract the file appended as graphics/cpia2view/patches/patch-ag,
        then rebuild the distinfo file.  After that graphics/cpia2view
        at least compiles curressfully (etc. - see 42698)

        Note that this is the exact same patch file (except for being
        called patch-ag instead of patch-af) as appears in PR pkg/42698

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       patches/patch-ag
#
echo x - patches/patch-ag
sed 's/^X//' >patches/patch-ag << 'END-of-patches/patch-ag'
X$NetBSD$
X
X--- jpeg_decode.c.WAS  2004-01-13 16:40:32.000000000 +0000
X+++ jpeg_decode.c      2010-01-29 09:53:54.000000000 +0000
X@@ -6,6 +6,8 @@
X #include <stdlib.h>
X #include <setjmp.h>
X 
X+#define       jpeg_mem_src    my_jpeg_mem_src         /* hide from jpeglib.h 
*/
X+
X extern int errnum;
X 
X typedef struct {
END-of-patches/patch-ag
exit