Added support for amd64 via a small patch which fixes pointer to 32-bit data type conversion. Marked ~amd64 for now.

1 files changed, 183 insertions, 0 deletions

diff --git a/app-office/abiword/files/abiword-2.0.3-amd64.patch b/app-office/abiword/files/abiword-2.0.3-amd64.patch
new file mode 100644
index 000000000000..a977b7013256
--- /dev/null
+++ b/app-office/abiword/files/abiword-2.0.3-amd64.patch
@@ -0,0 +1,183 @@
+diff -ur abiword-2.0.3/abi/src/af/xap/unix/xap_UnixFont.cpp abiword-2.0.3-amd64/abi/src/af/xap/unix/xap_UnixFont.cpp
+--- abiword-2.0.3/abi/src/af/xap/unix/xap_UnixFont.cpp	2003-08-22 16:52:07.000000000 -0400
++++ abiword-2.0.3-amd64/abi/src/af/xap/unix/xap_UnixFont.cpp	2004-03-02 11:15:19.138416528 -0500
+@@ -400,10 +400,10 @@
+ 	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>(reinterpret_cast<unsigned long>(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>(reinterpret_cast<unsigned long>(coverage[i + 1]));
+ 		  for (UT_UCSChar c = c1; c < c2; ++c)
+ 		    {
+ 			    FT_UInt glyph_idx = FT_Get_Char_Index(face, c);
+diff -ur abiword-2.0.3/abi/src/af/xap/xp/xap_Draw_Symbol.cpp abiword-2.0.3-amd64/abi/src/af/xap/xp/xap_Draw_Symbol.cpp
+--- abiword-2.0.3/abi/src/af/xap/xp/xap_Draw_Symbol.cpp	2003-05-07 13:40:40.000000000 -0400
++++ abiword-2.0.3-amd64/abi/src/af/xap/xp/xap_Draw_Symbol.cpp	2004-03-02 11:15:15.767928920 -0500
+@@ -153,7 +153,7 @@
+ 	
+ 	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>(reinterpret_cast<unsigned long>(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_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 += reinterpret_cast<unsigned long>(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]));
++			UT_DEBUGMSG((" %u\n", static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i]) + index - count + reinterpret_cast<UT_uint32>(m_vCharSet[i + 1]))));
++			return static_cast<UT_UCSChar>(reinterpret_cast<unsigned long>(m_vCharSet[i]) + index - count + reinterpret_cast<unsigned long>(m_vCharSet[i + 1]));
+ 		}
+ 	}
+ 
+@@ -227,8 +227,8 @@
+ 
+ 	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 = reinterpret_cast<unsigned long>(m_vCharSet[i]);
++		UT_uint32 size = reinterpret_cast<unsigned long>(m_vCharSet[i + 1]);
+ 		
+ 		if (base + size > c)
+ 		{
+diff -ur abiword-2.0.3/abi/src/wp/impexp/xp/ie_Table.cpp abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_Table.cpp
+--- abiword-2.0.3/abi/src/wp/impexp/xp/ie_Table.cpp	2003-08-24 21:45:11.000000000 -0400
++++ abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_Table.cpp	2004-03-02 11:15:25.290481272 -0500
+@@ -1028,7 +1028,7 @@
+ 			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 = reinterpret_cast<signed long>(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 @@
+ 		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 = reinterpret_cast<signed long>(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 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 = reinterpret_cast<signed long>(m_vecCellX.getNthItem(i));
+ 		if(icellx == -1)
+ 		{
+ 			iSub++;
+diff -ur abiword-2.0.3/abi/src/wp/impexp/xp/ie_exp_HTML.cpp abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_exp_HTML.cpp
+--- abiword-2.0.3/abi/src/wp/impexp/xp/ie_exp_HTML.cpp	2004-01-12 03:31:23.000000000 -0500
++++ abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_exp_HTML.cpp	2004-03-02 11:15:21.021130312 -0500
+@@ -777,7 +777,7 @@
+ 	void * vptr = 0;
+ 	m_tagStack.pop (&vptr);
+ 
+-	if (reinterpret_cast<UT_uint32>(vptr) == tagID) return;
++	if (reinterpret_cast<unsigned long>(vptr) == tagID) return;
+ 
+ 	UT_DEBUGMSG(("WARNING: possible tag mis-match in XHTML output!\n"));
+ }
+@@ -821,7 +821,7 @@
+ 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 reinterpret_cast<unsigned long>(vptr);
+ 	return 0;
+ }
+ 
+@@ -1899,7 +1899,7 @@
+ {
+ 	void * vptr = 0;
+ 	m_utsListType.viewTop (&vptr);
+-	return static_cast<UT_uint16>(reinterpret_cast<UT_uint32>(vptr));
++	return static_cast<UT_uint16>(reinterpret_cast<unsigned long>(vptr));
+ }
+ 
+ void s_HTML_Listener::listPush (UT_uint16 type, const char * ClassName)
+@@ -1938,7 +1938,7 @@
+ 
+ 	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>(reinterpret_cast<unsigned long>(vptr));
+ 
+ 	UT_uint32 tagID;
+ 
+diff -ur abiword-2.0.3/abi/src/wp/impexp/xp/ie_imp_RTF.cpp abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_imp_RTF.cpp
+--- abiword-2.0.3/abi/src/wp/impexp/xp/ie_imp_RTF.cpp	2003-12-26 20:05:47.000000000 -0500
++++ abiword-2.0.3-amd64/abi/src/wp/impexp/xp/ie_imp_RTF.cpp	2004-03-02 11:15:22.517902768 -0500
+@@ -1211,9 +1211,9 @@
+ 		m_iOverrideLevel = other.m_iOverrideLevel;
+ 		if(m_tabTypes.getItemCount() > 0)
+ 		{
+-			UT_uint32 dum = reinterpret_cast<UT_uint32>(m_tabTypes.getNthItem(0));
++			UT_uint32 dum = reinterpret_cast<unsigned long>(m_tabTypes.getNthItem(0));
+ 			m_curTabType = static_cast<eTabType>(dum);
+-			dum = reinterpret_cast<UT_uint32>(m_tabLeader.getNthItem(0));
++			dum = reinterpret_cast<unsigned long>(m_tabLeader.getNthItem(0));
+ 			m_curTabLeader = static_cast<eTabLeader>(dum);
+ 		}
+ 		else
+@@ -2458,7 +2458,7 @@
+ {
+ 	if (colNum < m_colourTable.getItemCount())
+ 	{
+-		return reinterpret_cast<UT_uint32>(m_colourTable.getNthItem(colNum));
++		return reinterpret_cast<unsigned long>(m_colourTable.getNthItem(colNum));
+ 	}
+ 	else
+ 	{
+@@ -2470,7 +2470,7 @@
+ {
+ 	if (colNum < m_colourTable.getItemCount())
+ 	{
+-		return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum));
++		return reinterpret_cast<signed long>(m_colourTable.getNthItem(colNum));
+ 	}
+ 	else
+ 	{
+@@ -6327,11 +6327,11 @@
+ 			if (i > 0)
+ 				propBuffer += ",";
+ 
+-			UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(m_currentRTFState.m_paraProps.m_tabStops.getNthItem(i));
++			UT_sint32 tabTwips = reinterpret_cast<signed long>(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 = reinterpret_cast<unsigned long>(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 = reinterpret_cast<unsigned long>((m_currentRTFState.m_paraProps.m_tabLeader.getNthItem(i)));
+ 			eTabLeader tabLeader = static_cast<eTabLeader>(idum);
+ 			char  cType = ' ';
+ 			switch(tabType)
+@@ -9808,9 +9808,9 @@
+ 		if (i > 0)
+ 			strcat(propBuffer, ",");
+ 
+-		UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i));
++		UT_sint32 tabTwips = reinterpret_cast<signed long>(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 = reinterpret_cast<unsigned long>(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);