cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.6.8.

Browse Source 
Add upstream patch to fix a issue where abiword wouldn't detect older ms
word mail merge fields. [1]

Requested by:	Michael Camden <camden DOT michael AT gmail DOT com> [1]
Obtained from:	Abiword SVN [1]
This commit is contained in:
Koop Mast 2009-03-26 13:34:58 +00:00
parent 3820b6c2eb
commit 2be601c47e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=231061
13 changed files with 114 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/abiword-docs/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= abiword-docs
PORTVERSION= 2.6.3
PORTREVISION= 1
PORTVERSION= 2.6.8
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@ -19,8 +18,6 @@ COMMENT= AbiWord help files
BUILD_DEPENDS= abiword:${PORTSDIR}/editors/abiword
RUN_DEPENDS= abiword:${PORTSDIR}/editors/abiword
BROKEN= segfaults during build
GNU_CONFIGURE= yes
USE_GMAKE= yes
# Don't give X warnings if DISPLAY is set

6
editors/abiword-docs/distinfo
View File

@ -1,3 +1,3 @@
MD5 (AbiWord/abiword-docs-2.6.3.tar.gz) = 400702fa12e07e39c7a6153c942511ee
SHA256 (AbiWord/abiword-docs-2.6.3.tar.gz) = fb6e29a4400d35ce1935f5bd1cca289a1d3e1c5264305fa648abd5f463c09057
SIZE (AbiWord/abiword-docs-2.6.3.tar.gz) = 1420546
MD5 (AbiWord/abiword-docs-2.6.8.tar.gz) = 5698c79cfa179f4b15c82a699d11a309
SHA256 (AbiWord/abiword-docs-2.6.8.tar.gz) = 44c58521d00a142bc79d9b6e19fccc753a89c2ce4806bae883977b734ce1edc8
SIZE (AbiWord/abiword-docs-2.6.8.tar.gz) = 1440398

7
editors/abiword-extras/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= abiword-extras
PORTVERSION= 2.6.3
PORTREVISION= 1
PORTVERSION= 2.6.8
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@ -21,8 +20,4 @@ RUN_DEPENDS= abiword:${PORTSDIR}/editors/abiword
GNU_CONFIGURE= yes
post-install:
##### Makes abiword CRASH
@${RM} -f ${PREFIX}/share/abiword-2.6/templates/Fax-Coversheet.awt
.include <bsd.port.mk>

6
editors/abiword-extras/distinfo
View File

@ -1,3 +1,3 @@
MD5 (AbiWord/abiword-extras-2.6.3.tar.gz) = 4985165b8e166b35d9f9a2ca3090e928
SHA256 (AbiWord/abiword-extras-2.6.3.tar.gz) = cf2d91b9d0c246ff59b2727eafa8a13193fb7806630ec800a6d03c89a327234e
SIZE (AbiWord/abiword-extras-2.6.3.tar.gz) = 2070443
MD5 (AbiWord/abiword-extras-2.6.8.tar.gz) = e3cfff6ad4cda3e4200a75fd2665857a
SHA256 (AbiWord/abiword-extras-2.6.8.tar.gz) = 1a93cc7b4e8e6ca5f05e27a209bc3612e5a3ea3a250726a34f472b7913e31511
SIZE (AbiWord/abiword-extras-2.6.8.tar.gz) = 2072668

1
editors/abiword-extras/pkg-plist
View File

@ -33,6 +33,7 @@ share/abiword-2.6/templates/A4.awt
share/abiword-2.6/templates/Business-Letter.awt
share/abiword-2.6/templates/Business-Report.awt
share/abiword-2.6/templates/Employee-Directory.awt
share/abiword-2.6/templates/Fax-Coversheet.awt
share/abiword-2.6/templates/Friendly-Letter.awt
share/abiword-2.6/templates/Memo.awt
share/abiword-2.6/templates/Press-Release.awt

3
editors/abiword-plugins/Makefile
View File

@ -7,8 +7,7 @@
#
PORTNAME= abiword-plugins
PORTVERSION= 2.6.3
PORTREVISION= 2
PORTVERSION= 2.6.8
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword

12
editors/abiword-plugins/distinfo
View File

@ -1,6 +1,6 @@
MD5 (AbiWord/abiword-plugins-2.6.3.tar.gz) = 92a2e98fb26595666cb68e9bb56babd0
SHA256 (AbiWord/abiword-plugins-2.6.3.tar.gz) = d3ddfd3dbd20ed9bb35dceb06a55ec13d66acb1c3fce28976a8d10929c39a194
SIZE (AbiWord/abiword-plugins-2.6.3.tar.gz) = 1736896
MD5 (AbiWord/abiword-2.6.3.tar.gz) = 40d9da8b04c70035b89f8ad7fcc4519d
SHA256 (AbiWord/abiword-2.6.3.tar.gz) = e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec
SIZE (AbiWord/abiword-2.6.3.tar.gz) = 9265456
MD5 (AbiWord/abiword-plugins-2.6.8.tar.gz) = 421c49723e209c971ddb0798c1b313a9
SHA256 (AbiWord/abiword-plugins-2.6.8.tar.gz) = 151517ae94e0f4c26370f31c903078bd0561b8088a63b532408ca128f0e65448
SIZE (AbiWord/abiword-plugins-2.6.8.tar.gz) = 1991215
MD5 (AbiWord/abiword-2.6.8.tar.gz) = fab04d8ef999c303f720197adf261310
SHA256 (AbiWord/abiword-2.6.8.tar.gz) = b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
SIZE (AbiWord/abiword-2.6.8.tar.gz) = 9516443

9
editors/abiword-plugins/pkg-plist
View File

@ -64,3 +64,12 @@
%%WORDPERFECT:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiWordPerfect.so
%%XSLFO:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiXSLFO.la
%%XSLFO:%%lib/abiword-%%ABIVERSION%%/plugins/libAbiXSLFO.so
%%LATEX:%%share/abiword-2.6/xsltml/README
%%LATEX:%%share/abiword-2.6/xsltml/cmarkup.xsl
%%LATEX:%%share/abiword-2.6/xsltml/entities.xsl
%%LATEX:%%share/abiword-2.6/xsltml/glayout.xsl
%%LATEX:%%share/abiword-2.6/xsltml/mmltex.xsl
%%LATEX:%%share/abiword-2.6/xsltml/scripts.xsl
%%LATEX:%%share/abiword-2.6/xsltml/tables.xsl
%%LATEX:%%share/abiword-2.6/xsltml/tokens.xsl
%%LATEX:%%@dirrm share/abiword-%%ABIVERSION%%/xsltml

5
editors/abiword/Makefile
View File

@ -7,8 +7,7 @@
#
PORTNAME= abiword
PORTVERSION= 2.6.3
PORTREVISION= 2
PORTVERSION= 2.6.8
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
@ -79,7 +78,7 @@ pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "AbiWord2 has the following tunable option(s):"
@${ECHO_MSG} " WITH_DEBUG=yes Enable debug."
@${ECHO_MSG} " WITH_GUCHARMAP=yes Enable use of Gucharmap as the symbol insertion tool (default: auto)"
# @${ECHO_MSG} " WITH_GUCHARMAP=yes Enable use of Gucharmap as the symbol insertion tool (default: auto)"
@${ECHO_MSG} " WITHOUT_GTKSPELL=yes Don't use Enchant, but still enable spellchecking and install the dictionary."
@${ECHO_MSG} ""

6
editors/abiword/distinfo
View File

@ -1,3 +1,3 @@
MD5 (AbiWord/abiword-2.6.3.tar.gz) = 40d9da8b04c70035b89f8ad7fcc4519d
SHA256 (AbiWord/abiword-2.6.3.tar.gz) = e5ffecc423e2a9214cb4abd9dbd086552a0d45387b7bc2072738f5e2a8dd90ec
SIZE (AbiWord/abiword-2.6.3.tar.gz) = 9265456
MD5 (AbiWord/abiword-2.6.8.tar.gz) = fab04d8ef999c303f720197adf261310
SHA256 (AbiWord/abiword-2.6.8.tar.gz) = b6656a0da13d94b334f02637c89d8fe13aa54752040ad1b8f14f668d8cb96e93
SIZE (AbiWord/abiword-2.6.8.tar.gz) = 9516443

12
editors/abiword/files/patch-src_af_xap_unix_xap_UnixTableWidget.cpp
View File

@ -1,13 +1,13 @@
--- abiword/trunk/src/af/xap/unix/xap_UnixTableWidget.cpp 2007/03/04 23:35:03 20016
+++ src/af/xap/unix/xap_UnixTableWidget.cpp 2007/09/21 04:03:45 21991
@@ -123,7 +123,9 @@
--- src/af/xap/unix/xap_UnixTableWidget.cpp.orig 2008-08-13 00:22:24.000000000 +0200
+++ src/af/xap/unix/xap_UnixTableWidget.cpp 2009-03-10 19:42:33.000000000 +0100
@@ -123,7 +123,9 @@ abi_table_resize(AbiTable* table)
g_return_if_fail(table);
if (table->selected_rows == 0 && table->selected_cols == 0)
- text = g_strdup_printf(table->szCancel);
- text = g_strdup(table->szCancel);
+ // RIVERA changed as suggested by uwog (OSX X11 was crashing)
+ //text = g_strdup_printf(table->szCancel);
+ text = (table->szCancel ? g_strdup_printf(table->szCancel) : NULL);
+ //text = g_strdup(table->szCancel);
+ text = (table->szCancel ? g_strdup(table->szCancel) : NULL);
else
{
UT_UTF8String prText = "%d x %d ";

78
editors/abiword/files/patch-src_wp_xp_ie-imp-MsWord-97.cpp Normal file
View File

@ -0,0 +1,78 @@
--- src/wp/impexp/xp/ie_imp_MsWord_97.cpp.orig 2008-04-18 23:12:21.000000000 +0200
+++ src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2009-03-25 10:50:53.000000000 +0100
@@ -354,6 +354,7 @@ typedef enum {
F_TOC_FROM_RANGE,
F_DATEINAME,
F_SPEICHERDAT,
+ F_MERGEFIELD,
F_OTHER
} Doc_Field_t;
@@ -399,7 +400,7 @@ static Doc_Field_Mapping_t s_Tokens[] =
{"NUMCHARS", F_NUMCHARS},
{"NUMPAGES", F_NUMPAGES},
{"NUMWORDS", F_NUMWORDS},
-
+ {"MERGEFIELD", F_MERGEFIELD},
// these below aren't handled by AbiWord, but they're known about
{"HYPERLINK", F_HYPERLINK},
{"PAGEREF", F_PAGEREF},
@@ -3336,7 +3337,7 @@ int IE_Imp_MsWord_97::_beginChar (wvPars
// inserting a symbol char ...
iFontType = ps->fonts.ffn[achp->ftcSym].chs;
}
- else if(ps->fonts.ffn)
+ else if(ps->fonts.ffn && (achp->ftcAscii < ps->fonts.nostrings))
{
iFontType = ps->fonts.ffn[achp->ftcAscii].chs;
}
@@ -3637,6 +3638,49 @@ bool IE_Imp_MsWord_97::_handleFieldEnd (
tokenIndex = s_mapNameToField (token);
switch (tokenIndex)
{
+ case F_MERGEFIELD:
+ {
+ const gchar* atts[5];
+ atts[0] = "type";
+ atts[1] = "mail_merge";
+ atts[2] = "param";
+ atts[3] = 0;
+ atts[4] = 0;
+
+ token = strtok (NULL, "\"\" ");
+
+ UT_return_val_if_fail(f->argument[f->fieldI - 1] == 0x15, false);
+
+ f->argument[f->fieldI - 1] = 0;
+ UT_UCS2Char * a = f->argument;
+
+ UT_UTF8String param;
+
+ if(*a == 0x14)
+ {
+ a++;
+ }
+
+ while(*a)
+ {
+ if (!((171 == *a) || (187 == *a))) {
+ // @argument looks like <<FieldName>>.
+ // strip off the '<<' (171) and '>>' (187)
+ param.appendUCS2(a, 1);
+ }
+
+ a++;
+ }
+
+ atts[3] = param.utf8_str();
+
+ if (!_appendObject (PTO_Field, static_cast<const gchar**>(&atts[0])))
+ {
+ UT_DEBUGMSG(("Dom: couldn't append field (type = '%s')\n", atts[1]));
+ }
+ }
+ break;
+
case F_HYPERLINK:
{
token = strtok (NULL, "\"\" ");

2
editors/abiword/pkg-plist
View File

@ -39,7 +39,6 @@ share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_WindowMore.glade
share/abiword-%%ABIVERSION%%/glade/xap_UnixDlg_Zoom.glade
share/abiword-%%ABIVERSION%%/readme.abw
share/abiword-%%ABIVERSION%%/readme.txt
share/abiword-%%ABIVERSION%%/scripts/abw2html.pl
share/abiword-%%ABIVERSION%%/strings/am-ET.strings
share/abiword-%%ABIVERSION%%/strings/ar.strings
share/abiword-%%ABIVERSION%%/strings/ast-ES.strings
@ -248,7 +247,6 @@ share/pixmaps/abiword_48.png
@dirrmtry share/applications
@dirrm share/abiword-%%ABIVERSION%%/templates
@dirrm share/abiword-%%ABIVERSION%%/strings
@dirrm share/abiword-%%ABIVERSION%%/scripts
@dirrm share/abiword-%%ABIVERSION%%/glade
@dirrm share/abiword-%%ABIVERSION%%
@exec /bin/mkdir -p %D/lib/abiword-%%ABIVERSION%%/plugins