Update to 2.0.2, and fix the problem where the Symbol Insert dialog would

hang.

9 files changed, 14 insertions, 179 deletions

diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 6a383be..39a36c4f 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AbiWord2
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/
diff --git a/editors/abiword-devel/distinfo b/editors/abiword-devel/distinfo
index 1d53878..889a4e2 100644
--- a/editors/abiword-devel/distinfo
+++ b/editors/abiword-devel/distinfo
@@ -1 +1 @@
-MD5 (AbiWord/abiword-2.0.1.tar.bz2) = 4b927771a4e91db5de9cfe811aa7545f
+MD5 (AbiWord/abiword-2.0.2.tar.bz2) = bcb7b45b04e285d5a8b82fb13ebaa170
diff --git a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.h b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.h
new file mode 100644
index 0000000..55a8f0c
--- /dev/null
+++ b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.h
@@ -0,0 +1,11 @@
+--- src/af/xap/unix/xap_UnixDlg_Insert_Symbol.h.orig	Mon Dec 15 01:39:26 2003
++++ src/af/xap/unix/xap_UnixDlg_Insert_Symbol.h	Mon Dec 15 01:39:41 2003
+@@ -24,7 +24,7 @@
+ #include "xap_UnixFontManager.h"
+ #include <gdk/gdkkeysyms.h>
+ 
+-#define DEFAULT_UNIX_SYMBOL_FONT "Symbol"
++#define DEFAULT_UNIX_SYMBOL_FONT ""
+ 
+ class XAP_Frame;
+ 
diff --git a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFont.cpp b/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFont.cpp
deleted file mode 100644
index 29b7576..0000000
--- a/editors/abiword-devel/files/patch-src_af_xap_unix_xap_UnixFont.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/af/xap/unix/xap_UnixFont.cpp.orig	Mon Aug  4 20:24:53 2003
-+++ src/af/xap/unix/xap_UnixFont.cpp	Mon Aug  4 20:25:50 2003
-@@ -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 --git a/editors/abiword-devel/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp b/editors/abiword-devel/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp
deleted file mode 100644
index baf6ff9..0000000
--- a/editors/abiword-devel/files/patch-src_af_xap_xp_xap_Draw_Symbol.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/af/xap/xp/xap_Draw_Symbol.cpp.orig	Wed Jul 30 01:04:34 2003
-+++ src/af/xap/xp/xap_Draw_Symbol.cpp	Wed Jul 30 01:07:18 2003
-@@ -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 += static_cast<UT_uint32>(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]));
-+			return static_cast<UT_UCSChar>(static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i])) + index - count + static_cast<UT_uint32>(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 = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i]));
-+		UT_uint32 size = static_cast<UT_uint32>(reinterpret_cast<unsigned long>(m_vCharSet[i + 1]));
- 		
- 		if (base + size > c)
- 		{
diff --git a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_Table.cpp b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_Table.cpp
deleted file mode 100644
index a3f8a7e..0000000
--- a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_Table.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/wp/impexp/xp/ie_Table.cpp.orig	Tue Sep 23 21:23:58 2003
-+++ src/wp/impexp/xp/ie_Table.cpp	Tue Sep 23 21:31:58 2003
-@@ -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<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<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<long>(m_vecCellX.getNthItem(i));
- 		if(icellx == -1)
- 		{
- 			iSub++;
diff --git a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp
deleted file mode 100644
index 00232c3..0000000
--- a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_exp_HTML.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/wp/impexp/xp/ie_exp_HTML.cpp.orig	Mon Sep 22 14:46:23 2003
-+++ src/wp/impexp/xp/ie_exp_HTML.cpp	Mon Sep 22 14:47:36 2003
-@@ -776,7 +776,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"));
- }
-@@ -820,7 +820,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;
- }
- 
-@@ -1890,7 +1890,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)
-@@ -1929,7 +1929,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 --git a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp b/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp
deleted file mode 100644
index 90ad29c..0000000
--- a/editors/abiword-devel/files/patch-src_wp_impexp_xp_ie_imp_RTF.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/wp/impexp/xp/ie_imp_RTF.cpp.orig	Tue Sep 23 21:19:45 2003
-+++ src/wp/impexp/xp/ie_imp_RTF.cpp	Tue Sep 23 21:22:22 2003
-@@ -1208,9 +1208,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
-@@ -2442,7 +2442,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
- 	{
-@@ -2454,7 +2454,7 @@
- {
- 	if (colNum < m_colourTable.getItemCount())
- 	{
--		return reinterpret_cast<UT_sint32>(m_colourTable.getNthItem(colNum));
-+		return reinterpret_cast<long>(m_colourTable.getNthItem(colNum));
- 	}
- 	else
- 	{
-@@ -6185,11 +6185,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<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)
-@@ -9654,9 +9654,9 @@
- 		if (i > 0)
- 			strcat(propBuffer, ",");
- 
--		UT_sint32 tabTwips = reinterpret_cast<UT_sint32>(pParas->m_tabStops.getNthItem(i));
-+		UT_sint32 tabTwips = reinterpret_cast<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);
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 49e3849..5ab0a94 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -12,6 +12,7 @@ share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_HdrFtr.glade
 share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_InsertTable.glade
 share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade
 share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_MailMerge.glade
+share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_MetaData.glade
 share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_New.glade
 share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_PageNumbers.glade
 share/AbiSuite-2.0/AbiWord/glade/ap_UnixDialog_Replace.glade