pkg/28130: x11/vte fails to build on Solaris

[james%hicag.org@localhost]

>Number:         28130
>Category:       pkg
>Synopsis:       x11/vte fails to build on Solaris
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Nov 09 04:45:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     James Kelly
>Release:        Solaris 9
>Organization:
>Environment:
SunOS etain 5.9 Generic_117171-09 sun4u sparc SUNW,Ultra-60
>Description:
x11/vte fails to build on Solaris.  It fails for me as follows:

 gcc -DHAVE_CONFIG_H -I. -I.. -I/usr/pkgsrc/x11/vte/work/.buildlink/include 
-I/usr/pkgsrc/x11/vte/work/.buildlink/include/freetype2 -DXTHREADS 
-I/usr/pkgsrc/x11/vte/work/.x11-buildlink/include 
-I/usr/pkgsrc/x11/vte/work/.buildlink/include/glib/glib-2.0 
-I/usr/pkgsrc/x11/vte/work/.buildlink/lib/glib-2.0/include 
-I/usr/pkgsrc/x11/vte/work/.buildlink/include/gtk-2.0 
-I/usr/pkgsrc/x11/vte/work/.buildlink/lib/gtk-2.0/include 
-I/usr/pkgsrc/x11/vte/work/.buildlink/include/atk-1.0 
-I/usr/pkgsrc/x11/vte/work/.buildlink/include/pango-1.0 -O2 -pipe -mcpu=v9 -O2 
-pipe -mcpu=v9 -MT pty.lo -MD -MP -MF .deps/pty.Tpo -c pty.c  -fPIC -DPIC -o 
.libs/pty.o
pty.c: In function `_vte_pty_read_ptypair':
pty.c:841: error: structure has no member named `msg_control'
pty.c:842: error: structure has no member named `msg_controllen'
pty.c:847: warning: assignment makes pointer from integer without a cast
pty.c:849: warning: assignment makes pointer from integer without a cast
pty.c:851: warning: passing arg 2 of `memcpy' makes pointer from integer 
without a cast
gmake[2]: *** [pty.lo] Error 1
gmake[2]: Leaving directory `/usr/pkgsrc/x11/vte/work/vte-0.11.11/src'
gmake[1]: *** [all-recursive] Error 1
gmake[1]: Leaving directory `/usr/pkgsrc/x11/vte/work/vte-0.11.11'
gmake: *** [all] Error 2
*** Error code 2

Stop.
bmake: stopped in /usr/pkgsrc/x11/vte
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/x11/vte

Robert Lillack has the same problem on Solaris 8 as explained on his
web site:
<http://personal-homepages.mis.mpg.de/lillack/public/pkgsrc/#x11vte>

>How-To-Repeat:
Build x11/vte on Solaris.
>Fix:
This works for me.  One thing that I'm uncertain about is src/pty.c.
A pkgsrc patch brings sys/types.h a the top of src/pty.c.  I'm
guessing that's something specific for NetBSD.  On Solaris it'll
redefine a few things and cause trouble.

diff -ruN vte.orig/distinfo vte/distinfo
--- vte.orig/distinfo   2004-05-07 06:13:16.000000000 -0500
+++ vte/distinfo        2004-10-23 21:15:52.062862000 -0500
@@ -2,10 +2,10 @@
 
 SHA1 (vte-0.11.11.tar.bz2) = 655a7e2a4310a13caf3853dc51f07ee3b8fe3622
 Size (vte-0.11.11.tar.bz2) = 888405 bytes
-SHA1 (patch-aa) = 9b4961c056c3bf46332490fc7f30ff3540f2dbd3
+SHA1 (patch-aa) = 845d7b1dff03795db82a4f2587278ef6fc469f1e
 SHA1 (patch-ab) = 8c9c3189b53a87aa198fcb8b11f43a9aa5255eaf
 SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
 SHA1 (patch-ad) = 6afc6ed139346d5e7effeb07c0f3e84c3e772d77
-SHA1 (patch-ae) = 7bc19459ab99bc71f0bc0e9fa36bcde49a512395
+SHA1 (patch-ae) = ffa6b2b906f9f2def7a97f0fa264c76653e554f7
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
-SHA1 (patch-ag) = a87e379e0ddc728bcd2db41856d669644be43bdc
+SHA1 (patch-ag) = a1da684ef44cfac12558e477f1708dbda5814959
diff -ruN vte.orig/patches/patch-aa vte/patches/patch-aa
--- vte.orig/patches/patch-aa   2003-12-13 11:54:15.000000000 -0600
+++ vte/patches/patch-aa        2004-10-23 21:15:17.407191000 -0500
@@ -1,9 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/12/13 17:54:15 xtraeme Exp $
+$NetBSD$
 
---- src/pty.c.orig     2003-06-03 12:54:15.000000000 -0700
-+++ src/pty.c  2003-11-29 01:07:59.000000000 -0800
-@@ -1,3 +1,4 @@
+--- src/pty.c.orig     Sat May  1 02:12:51 2004
++++ src/pty.c  Sat Oct 23 20:54:49 2004
+@@ -1,3 +1,7 @@
++/* I think only NetBSD needs this here */
++#if defined(__NetBSD__)
 +#include <sys/types.h>
++#endif
  /*
   * Copyright (C) 2001,2002 Red Hat, Inc.
   *
diff -ruN vte.orig/patches/patch-ae vte/patches/patch-ae
--- vte.orig/patches/patch-ae   2004-05-07 06:13:16.000000000 -0500
+++ vte/patches/patch-ae        2004-10-23 21:15:27.946433000 -0500
@@ -1,20 +1,24 @@
-$NetBSD: patch-ae,v 1.2 2004/05/07 11:13:16 jmmv Exp $
+$NetBSD$
 
---- configure.orig     2004-05-02 08:44:03.000000000 +0200
-+++ configure
-@@ -25114,6 +25114,7 @@ fi
+--- configure.orig     2004-05-02 01:44:03.000000000 -0500
++++ configure  2004-10-23 21:12:48.388152000 -0500
+@@ -25114,16 +25114,19 @@
  rm -f conftest*
  
  
-+if false; then
++# Solaris needs this
  cat >>confdefs.h <<\_ACEOF
  #define _XOPEN_SOURCE_EXTENDED 1
  _ACEOF
-@@ -25127,6 +25128,7 @@ _ACEOF
+ 
+ 
++# ... and this
  cat >>confdefs.h <<\_ACEOF
- #define __EXTENSIONS__ 1
+ #define _XOPEN_SOURCE 1
  _ACEOF
-+fi
  
  
- # Check whether --enable-deprecation or --disable-deprecation was given.
++# ... and this too!
+ cat >>confdefs.h <<\_ACEOF
+ #define __EXTENSIONS__ 1
+ _ACEOF
diff -ruN vte.orig/patches/patch-ag vte/patches/patch-ag
--- vte.orig/patches/patch-ag   2004-05-07 06:13:16.000000000 -0500
+++ vte/patches/patch-ag        2004-10-23 21:15:34.446726000 -0500
@@ -1,20 +1,24 @@
-$NetBSD: patch-ag,v 1.1 2004/05/07 11:13:16 jmmv Exp $
+$NetBSD$
 
---- gnome-pty-helper/configure.orig    2004-05-02 08:44:08.000000000 +0200
-+++ gnome-pty-helper/configure
-@@ -6269,6 +6269,7 @@ fi
+--- gnome-pty-helper/configure.orig    2004-05-02 01:44:08.000000000 -0500
++++ gnome-pty-helper/configure 2004-10-23 21:13:32.697462000 -0500
+@@ -6269,16 +6269,19 @@
  rm -f conftest*
  
  
-+if false; then
++# Solaris needs this
  cat >>confdefs.h <<\_ACEOF
  #define _XOPEN_SOURCE_EXTENDED 1
  _ACEOF
-@@ -6282,6 +6283,7 @@ _ACEOF
+ 
+ 
++# ... and this
  cat >>confdefs.h <<\_ACEOF
- #define __EXTENSIONS__ 1
+ #define _XOPEN_SOURCE 1
  _ACEOF
-+fi
  
  
-           ac_config_headers="$ac_config_headers config.h"
++# ... and this too!
+ cat >>confdefs.h <<\_ACEOF
+ #define __EXTENSIONS__ 1
+ _ACEOF

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