Fix several 64 bit issues to get this going on alpha and hopefully

amd64 and sparc64.  Patches provided by Olaf Seibert in PR pkg/26055.

6 files changed, 193 insertions, 1 deletions

diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 11c5938f51c..3212ab9ecdf 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.26 2004/03/31 04:59:18 xtraeme Exp $
+$NetBSD: distinfo,v 1.27 2004/06/27 20:06:24 dmcmahill Exp $
 
 SHA1 (abiword-2.0.5.tar.bz2) = 27a8c51b2060cbc8eeeef03b96ec4ee105ccb172
 Size (abiword-2.0.5.tar.bz2) = 21955989 bytes
 SHA1 (patch-aa) = 730e205f54516535394659c74e052bbe706e1bc2
 SHA1 (patch-ab) = 27c48de3374288c7f6d6749ff18ebeedf91cb3ab
+SHA1 (patch-ac) = c490908a2b6b60a728bfacd43865641ae6960f58
+SHA1 (patch-ad) = 349fdd5fcab9361cf956b8496f22098e1c96128d
+SHA1 (patch-ae) = c19688feedb2e411978e8289a57371fa7075918f
+SHA1 (patch-af) = b764eff8b107cb79b655d5bea7b408598e0935b6
+SHA1 (patch-ag) = 7836f5518120bd534fee29c88887da062e7a0425
diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac
new file mode 100644
index 00000000000..0f883a1bf5f
--- /dev/null
+++ b/editors/abiword/patches/patch-ac
@@ -0,0 +1,38 @@
+$NetBSD: patch-ac,v 1.11 2004/06/27 20:06:24 dmcmahill Exp $
+
+--- src/af/xap/xp/xap_Draw_Symbol.cpp.orig	Wed May  7 17:40:40 2003
++++ src/af/xap/xp/xap_Draw_Symbol.cpp
+@@ -153,7 +153,7 @@ void XAP_Draw_Symbol::draw(void)
+ 	
+ 	for (i = 0; i < m_vCharSet.size(); i += 2)
+ 	{
+-		UT_UCSChar base = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]));
++		UT_UCSChar base = static_cast<UT_UCSChar>((UT_uint32)(m_vCharSet[i]));
+ 		size_t nb_chars = reinterpret_cast<size_t>(m_vCharSet[i + 1]);
+ 
+ 		for (UT_UCSChar j = base; j < base + nb_chars; ++j)
+@@ -194,11 +194,11 @@ UT_UCSChar XAP_Draw_Symbol::calcSymbolFr
+ 	UT_DEBUGMSG(("calcSymbolFromCoords(x = [%u], y = [%u]) =", ix, iy));
+ 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
+ 	{
+-		count += reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
++		count += (UT_uint32)(m_vCharSet[i + 1]);
+ 		if (count > index)
+ 		{
+ 			UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]))));
+-			return static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]));
++			return static_cast<UT_UCSChar>((UT_uint32)(m_vCharSet[i]) + index - count + (UT_uint32)(m_vCharSet[i + 1]));
+ 		}
+ 	}
+ 
+@@ -227,8 +227,8 @@ void XAP_Draw_Symbol::calculatePosition(
+ 
+ 	for (size_t i = 0; i < m_vCharSet.size(); i += 2)
+ 	{
+-		UT_uint32 base = reinterpret_cast<UT_uint32>(m_vCharSet[i]);
+-		UT_uint32 size = reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]);
++		UT_uint32 base = (UT_uint32)(m_vCharSet[i]);
++		UT_uint32 size = (UT_uint32)(m_vCharSet[i + 1]);
+ 		
+ 		if (base + size > c)
+ 		{
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad
new file mode 100644
index 00000000000..64ffdcb85a1
--- /dev/null
+++ b/editors/abiword/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.11 2004/06/27 20:06:24 dmcmahill Exp $
+
+--- src/af/xap/unix/xap_UnixFont.cpp.orig	Fri Aug 22 20:52:07 2003
++++ src/af/xap/unix/xap_UnixFont.cpp
+@@ -400,10 +400,10 @@ const encoding_pair *XAP_UnixFont::loadE
+ 	size_t idx = 0;
+ 	for (size_t i = 0; i < coverage.size(); i += 2)
+ 	  {
+-		  UT_UCSChar c1 = static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i]));
++		  UT_UCSChar c1 = static_cast<UT_UCSChar>((UT_uint32)(coverage[i]));
+ 		  UT_UCSChar c2 =
+ 			  static_cast<UT_UCSChar>(static_cast<UT_uint32>(c1)) +
+-			  static_cast<UT_UCSChar>(reinterpret_cast<UT_uint32>(coverage[i + 1]));
++			  static_cast<UT_UCSChar>((UT_uint32)(coverage[i + 1]));
+ 		  for (UT_UCSChar c = c1; c < c2; ++c)
+ 		    {
+ 			    FT_UInt glyph_idx = FT_Get_Char_Index(face, c);
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
new file mode 100644
index 00000000000..72a995f073b
--- /dev/null
+++ b/editors/abiword/patches/patch-ae
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.12 2004/06/27 20:06:24 dmcmahill Exp $
+
+--- src/wp/impexp/xp/ie_exp_HTML.cpp.orig	Mon Jan 12 08:31:23 2004
++++ src/wp/impexp/xp/ie_exp_HTML.cpp
+@@ -777,7 +777,7 @@ void s_HTML_Listener::tagClose (UT_uint3
+ 	void * vptr = 0;
+ 	m_tagStack.pop (&vptr);
+ 
+-	if (reinterpret_cast<UT_uint32>(vptr) == tagID) return;
++	if ((UT_uint32)(vptr) == tagID) return;
+ 
+ 	UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n"));
+ }
+@@ -821,7 +821,7 @@ void s_HTML_Listener::tagCloseBroken (co
+ UT_uint32 s_HTML_Listener::tagTop ()
+ {
+ 	void * vptr = 0;
+-	if (m_tagStack.viewTop (&vptr)) return reinterpret_cast<UT_uint32>(vptr);
++	if (m_tagStack.viewTop (&vptr)) return (UT_uint32)(vptr);
+ 	return 0;
+ }
+ 
+@@ -1899,7 +1899,7 @@ UT_uint16 s_HTML_Listener::listType ()
+ {
+ 	void * vptr = 0;
+ 	m_utsListType.viewTop (&vptr);
+-	return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
++	return static_cast<UT_uint16>((UT_uint32)(vptr));
+ }
+ 
+ void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName)
+@@ -1938,7 +1938,7 @@ void s_HTML_Listener::listPop ()
+ 
+ 	void * vptr = 0;
+ 	m_utsListType.pop (&vptr);
+-	UT_uint16 type = static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
++	UT_uint16 type = static_cast<UT_uint16>((UT_uint32)(vptr));
+ 
+ 	UT_uint32 tagID;
+ 
diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af
new file mode 100644
index 00000000000..f5af50c12d0
--- /dev/null
+++ b/editors/abiword/patches/patch-af
@@ -0,0 +1,61 @@
+$NetBSD: patch-af,v 1.8 2004/06/27 20:06:24 dmcmahill Exp $
+
+--- src/wp/impexp/xp/ie_imp_RTF.cpp.orig	Thu Mar  4 08:21:10 2004
++++ src/wp/impexp/xp/ie_imp_RTF.cpp
+@@ -1211,9 +1211,9 @@ RTFProps_ParaProps& RTFProps_ParaProps::
+ 		m_iOverrideLevel = other.m_iOverrideLevel;
+ 		if(m_tabTypes.getItemCount() > 0)
+ 		{
+-			UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0));
++			UT_uint32 dum = (UT_uint32)(m_tabTypes.getNthItem(0));
+ 			m_curTabType = static_cast<eTabType>(dum);
+-			dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0));
++			dum = (UT_uint32)(m_tabLeader.getNthItem(0));
+ 			m_curTabLeader = static_cast<eTabLeader>(dum);
+ 		}
+ 		else
+@@ -2458,7 +2458,7 @@ UT_uint32 IE_Imp_RTF::GetNthTableColour(
+ {
+ 	if (colNum < m_colourTable.getItemCount())
+ 	{
+-		return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum));
++		return (UT_uint32)(m_colourTable.getNthItem(colNum));
+ 	}
+ 	else
+ 	{
+@@ -2470,7 +2470,7 @@ UT_sint32 IE_Imp_RTF::GetNthTableBgColou
+ {
+ 	if (colNum < m_colourTable.getItemCount())
+ 	{
+-		return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum));
++		return (UT_sint32)(m_colourTable.getNthItem(colNum));
+ 	}
+ 	else
+ 	{
+@@ -6361,11 +6361,11 @@ bool IE_Imp_RTF::ApplyParagraphAttribute
+ 			if (i > 0)
+ 				propBuffer += ",";
+ 
+-			UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
++			UT_sint32 tabTwips = (UT_sint32)(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
+ 			double tabIn = tabTwips/(20.0*72.);
+-			UT_uint32 idum = reinterpret_cast<UT_uint32>(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
++			UT_uint32 idum = (UT_uint32)(m_currentRTFState.m_paraProps.m_tabTypes.getNthItem(i));
+ 			eTabType tabType = static_cast<eTabType>(idum);
+-			idum = reinterpret_cast<UT_uint32>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
++			idum = (UT_uint32)((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
+ 			eTabLeader tabLeader = static_cast<eTabLeader>(idum);
+ 			char  cType = ' ';
+ 			switch(tabType)
+@@ -9874,9 +9874,9 @@ bool IE_Imp_RTF::buildAllProps(char * pr
+ 		if (i > 0)
+ 			strcat(propBuffer, ",");
+ 
+-		UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i));
++		UT_sint32 tabTwips = (UT_sint32)(pParas->m_tabStops.getNthItem(i));
+ 		double tabIn = tabTwips/(20.0*72.);
+-		UT_uint32 idum = reinterpret_cast<UT_uint32>(pParas->m_tabTypes.getNthItem(i));
++		UT_uint32 idum = (UT_uint32)(pParas->m_tabTypes.getNthItem(i));
+ 		eTabType tabType = static_cast<eTabType>(idum);
+ 		idum = (UT_uint32) (pParas->m_tabLeader.getNthItem(i));
+ 		eTabLeader tabLeader = static_cast<eTabLeader>(idum);
diff --git a/editors/abiword/patches/patch-ag b/editors/abiword/patches/patch-ag
new file mode 100644
index 00000000000..0db9c8c4a34
--- /dev/null
+++ b/editors/abiword/patches/patch-ag
@@ -0,0 +1,31 @@
+$NetBSD: patch-ag,v 1.9 2004/06/27 20:06:24 dmcmahill Exp $
+
+--- src/wp/impexp/xp/ie_Table.cpp.orig	Mon Aug 25 01:45:11 2003
++++ src/wp/impexp/xp/ie_Table.cpp
+@@ -1028,7 +1028,7 @@ UT_sint32 ie_imp_table::NewRow(void)
+ 			UT_sint32 j = 0;
+ 			for(j=0; !bMatch && (j < static_cast<UT_sint32>(m_vecCellX.getItemCount())); j++)
+ 			{
+-				UT_sint32 prevX = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(j));
++				UT_sint32 prevX = (UT_sint32)(m_vecCellX.getNthItem(j));
+ 				UT_DEBUGMSG(("Prev cell %d cellx %d \n",j,prevX));
+ 				bool bLast = ((j-1) == szCurRow);
+ 				bMatch =  doCellXMatch(prevX,curX,bLast);
+@@ -1179,7 +1179,7 @@ void ie_imp_table::writeTablePropsInDoc(
+ 		sColWidth.clear();
+ 		for(i=0; i< static_cast<UT_sint32>(m_vecCellX.getItemCount()); i++)
+ 		{
+-			UT_sint32 iCellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
++			UT_sint32 iCellx = (UT_sint32)(m_vecCellX.getNthItem(i));
+ 			xxx_UT_DEBUGMSG(("final cellx import cellx %d iPrev %x \n",iCellx,iPrev));
+ 			UT_sint32 iDiffCellx = iCellx - iPrev;
+ 			double dCellx = static_cast<double>(iDiffCellx)/1440.0 -dColSpace;
+@@ -1377,7 +1377,7 @@ UT_sint32 ie_imp_table::getColNumber(ie_
+ 	UT_sint32 iSub = 0;
+ 	for(i=0; !bFound && (i< static_cast<UT_sint32>(m_vecCellX.getItemCount())); i++)
+ 	{
+-		UT_sint32 icellx = reinterpret_cast<UT_sint32>(m_vecCellX.getNthItem(i));
++		UT_sint32 icellx = (UT_sint32)(m_vecCellX.getNthItem(i));
+ 		if(icellx == -1)
+ 		{
+ 			iSub++;