PATCH: misc. fixes for Gtk-0.5120

["James E Jurach Jr." <muaddib arrakis erf net>]

Ken,

Great work!  Aside from misbehaving X window closes, and core dump or two,
I'm really impressed at the enclosed samples.  :)

I had a few problems building Gtk-0.5120 that were mostly related to the
version of perl that comes with RedHat-5.2.  Though this problem is
addressed in the maintenance versions of 5.004_0x (and caused by a decision
made for 5.005_0x during 5.004_5x ;-), it is probably important that you
include these fixes to satisfy the least common denominator of RedHat
users.

The files changed are:

tools/gendefs.pl -- added cpp conditionals for PL_xv_undef and PL_na
Gtk/MiscTypes.c -- now includes GtkDefs.h for the above problem
Gtk/ppport.h  -- no longer redefines dPTR
Gtk/samples/simple7.pl -- changed "Gtk::Gnome" --> "Gnome"

BTW, is this source tree (or will it be) represented in the Gnome CVS tree?

james

here's the patch:

diff -urbBN Gtk-0.5120.orig/Gtk/MiscTypes.c Gtk-0.5120/Gtk/MiscTypes.c
--- Gtk-0.5120.orig/Gtk/MiscTypes.c	Mon Mar  8 12:37:02 1999
+++ Gtk-0.5120/Gtk/MiscTypes.c	Mon Mar 15 03:23:52 1999
@@ -13,6 +13,8 @@
 
 #include "Derived.h"
 
+#include "GtkDefs.h"
+
 void CroakOpts(char * name, char * value, struct opts * o)
 {
 	SV * result = sv_newmortal();
diff -urbBN Gtk-0.5120.orig/Gtk/ppport.h Gtk-0.5120/Gtk/ppport.h
--- Gtk-0.5120.orig/Gtk/ppport.h	Mon Mar  8 12:36:17 1999
+++ Gtk-0.5120/Gtk/ppport.h	Mon Mar 15 03:21:27 1999
@@ -171,12 +171,14 @@
 /* Replace: 0 */
 #endif
 
-#if (PERL_PATCHLEVEL < 5)
+#ifndef dTHR
+# if (PERL_PATCHLEVEL < 5)
 #  ifdef WIN32
 #	define dTHR extern int Perl___notused
 #  else
 #	define dTHR extern int errno
 #  endif
+# endif
 #endif
 
 #ifndef boolSV
Binary files Gtk-0.5120.orig/Gtk/samples/core and Gtk-0.5120/Gtk/samples/core differ
diff -urbBN Gtk-0.5120.orig/Gtk/samples/simple7.pl Gtk-0.5120/Gtk/samples/simple7.pl
--- Gtk-0.5120.orig/Gtk/samples/simple7.pl	Wed Dec 30 15:12:38 1998
+++ Gtk-0.5120/Gtk/samples/simple7.pl	Mon Mar 15 03:30:58 1999
@@ -1,17 +1,17 @@
 
-use Gtk::Gnome;
+use Gnome;
 
-init Gtk::Gnome "App_id";
+init Gnome "App_id";
 
 #TITLE: Simple #7
 #REQUIRES: Gtk Gnome
 
-$app = new Gtk::Gnome::App "appname", "title";
+$app = new Gnome::App "appname", "title";
 
 $button = new Gtk::Button "button";
 
 $button->signal_connect (clicked => sub {
-	my($w) = new Gtk::Gnome::MessageBox "message", "messagebox_type", "button1", "button2";
+	my($w) = new Gnome::MessageBox "message", "messagebox_type", "button1", "button2";
 	$w->signal_connect(clicked => sub {
 		print "Button $_[1] clicked\n";
 	});
@@ -27,13 +27,13 @@
 $vbox->pack_start($button, 1, 1, 1);
 
 eval {
-	$calc = new Gtk::Gnome::Calculator;
+	$calc = new Gnome::Calculator;
 	show $calc;
 	$vbox->pack_start($calc, 1, 1, 1);
 };
 
 eval {
-	$date = new Gtk::Gnome::DateEdit time(), 1, 0;
+	$date = new Gnome::DateEdit time(), 1, 0;
 	show $date;
 	$vbox->pack_start($date, 1, 1, 1);
 };
diff -urbBN Gtk-0.5120.orig/tools/gendefs.pl Gtk-0.5120/tools/gendefs.pl
--- Gtk-0.5120.orig/tools/gendefs.pl	Tue Mar  9 12:46:14 1999
+++ Gtk-0.5120/tools/gendefs.pl	Mon Mar 15 03:20:03 1999
@@ -630,6 +630,14 @@
 }
 print "*/\n";
 
+print "#ifndef PL_sv_undef\n";
+print "#define PL_sv_undef xv_undef\n";
+print "#endif\n\n";
+
+print "#ifndef PL_na\n";
+print "#define PL_na na\n";
+print "#endif\n\n";
+
 print "#endif /*_${FilePrefix}_Defs_h_*/\n";
 
 open(OUT,">build/$opt{FilePrefix}Types.pm") or die "Unable to write to build/$opt{FilePrefix}Types.pm: $!";