From 11726e7712591188145d7a6cfdb9294d7ab5fba8 Mon Sep 17 00:00:00 2001
From: Camm Maguire <camm@debian.org>
Date: Mon, 11 Mar 2024 08:56:32 -0400
Subject: [PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

gcl (2.6.14-6) unstable; urgency=medium

  * Version_2_6_15pre5

Gbp-Pq: Name Version_2_6_15pre5
---
 git.tag       |  2 +-
 o/character.d |  1 -
 o/makefile    |  2 +-
 o/package.d   | 12 ++++++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/git.tag b/git.tag
index 1bc64dcf..25cd3908 100644
--- a/git.tag
+++ b/git.tag
@@ -1 +1 @@
-"Version_2_6_15pre4"
+"Version_2_6_15pre5"
diff --git a/o/character.d b/o/character.d
index 27156d40..c9825e9f 100755
--- a/o/character.d
+++ b/o/character.d
@@ -503,7 +503,6 @@ gcl_init_character()
 
 	for (i = 0;  i < CHCODELIM;  i++) {
 	  object x=(object)(character_table+i);
-	  x->fw=0;
 	  set_type_of(x,t_character);
 	  /* character_table[i].ch.t = (short)t_character; */
 	  character_table[i].ch.ch_code = i;
diff --git a/o/makefile b/o/makefile
index db1e2923..22ec15fa 100644
--- a/o/makefile
+++ b/o/makefile
@@ -78,7 +78,7 @@ new_init.c: ${INI_FILES}
 	echo 'void NewInit(void){' >> $@
 	cat ${INI_FILES} >> $@
 	echo '}' >> $@
-	! cat $@ | awk -F, '/DEFUN/ {print $2}' | grep -v object || (rm $@ && false)
+	! cat $@ | awk -F, '/DEFUN/ {print $$1,$$2}' | grep -v object || (rm $@ && false)
 
 ifneq ($(NIFLAGS),)
 new_init.o: new_init.c $(DECL)
diff --git a/o/package.d b/o/package.d
index 0b5bbc97..b5be99b8 100755
--- a/o/package.d
+++ b/o/package.d
@@ -392,8 +392,8 @@ object x;
   return(h);
 }}
 
-DEFUN_NEW("PACK-HASH",fixnum,fSpack_hash,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
-  RETURN1(pack_hash(x));
+DEFUN_NEW("PACK-HASH",object,fSpack_hash,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
+  RETURN1((object)(fixnum)pack_hash(x));
 }
 
 DEFUN_NEW("SET-SYMBOL-HPACK",object,fSset_symbol_hpack,SI,2,2,NONE,OO,OO,OO,OO,(object p,object s),"") {
@@ -407,9 +407,9 @@ DEFUN_NEW("SET-SYMBOL-HPACK",object,fSset_symbol_hpack,SI,2,2,NONE,OO,OO,OO,OO,(
 /*   RETURN1(x->p.p_internal[i]); */
 /* } */
 
-DEFUN_NEW("PACKAGE-INTERNAL_SIZE",fixnum,fSpackage_internal_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
+DEFUN_NEW("PACKAGE-INTERNAL_SIZE",object,fSpackage_internal_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
   check_type_package(&x);
-  RETURN1(x->p.p_internal_size);
+  RETURN1((object)(fixnum)x->p.p_internal_size);
 }
 
 /* DEFUN_NEW("PACKAGE-EXTERNAL",object,fSpackage_external,SI,2,2,NONE,OO,IO,OO,OO,(object x,fixnum i),"") { */
@@ -417,9 +417,9 @@ DEFUN_NEW("PACKAGE-INTERNAL_SIZE",fixnum,fSpackage_internal_size,SI,1,1,NONE,IO,
 /*   RETURN1(x->p.p_external[i]); */
 /* } */
 
-DEFUN_NEW("PACKAGE-EXTERNAL_SIZE",fixnum,fSpackage_external_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
+DEFUN_NEW("PACKAGE-EXTERNAL_SIZE",object,fSpackage_external_size,SI,1,1,NONE,IO,OO,OO,OO,(object x),"") {
   check_type_package(&x);
-  RETURN1(x->p.p_external_size);
+  RETURN1((object)(fixnum)x->p.p_external_size);
 }
 
 /*
-- 
2.30.2