From 134d82ce4461bcef47f1391e5928b4f0432d8270 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 25 Apr 2004 18:26:53 +0000 Subject: Update to 2.1.2. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2283 df743ca5-7f9a-e211-a948-0013205c9059 --- editors/AbiWord2/Makefile | 2 +- editors/AbiWord2/distinfo | 4 +-- ...h-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp | 20 ------------- ...atch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp | 34 ---------------------- editors/AbiWord2/pkg-plist | 3 ++ 5 files changed, 6 insertions(+), 57 deletions(-) delete mode 100644 editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp delete mode 100644 editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp (limited to 'editors') diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 0ae0619b3..c7644a67f 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= AbiWord2 -PORTVERSION= 2.1.1 +PORTVERSION= 2.1.2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.abisource.com/downloads/Version-${PORTVERSION}/lf/ diff --git a/editors/AbiWord2/distinfo b/editors/AbiWord2/distinfo index 903032b2c..abacbd806 100644 --- a/editors/AbiWord2/distinfo +++ b/editors/AbiWord2/distinfo @@ -1,2 +1,2 @@ -MD5 (AbiWord/abiword-2.1.1.tar.bz2) = b2ec4704a915b8463cd6a48083ad6f14 -SIZE (AbiWord/abiword-2.1.1.tar.bz2) = 21722060 +MD5 (AbiWord/abiword-2.1.2.tar.bz2) = 523376956f3a5bec845c047e1989fc6e +SIZE (AbiWord/abiword-2.1.2.tar.bz2) = 21819052 diff --git a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp b/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp deleted file mode 100644 index 43e2d9ad1..000000000 --- a/editors/AbiWord2/files/patch-src_af_xap_unix_xap_UnixDlg_Insert_Symbol.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp.orig Wed Feb 11 13:49:15 2004 -+++ src/af/xap/unix/xap_UnixDlg_Insert_Symbol.cpp Wed Feb 11 13:50:09 2004 -@@ -487,6 +487,7 @@ - GtkWidget * XAP_UnixDialog_Insert_Symbol::_constructWindow(void) - { - GtkWidget * vboxInsertS; -+ GtkWidget * chapters; - - ConstructWindowName(); - -@@ -517,7 +518,8 @@ - m_areaCurrentSym, TRUE, FALSE, 0); - #else - -- m_SymbolMap = gucharmap_charmap_new (); -+ chapters = gucharmap_block_chapters_new (); -+ m_SymbolMap = gucharmap_charmap_new (GUCHARMAP_CHAPTERS (chapters)); - gtk_widget_show (m_SymbolMap); - gtk_box_pack_start(GTK_BOX(vboxInsertS), m_SymbolMap, TRUE, TRUE, 0); - diff --git a/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp b/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp deleted file mode 100644 index 66ffce5c5..000000000 --- a/editors/AbiWord2/files/patch-src_wp_ap_unix_ap_UnixDialog_FormatTOC.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- src/wp/ap/unix/ap_UnixDialog_FormatTOC.cpp.orig Sun Mar 28 15:54:04 2004 -+++ src/wp/ap/unix/ap_UnixDialog_FormatTOC.cpp Sun Mar 28 15:55:46 2004 -@@ -532,11 +532,11 @@ - { - sVal = new UT_String(static_cast(vecTypeList->getNthItem(j))); - m_vecAllPropVals.addItem(static_cast(sVal)); -- const gchar * szLab = static_cast(vecTypeList->getNthItem(j)); -+ const gchar * szLab = (const gchar *)(vecTypeList->getNthItem(j)); - UT_DEBUGMSG(("Got label %s for item %d \n",szLab,j)); - GtkWidget * pW = gtk_menu_item_new_with_label(szLab); - g_object_set_data(G_OBJECT(pW),"toc-prop",(gpointer)(sProp->c_str())); -- const gchar * szVal = static_cast(vecPropList->getNthItem(j)); -+ const gchar * szVal = (const gchar *)(vecPropList->getNthItem(j)); - g_object_set_data(G_OBJECT(pW),"toc-val",(gpointer)(szVal)); - g_signal_connect(G_OBJECT(pW), - "activate", -@@ -558,7 +558,7 @@ - m_vecAllPropVals.addItem(static_cast(sVal)); - GtkWidget * pW = gtk_menu_item_new_with_label(static_cast(vecTypeList->getNthItem(j))); - g_object_set_data(G_OBJECT(pW),"toc-prop",(gpointer)sProp->c_str()); -- const gchar * szVal = static_cast(vecPropList->getNthItem(j)); -+ const gchar * szVal = (const gchar *)(vecPropList->getNthItem(j)); - g_object_set_data(G_OBJECT(pW),"toc-val",(gpointer)(szVal)); - g_signal_connect(G_OBJECT(pW), - "activate", -@@ -586,7 +586,7 @@ - m_vecAllPropVals.addItem(static_cast(sProp)); - sVal = new UT_String(static_cast(vecProps->getNthItem(j))); - m_vecAllPropVals.addItem(static_cast(sVal)); -- const gchar * szLab = static_cast(vecLabels->getNthItem(j)); -+ const gchar * szLab = (const gchar *)(vecLabels->getNthItem(j)); - UT_DEBUGMSG(("Got label %s for item %d \n",szLab,j)); - GtkWidget * pW = gtk_menu_item_new_with_label(szLab); - g_object_set_data(G_OBJECT(pW),"toc-prop",(gpointer)(sProp->c_str())); diff --git a/editors/AbiWord2/pkg-plist b/editors/AbiWord2/pkg-plist index c4070c152..631a687f4 100644 --- a/editors/AbiWord2/pkg-plist +++ b/editors/AbiWord2/pkg-plist @@ -17,6 +17,8 @@ share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Insert_DateTime.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_MailMerge.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_MetaData.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_New.glade +share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options.glade +share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Options_ColorSel.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_PageNumbers.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Replace.glade share/AbiSuite-%%ABIVERSION%%/AbiWord/glade/ap_UnixDialog_Stylist_modal.glade @@ -197,6 +199,7 @@ share/AbiSuite-%%ABIVERSION%%/templates/Business-Report.awt share/AbiSuite-%%ABIVERSION%%/templates/Employee-Directory.awt share/AbiSuite-%%ABIVERSION%%/templates/Fax-Coversheet.awt share/AbiSuite-%%ABIVERSION%%/templates/Memo.awt +share/AbiSuite-%%ABIVERSION%%/templates/Press-Release.awt share/AbiSuite-%%ABIVERSION%%/templates/Resume.awt share/AbiSuite-%%ABIVERSION%%/templates/Two-Columns.awt share/AbiSuite-%%ABIVERSION%%/templates/US-Letter.awt -- cgit v1.2.3