Several diffs for GNOME CVS packages for Solaris 2.5.1

["Brandon S. Allbery" <allbery ece cmu edu>]

This includes the gnome-libs/zvt patch I posted earlier and the ORBit/popt
patch that nobody seems to care about :-( (I submitted it to ewt@redhat.com
and got no response, as well as filing a GNOME bug report that has been
ignored).

Note that after these patches, gmedia and gdm2 still don't build (the latter, 
I guess, is expected).

Also, they're not autoconf'ed; the patches for audiofile.h and gmedia-cdrom.c 
should be treated as guides.  Also, the audiofile.h patch is wrong --- it
only works because we have a <sys/bitypes.h> header from BIND 8 installed.
(Haven't we been through that one before, resulting in an audiofile.h that
declared the appropriate types if they didn't exist?  Why was it reverted?)

ORBit/popt:  fix the compiler name check

Index: ORBit/popt/configure.in
===================================================================
RCS file: /cvs/gnome/popt/configure.in,v
retrieving revision 1.19
diff -u -r1.19 configure.in
--- ORBit/popt/configure.in	1999/04/07 18:57:26	1.19
+++ ORBit/popt/configure.in	1999/05/23 15:49:14
@@ -9,7 +9,7 @@
 AM_PROG_LIBTOOL
 AC_PROG_INSTALL
 
-if test $CC = gcc; then
+if test "x$GCC" = xyes; then
     CFLAGS="-Wall $CFLAGS"
 fi
 addlib() {

gnome-games/aisleriot:  scm_random() already exists in current(?) Guile

Index: gnome-games/aisleriot/cscmi.c
===================================================================
RCS file: /cvs/gnome/gnome-games/aisleriot/cscmi.c,v
retrieving revision 1.11
diff -u -r1.11 cscmi.c
--- gnome-games/aisleriot/cscmi.c	1999/02/21 01:51:56	1.11
+++ gnome-games/aisleriot/cscmi.c	1999/05/23 15:50:49
@@ -214,7 +214,7 @@
   return SCM_EOL;
 }
 
-SCM scm_random(SCM range) 
+SCM scm_myrandom(SCM range) 
 {
   return gh_long2scm(random()%SCM_INUM(range));
 }
@@ -269,7 +269,7 @@
   gh_new_procedure1_0("get-slot", scm_get_slot);  
   gh_new_procedure2_0("set-cards-c!", scm_set_cards);
   gh_new_procedure("set-lambda", scm_set_lambda, 8, 0, 1);
-  gh_new_procedure1_0("random", scm_random);
+  gh_new_procedure1_0("random", scm_myrandom);
   gh_new_procedure0_0("get-score", scm_get_score);  
   gh_new_procedure1_0("set-score!", scm_set_score);
   gh_new_procedure0_0("get-timeout", scm_get_timeout);  

gnome-libs/zvt:  fix Solaris pty bug

Index: gnome-libs/zvt/gnome-login-support.c
===================================================================
RCS file: /cvs/gnome/gnome-libs/zvt/gnome-login-support.c,v
retrieving revision 1.12
diff -u -r1.12 gnome-login-support.c
--- gnome-libs/zvt/gnome-login-support.c	1999/04/02 23:52:47	1.12
+++ gnome-libs/zvt/gnome-login-support.c	1999/05/23 15:51:20
@@ -136,7 +136,7 @@
 /* SystemVish pty opening */
 #if defined (HAVE_GRANTPT)
 
-#ifdef (HAVE_STROPTS_H)
+#ifdef HAVE_STROPTS_H
 #    include <stropts.h>
 #endif
 
@@ -148,7 +148,7 @@
 	if (pty_slave == -1)
 		return -1;
 
-#ifdef (HAVE_STROPTS_H)
+#ifdef HAVE_STROPTS_H
 #if !defined(__osf__)
 	if (!ioctl (pty_slave, I_FIND, "ptem"))
 		if (ioctl (pty_slave, I_PUSH, "ptem") == -1){
@@ -202,6 +202,7 @@
 		close (pty_master);
 		return -1;
 	}
+
 	if ((slave_name = ptsname (pty_master)) == NULL){
 		close (pty_master);
 		return -1;

gdm2:  bash/ksh-only file test in script run by /bin/sh
       include <sys/sockio.h> on Solaris for SIOCGIFCONF et alia

Index: gdm2/configure.in
===================================================================
RCS file: /cvs/gnome/gdm2/configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.in
--- gdm2/configure.in	1999/04/18 22:08:08	1.1.1.1
+++ gdm2/configure.in	1999/05/23 15:52:04
@@ -39,7 +39,7 @@
 # Check for shadow passwords (hack)
   AC_MSG_CHECKING("for /etc/shadow")
 
-  if test -e /etc/shadow; then
+  if test -f /etc/shadow; then
 	AC_MSG_RESULT(yes)
 	AC_DEFINE(HAVE_SHADOW)
   else	

Index: gdm2/gui/gdmchooser.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmchooser.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 gdmchooser.c
--- gdm2/gui/gdmchooser.c	1999/04/18 22:08:08	1.1.1.1
+++ gdm2/gui/gdmchooser.c	1999/05/23 15:52:04
@@ -42,6 +42,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#if defined(sun) && defined(__svr4__)
+#include <sys/sockio.h>
+#endif
 
 #include "gdmchooser.h"
 

audiofile:  need bit types on Solaris <= 2.5.1

Index: audiofile/libaudiofile/audiofile.h
===================================================================
RCS file: /cvs/gnome/audiofile/libaudiofile/audiofile.h,v
retrieving revision 1.8
diff -u -r1.8 audiofile.h
--- audiofile/libaudiofile/audiofile.h	1999/05/10 03:40:19	1.8
+++ audiofile/libaudiofile/audiofile.h	1999/05/23 15:52:11
@@ -28,6 +28,7 @@
 #define AUDIOFILE_H
 
 #include <sys/types.h>
+#include <sys/bitypes.h>
 #include "aupvlist.h"
 
 #ifdef __cplusplus

gmedia/backends/cdrom:  CDROM defines are in <sys/cdio.h>

Index: gmedia/backends/cdrom/gmedia-cdrom.c
===================================================================
RCS file: /cvs/gnome/gmedia/backends/cdrom/gmedia-cdrom.c,v
retrieving revision 1.2
diff -u -r1.2 gmedia-cdrom.c
--- gmedia/backends/cdrom/gmedia-cdrom.c	1998/09/03 07:12:53	1.2
+++ gmedia/backends/cdrom/gmedia-cdrom.c	1999/05/23 15:52:26
@@ -6,7 +6,12 @@
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
+#ifdef linux
 #include <linux/cdrom.h>
+#endif
+#if defined(sun) && defined(__svr4__)
+#include <sys/cdio.h>
+#endif
 
 #include "libgmedia/gmedia.h"
 

mc/gnome:  undefined MAX() on Solaris (<= 2.5.1?)
	   typo in non-glibc2.1 STREAMS pty handling

Index: mc/gnome/gscreen.c
===================================================================
RCS file: /cvs/gnome/mc/gnome/gscreen.c,v
retrieving revision 1.215
diff -u -r1.215 gscreen.c
--- mc/gnome/gscreen.c	1999/04/18 06:57:37	1.215
+++ mc/gnome/gscreen.c	1999/05/23 16:09:13
@@ -39,6 +39,9 @@
 #include <gdk/gdkprivate.h>
 #include <glib.h>
 
+#ifndef MAX
+#define MAX(a,b) ((a)>(b)?(a):(b))
+#endif
 /* Whether to display the tree view on the left */
 int tree_panel_visible = -1;
 
Index: mc/src/subshell.c
===================================================================
RCS file: /cvs/gnome/mc/src/subshell.c,v
retrieving revision 1.16
diff -u -r1.16 subshell.c
--- mc/src/subshell.c	1999/05/17 05:51:50	1.16
+++ mc/src/subshell.c	1999/05/23 16:09:14
@@ -1100,7 +1100,7 @@
     pty_master = getpt ();
 #else
     strcpy (pty_name, "/dev/ptmx");
-    pty_master = open (pty_name, O_RDWR)
+    pty_master = open (pty_name, O_RDWR);
 #endif 
     if (pty_master == -1
 	|| grantpt (pty_master) == -1		  /* Grant access to slave */

-- 
brandon s. allbery	[os/2][linux][solaris][japh]	 allbery@kf8nh.apk.net
system administrator	     [WAY too many hats]	   allbery@ece.cmu.edu
electrical and computer engineering					 KF8NH
carnegie mellon university	      ["God, root, what is difference?" -Pitr]