From 366a9959b1a800d5314f0a9ce8247ad75a3325f7 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 26 Nov 2010 14:49:49 +0000 Subject: Changes 2.8.6: * Preserve character properties when typing. This fixes a bad regression that was introduced in 2.8.5. Changes 2.8.5: * Fix paste of rich text from HTML and ODT, where previously some formatting properties were not closed properly. * Add a number of robustness fixes to the layout engine. * Fix a table selection bug. --- editors/abiword/Makefile | 33 +-- editors/abiword/Makefile.common | 33 ++- editors/abiword/PLIST | 532 +++++++++++++++++++++------------------ editors/abiword/distinfo | 19 +- editors/abiword/patches/patch-aa | 288 ++++++++++++++++++++- editors/abiword/patches/patch-ab | 6 +- editors/abiword/patches/patch-ac | 17 +- editors/abiword/patches/patch-ad | 6 +- editors/abiword/patches/patch-ah | 18 -- editors/abiword/patches/patch-sa | 8 +- 10 files changed, 615 insertions(+), 345 deletions(-) delete mode 100644 editors/abiword/patches/patch-ah (limited to 'editors/abiword') diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 128e2b004e1..94ed98fb996 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,46 +1,21 @@ -# $NetBSD: Makefile,v 1.125 2010/11/15 22:56:48 abs Exp $ +# $NetBSD: Makefile,v 1.126 2010/11/26 14:49:49 adam Exp $ PKG_DESTDIR_SUPPORT= user-destdir .include "Makefile.common" -PKGREVISION= 8 - COMMENT= Open Source cross-platform word processor # GTK1 version and previous name of the GTK2 version CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* -USE_TOOLS+= perl +USE_TOOLS+= perl +CONFIGURE_ARGS+= --disable-builtin-plugins +CONFIGURE_ARGS+= --enable-plugins="" REPLACE_SH+= ${WRKDIR}/${DISTNAME}/abiword-docs/make-html.sh REPLACE_PERL+= user/wp/scripts/abw2html.pl -PKG_OPTIONS_VAR= PKG_OPTIONS.abiword -PKG_SUPPORTED_OPTIONS= gucharmap - -.include "../../mk/bsd.options.mk" -.include "../../mk/bsd.prefs.mk" - -.if empty(PKG_OPTIONS:Mgucharmap) -CONFIGURE_ARGS+= --disable-gucharmap -.endif -CONFIGURE_ARGS+= --with-sys-wv -.if ${OPSYS} == "Darwin" -# hardcode relative install path in libwv (MacOS X only) -CONFIGURE_ARGS+= --without-epath -# Use X11 instead of Cocoa API -CONFIGURE_ARGS+= --disable-Cocoa -.endif -CONFIGURE_ARGS+= --enable-threads -CONFIGURE_ARGS+= --with-libjpeg-prefix=${BUILDLINK_PREFIX.jpeg} -CONFIGURE_ARGS+= --with-libxml2 -CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} - -.if !empty(PKG_OPTIONS:Mgucharmap) -.include "../../fonts/gucharmap/buildlink3.mk" -.endif - .include "../../textproc/enchant/buildlink3.mk" .include "../../databases/shared-mime-info/mimedb.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 69751dddad7..7102bb133c8 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,28 +1,41 @@ -# $NetBSD: Makefile.common,v 1.39 2009/07/22 09:01:24 wiz Exp $ +# $NetBSD: Makefile.common,v 1.40 2010/11/26 14:49:49 adam Exp $ +# +# used by editors/abiword-plugins/Makefile -# Be sure to update PLIST and distinfo for editors/abiword-plugins when updating -ABIWORD_VERSION= 2.6.8 -DISTNAME?= abiword-${ABIWORD_VERSION} +# Be sure to update PLIST for editors/abiword-plugins when updating +ABIVERSION= 2.8.6 +DISTNAME= abiword-${ABIVERSION} CATEGORIES= editors -MASTER_SITES= http://www.abisource.com/downloads/abiword/${ABIWORD_VERSION}/source/ +MASTER_SITES= http://www.abisource.com/downloads/abiword/${ABIVERSION}/source/ -MAINTAINER= adam@NetBSD.org +MAINTAINER?= adam@NetBSD.org HOMEPAGE= http://www.abisource.com/ +LICENSE= gnu-gpl-v2 -MAKE_FILE= GNUmakefile +USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= gmake msgfmt pkg-config -USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png} +CONFIGURE_ARGS+= --enable-clipart +CONFIGURE_ARGS+= --enable-templates +CONFIGURE_ARGS+= --with-gnomevfs +PKGCONFIG_OVERRIDE+= libabiword.pc.in + +DISTINFO_FILE= ${.CURDIR}/../../editors/abiword/distinfo +PATCHDIR= ${.CURDIR}/../../editors/abiword/patches .include "../../converters/fribidi/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../converters/wv/buildlink3.mk" +.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/libgsf-gnome/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/librsvg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" +.include "../../sysutils/gnome-vfs/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST index ed596b793d1..6ca010c5add 100644 --- a/editors/abiword/PLIST +++ b/editors/abiword/PLIST @@ -1,247 +1,291 @@ -@comment $NetBSD: PLIST,v 1.25 2009/06/14 17:50:20 joerg Exp $ +@comment $NetBSD: PLIST,v 1.26 2010/11/26 14:49:49 adam Exp $ bin/abiword -include/abiword-2.6/abiwidget.h -include/abiword-2.6/xap_UnixTableWidget.h -lib/pkgconfig/abiword-2.6.pc -share/abiword-2.6/glade/ap_UnixDialog_Break.glade -share/abiword-2.6/glade/ap_UnixDialog_Field.glade -share/abiword-2.6/glade/ap_UnixDialog_FormatFootnotes.glade -share/abiword-2.6/glade/ap_UnixDialog_FormatFrame.glade -share/abiword-2.6/glade/ap_UnixDialog_FormatTOC.glade -share/abiword-2.6/glade/ap_UnixDialog_FormatTable.glade -share/abiword-2.6/glade/ap_UnixDialog_Goto.glade -share/abiword-2.6/glade/ap_UnixDialog_HdrFtr.glade -share/abiword-2.6/glade/ap_UnixDialog_InsertTable.glade -share/abiword-2.6/glade/ap_UnixDialog_Insert_DateTime.glade -share/abiword-2.6/glade/ap_UnixDialog_Latex.glade -share/abiword-2.6/glade/ap_UnixDialog_MailMerge.glade -share/abiword-2.6/glade/ap_UnixDialog_MetaData.glade -share/abiword-2.6/glade/ap_UnixDialog_New.glade -share/abiword-2.6/glade/ap_UnixDialog_Options.glade -share/abiword-2.6/glade/ap_UnixDialog_Options_ColorSel.glade -share/abiword-2.6/glade/ap_UnixDialog_PageNumbers.glade -share/abiword-2.6/glade/ap_UnixDialog_PageSetup.glade -share/abiword-2.6/glade/ap_UnixDialog_Replace.glade -share/abiword-2.6/glade/ap_UnixDialog_Spell.glade -share/abiword-2.6/glade/ap_UnixDialog_Styles.glade -share/abiword-2.6/glade/ap_UnixDialog_Stylist.glade -share/abiword-2.6/glade/ap_UnixDialog_Stylist_modal.glade -share/abiword-2.6/glade/ap_UnixDialog_Tab.glade -share/abiword-2.6/glade/ap_UnixDialog_WordCount.glade -share/abiword-2.6/glade/xap_UnixDlg_DocComparison.glade -share/abiword-2.6/glade/xap_UnixDlg_Encoding.glade -share/abiword-2.6/glade/xap_UnixDlg_History.glade -share/abiword-2.6/glade/xap_UnixDlg_Image.glade -share/abiword-2.6/glade/xap_UnixDlg_Language.glade -share/abiword-2.6/glade/xap_UnixDlg_ListDocuments.glade -share/abiword-2.6/glade/xap_UnixDlg_Password.glade -share/abiword-2.6/glade/xap_UnixDlg_PluginManager.glade -share/abiword-2.6/glade/xap_UnixDlg_WindowMore.glade -share/abiword-2.6/glade/xap_UnixDlg_Zoom.glade -share/abiword-2.6/readme.abw -share/abiword-2.6/readme.txt -share/abiword-2.6/strings/am-ET.strings -share/abiword-2.6/strings/ar.strings -share/abiword-2.6/strings/ast-ES.strings -share/abiword-2.6/strings/ayc-BO.strings -share/abiword-2.6/strings/aym-BO.strings -share/abiword-2.6/strings/be-BY.strings -share/abiword-2.6/strings/be@latin.strings -share/abiword-2.6/strings/bg-BG.strings -share/abiword-2.6/strings/br-FR.strings -share/abiword-2.6/strings/ca-ES.strings -share/abiword-2.6/strings/cs-CZ.strings -share/abiword-2.6/strings/cy-GB.strings -share/abiword-2.6/strings/da-DK.strings -share/abiword-2.6/strings/de-CH.strings -share/abiword-2.6/strings/de-DE.strings -share/abiword-2.6/strings/el-GR.strings -share/abiword-2.6/strings/en-AU.strings -share/abiword-2.6/strings/en-CA.strings -share/abiword-2.6/strings/en-GB.strings -share/abiword-2.6/strings/en-IE.strings -share/abiword-2.6/strings/eo.strings -share/abiword-2.6/strings/es-ES.strings -share/abiword-2.6/strings/es-MX.strings -share/abiword-2.6/strings/et.strings -share/abiword-2.6/strings/eu-ES.strings -share/abiword-2.6/strings/fi-FI.strings -share/abiword-2.6/strings/fr-FR.strings -share/abiword-2.6/strings/ga-IE.strings -share/abiword-2.6/strings/gl.strings -share/abiword-2.6/strings/he-IL.strings -share/abiword-2.6/strings/hr-HR.strings -share/abiword-2.6/strings/hu-HU.strings -share/abiword-2.6/strings/id-ID.strings -share/abiword-2.6/strings/it-IT.strings -share/abiword-2.6/strings/ja-JP.strings -share/abiword-2.6/strings/jbo.strings -share/abiword-2.6/strings/ko.strings -share/abiword-2.6/strings/ku.strings -share/abiword-2.6/strings/lt-LT.strings -share/abiword-2.6/strings/lv-LV.strings -share/abiword-2.6/strings/mg-MG.strings -share/abiword-2.6/strings/mh-MH.strings -share/abiword-2.6/strings/mk-MK.strings -share/abiword-2.6/strings/ms-MY.strings -share/abiword-2.6/strings/nb-NO.strings -share/abiword-2.6/strings/ne-NP.strings -share/abiword-2.6/strings/nl-NL.strings -share/abiword-2.6/strings/nn-NO.strings -share/abiword-2.6/strings/pl-PL.strings -share/abiword-2.6/strings/ps.strings -share/abiword-2.6/strings/pt-BR.strings -share/abiword-2.6/strings/pt-PT.strings -share/abiword-2.6/strings/quh-BO.strings -share/abiword-2.6/strings/qul-BO.strings -share/abiword-2.6/strings/ro-RO.strings -share/abiword-2.6/strings/ru-RU.strings -share/abiword-2.6/strings/sc-IT.strings -share/abiword-2.6/strings/sk-SK.strings -share/abiword-2.6/strings/sl-SI.strings -share/abiword-2.6/strings/sq-AL.strings -share/abiword-2.6/strings/sr.strings -share/abiword-2.6/strings/sv-SE.strings -share/abiword-2.6/strings/ta-IN.strings -share/abiword-2.6/strings/tr-TR.strings -share/abiword-2.6/strings/uk-UA.strings -share/abiword-2.6/strings/ur.strings -share/abiword-2.6/strings/vi-VN.strings -share/abiword-2.6/strings/wo-SN.strings -share/abiword-2.6/strings/yi.strings -share/abiword-2.6/strings/zh-CN.strings -share/abiword-2.6/strings/zh-HK.strings -share/abiword-2.6/strings/zh-TW.strings -share/abiword-2.6/system.profile -share/abiword-2.6/system.profile-CP1254 -share/abiword-2.6/system.profile-KOI8-R -share/abiword-2.6/system.profile-KOI8-U -share/abiword-2.6/system.profile-KOI8-UB -share/abiword-2.6/system.profile-am-ET -share/abiword-2.6/system.profile-ar -share/abiword-2.6/system.profile-ar-EG -share/abiword-2.6/system.profile-ar-SA -share/abiword-2.6/system.profile-bg-BG -share/abiword-2.6/system.profile-ca-ES -share/abiword-2.6/system.profile-cs-CZ -share/abiword-2.6/system.profile-da-DK -share/abiword-2.6/system.profile-de -share/abiword-2.6/system.profile-de-AT -share/abiword-2.6/system.profile-de-CH -share/abiword-2.6/system.profile-de-DE -share/abiword-2.6/system.profile-div-MV -share/abiword-2.6/system.profile-el-GR -share/abiword-2.6/system.profile-en -share/abiword-2.6/system.profile-en-AU -share/abiword-2.6/system.profile-en-CA -share/abiword-2.6/system.profile-en-GB -share/abiword-2.6/system.profile-en-IE -share/abiword-2.6/system.profile-en-NZ -share/abiword-2.6/system.profile-en-US -share/abiword-2.6/system.profile-en-ZA -share/abiword-2.6/system.profile-es -share/abiword-2.6/system.profile-es-ES -share/abiword-2.6/system.profile-es-MX -share/abiword-2.6/system.profile-eu -share/abiword-2.6/system.profile-eu-ES -share/abiword-2.6/system.profile-fa-IR -share/abiword-2.6/system.profile-fi-FI -share/abiword-2.6/system.profile-fr -share/abiword-2.6/system.profile-fr-BE -share/abiword-2.6/system.profile-fr-CA -share/abiword-2.6/system.profile-fr-CH -share/abiword-2.6/system.profile-fr-FR -share/abiword-2.6/system.profile-gl-ES -share/abiword-2.6/system.profile-he -share/abiword-2.6/system.profile-he-IL -share/abiword-2.6/system.profile-hu-HU -share/abiword-2.6/system.profile-it-IT -share/abiword-2.6/system.profile-ja-JP -share/abiword-2.6/system.profile-lt-LT -share/abiword-2.6/system.profile-nb-NO -share/abiword-2.6/system.profile-nl-NL -share/abiword-2.6/system.profile-nn-NO -share/abiword-2.6/system.profile-pl-PL -share/abiword-2.6/system.profile-ps -share/abiword-2.6/system.profile-pt-BR -share/abiword-2.6/system.profile-pt-PT -share/abiword-2.6/system.profile-ru -share/abiword-2.6/system.profile-ru-RU -share/abiword-2.6/system.profile-sk-SK -share/abiword-2.6/system.profile-sk-SK.CP1250 -share/abiword-2.6/system.profile-sl -share/abiword-2.6/system.profile-sv -share/abiword-2.6/system.profile-sv-SE -share/abiword-2.6/system.profile-syr -share/abiword-2.6/system.profile-tr -share/abiword-2.6/system.profile-tr-TR -share/abiword-2.6/system.profile-tr-TR.CP1254 -share/abiword-2.6/system.profile-uk-UA -share/abiword-2.6/system.profile-ur-PK -share/abiword-2.6/system.profile-yi -share/abiword-2.6/system.profile-zh-CN -share/abiword-2.6/system.profile-zh-TW -share/abiword-2.6/templates/normal.awt -share/abiword-2.6/templates/normal.awt-am_ET -share/abiword-2.6/templates/normal.awt-ar -share/abiword-2.6/templates/normal.awt-ar_EG -share/abiword-2.6/templates/normal.awt-ar_SA -share/abiword-2.6/templates/normal.awt-bg_BG -share/abiword-2.6/templates/normal.awt-ca_ES -share/abiword-2.6/templates/normal.awt-cs_CZ -share/abiword-2.6/templates/normal.awt-da_DK -share/abiword-2.6/templates/normal.awt-de -share/abiword-2.6/templates/normal.awt-de_AT -share/abiword-2.6/templates/normal.awt-de_CH -share/abiword-2.6/templates/normal.awt-de_DE -share/abiword-2.6/templates/normal.awt-div_MV -share/abiword-2.6/templates/normal.awt-el_GR -share/abiword-2.6/templates/normal.awt-en_AU -share/abiword-2.6/templates/normal.awt-en_CA -share/abiword-2.6/templates/normal.awt-en_GB -share/abiword-2.6/templates/normal.awt-en_IE -share/abiword-2.6/templates/normal.awt-en_NZ -share/abiword-2.6/templates/normal.awt-en_ZA -share/abiword-2.6/templates/normal.awt-es -share/abiword-2.6/templates/normal.awt-es_AR -share/abiword-2.6/templates/normal.awt-es_ES -share/abiword-2.6/templates/normal.awt-es_IR -share/abiword-2.6/templates/normal.awt-es_MX -share/abiword-2.6/templates/normal.awt-fa_IR -share/abiword-2.6/templates/normal.awt-fi_FI -share/abiword-2.6/templates/normal.awt-fr -share/abiword-2.6/templates/normal.awt-fr_BE -share/abiword-2.6/templates/normal.awt-fr_CA -share/abiword-2.6/templates/normal.awt-fr_CH -share/abiword-2.6/templates/normal.awt-fr_FR -share/abiword-2.6/templates/normal.awt-gl_ES -share/abiword-2.6/templates/normal.awt-he -share/abiword-2.6/templates/normal.awt-he_IL -share/abiword-2.6/templates/normal.awt-hu_HU -share/abiword-2.6/templates/normal.awt-it_IT -share/abiword-2.6/templates/normal.awt-ja_JP -share/abiword-2.6/templates/normal.awt-lt_LT -share/abiword-2.6/templates/normal.awt-nb_NO -share/abiword-2.6/templates/normal.awt-nl_NL -share/abiword-2.6/templates/normal.awt-nn_NO -share/abiword-2.6/templates/normal.awt-pl_PL -share/abiword-2.6/templates/normal.awt-ps -share/abiword-2.6/templates/normal.awt-pt_BR -share/abiword-2.6/templates/normal.awt-pt_PT -share/abiword-2.6/templates/normal.awt-ru -share/abiword-2.6/templates/normal.awt-ru_RU -share/abiword-2.6/templates/normal.awt-sk_SK -share/abiword-2.6/templates/normal.awt-sl -share/abiword-2.6/templates/normal.awt-sv -share/abiword-2.6/templates/normal.awt-sv_SE -share/abiword-2.6/templates/normal.awt-syr -share/abiword-2.6/templates/normal.awt-tr -share/abiword-2.6/templates/normal.awt-tr_TR -share/abiword-2.6/templates/normal.awt-uk_UA -share/abiword-2.6/templates/normal.awt-ur_PK -share/abiword-2.6/templates/normal.awt-yi -share/abiword-2.6/templates/normal.awt-zh_CN -share/abiword-2.6/templates/normal.awt-zh_TW +include/abiword-2.8/abiwidget.h +include/abiword-2.8/libabiword.h +include/abiword-2.8/xap_UnixTableWidget.h +lib/libabiword-2.8.la +lib/pkgconfig/abiword-2.8.pc +man/man1/abiword.1 +share/abiword-2.8/clipart/book.png +share/abiword-2.8/clipart/chip.png +share/abiword-2.8/clipart/fun.png +share/abiword-2.8/clipart/gear.png +share/abiword-2.8/clipart/gnomea.png +share/abiword-2.8/clipart/gnomeb.png +share/abiword-2.8/clipart/gnomec.png +share/abiword-2.8/clipart/gnomecorner.png +share/abiword-2.8/clipart/gnomed.png +share/abiword-2.8/clipart/gnomedecor1.png +share/abiword-2.8/clipart/gnomedecor2.png +share/abiword-2.8/clipart/gnomee.png +share/abiword-2.8/clipart/gnomeflowers.png +share/abiword-2.8/clipart/gnomeline.png +share/abiword-2.8/clipart/idea.png +share/abiword-2.8/clipart/lamp.png +share/abiword-2.8/clipart/monitor.png +share/abiword-2.8/clipart/music1.png +share/abiword-2.8/clipart/pinceau.png +share/abiword-2.8/clipart/simca.png +share/abiword-2.8/clipart/surprise.png +share/abiword-2.8/clipart/together.png +share/abiword-2.8/clipart/toolbox.png +share/abiword-2.8/clipart/tree.png +share/abiword-2.8/clipart/tux_bordelais.png +share/abiword-2.8/clipart/weather.png +share/abiword-2.8/clipart/write.png +share/abiword-2.8/mime-info/abiword.keys +share/abiword-2.8/readme.abw +share/abiword-2.8/readme.txt +share/abiword-2.8/strings/am-ET.strings +share/abiword-2.8/strings/ar.strings +share/abiword-2.8/strings/ast-ES.strings +share/abiword-2.8/strings/ayc-BO.strings +share/abiword-2.8/strings/aym-BO.strings +share/abiword-2.8/strings/be-BY.strings +share/abiword-2.8/strings/bg-BG.strings +share/abiword-2.8/strings/br-FR.strings +share/abiword-2.8/strings/ca-ES.strings +share/abiword-2.8/strings/cs-CZ.strings +share/abiword-2.8/strings/cy-GB.strings +share/abiword-2.8/strings/da-DK.strings +share/abiword-2.8/strings/de-CH.strings +share/abiword-2.8/strings/de-DE.strings +share/abiword-2.8/strings/el-GR.strings +share/abiword-2.8/strings/en-AU.strings +share/abiword-2.8/strings/en-CA.strings +share/abiword-2.8/strings/en-GB.strings +share/abiword-2.8/strings/en-IE.strings +share/abiword-2.8/strings/eo.strings +share/abiword-2.8/strings/es-ES.strings +share/abiword-2.8/strings/es-MX.strings +share/abiword-2.8/strings/et.strings +share/abiword-2.8/strings/eu-ES.strings +share/abiword-2.8/strings/fi-FI.strings +share/abiword-2.8/strings/fr-FR.strings +share/abiword-2.8/strings/ga-IE.strings +share/abiword-2.8/strings/gl.strings +share/abiword-2.8/strings/he-IL.strings +share/abiword-2.8/strings/hr-HR.strings +share/abiword-2.8/strings/hu-HU.strings +share/abiword-2.8/strings/id-ID.strings +share/abiword-2.8/strings/it-IT.strings +share/abiword-2.8/strings/ja-JP.strings +share/abiword-2.8/strings/jbo.strings +share/abiword-2.8/strings/ko.strings +share/abiword-2.8/strings/ku.strings +share/abiword-2.8/strings/lt-LT.strings +share/abiword-2.8/strings/lv-LV.strings +share/abiword-2.8/strings/mg-MG.strings +share/abiword-2.8/strings/mh-MH.strings +share/abiword-2.8/strings/mk-MK.strings +share/abiword-2.8/strings/ms-MY.strings +share/abiword-2.8/strings/nb-NO.strings +share/abiword-2.8/strings/ne-NP.strings +share/abiword-2.8/strings/nl-NL.strings +share/abiword-2.8/strings/nn-NO.strings +share/abiword-2.8/strings/pl-PL.strings +share/abiword-2.8/strings/pt-BR.strings +share/abiword-2.8/strings/pt-PT.strings +share/abiword-2.8/strings/quh-BO.strings +share/abiword-2.8/strings/qul-BO.strings +share/abiword-2.8/strings/ro-RO.strings +share/abiword-2.8/strings/ru-RU.strings +share/abiword-2.8/strings/sc-IT.strings +share/abiword-2.8/strings/sk-SK.strings +share/abiword-2.8/strings/sl-SI.strings +share/abiword-2.8/strings/sq-AL.strings +share/abiword-2.8/strings/sr.strings +share/abiword-2.8/strings/sv-SE.strings +share/abiword-2.8/strings/ta-IN.strings +share/abiword-2.8/strings/tr-TR.strings +share/abiword-2.8/strings/uk-UA.strings +share/abiword-2.8/strings/ur.strings +share/abiword-2.8/strings/vi-VN.strings +share/abiword-2.8/strings/wo-SN.strings +share/abiword-2.8/strings/yi.strings +share/abiword-2.8/strings/zh-CN.strings +share/abiword-2.8/strings/zh-HK.strings +share/abiword-2.8/strings/zh-TW.strings +share/abiword-2.8/system.profile +share/abiword-2.8/system.profile-CP1254 +share/abiword-2.8/system.profile-KOI8-R +share/abiword-2.8/system.profile-KOI8-U +share/abiword-2.8/system.profile-KOI8-UB +share/abiword-2.8/system.profile-am-ET +share/abiword-2.8/system.profile-ar +share/abiword-2.8/system.profile-ar-EG +share/abiword-2.8/system.profile-ar-SA +share/abiword-2.8/system.profile-bg-BG +share/abiword-2.8/system.profile-ca-ES +share/abiword-2.8/system.profile-cs-CZ +share/abiword-2.8/system.profile-da-DK +share/abiword-2.8/system.profile-de +share/abiword-2.8/system.profile-de-AT +share/abiword-2.8/system.profile-de-CH +share/abiword-2.8/system.profile-de-DE +share/abiword-2.8/system.profile-div-MV +share/abiword-2.8/system.profile-el-GR +share/abiword-2.8/system.profile-en +share/abiword-2.8/system.profile-en-AU +share/abiword-2.8/system.profile-en-CA +share/abiword-2.8/system.profile-en-GB +share/abiword-2.8/system.profile-en-IE +share/abiword-2.8/system.profile-en-NZ +share/abiword-2.8/system.profile-en-US +share/abiword-2.8/system.profile-en-ZA +share/abiword-2.8/system.profile-es +share/abiword-2.8/system.profile-es-ES +share/abiword-2.8/system.profile-es-MX +share/abiword-2.8/system.profile-eu +share/abiword-2.8/system.profile-eu-ES +share/abiword-2.8/system.profile-fa-IR +share/abiword-2.8/system.profile-fi-FI +share/abiword-2.8/system.profile-fr +share/abiword-2.8/system.profile-fr-BE +share/abiword-2.8/system.profile-fr-CA +share/abiword-2.8/system.profile-fr-CH +share/abiword-2.8/system.profile-fr-FR +share/abiword-2.8/system.profile-gl-ES +share/abiword-2.8/system.profile-he +share/abiword-2.8/system.profile-he-IL +share/abiword-2.8/system.profile-hu-HU +share/abiword-2.8/system.profile-it-IT +share/abiword-2.8/system.profile-ja-JP +share/abiword-2.8/system.profile-lt-LT +share/abiword-2.8/system.profile-nb-NO +share/abiword-2.8/system.profile-nl-NL +share/abiword-2.8/system.profile-nn-NO +share/abiword-2.8/system.profile-pl-PL +share/abiword-2.8/system.profile-ps +share/abiword-2.8/system.profile-pt-BR +share/abiword-2.8/system.profile-pt-PT +share/abiword-2.8/system.profile-ro +share/abiword-2.8/system.profile-ro-RO +share/abiword-2.8/system.profile-ru +share/abiword-2.8/system.profile-ru-RU +share/abiword-2.8/system.profile-sk-SK +share/abiword-2.8/system.profile-sk-SK.CP1250 +share/abiword-2.8/system.profile-sl +share/abiword-2.8/system.profile-sv +share/abiword-2.8/system.profile-sv-SE +share/abiword-2.8/system.profile-syr +share/abiword-2.8/system.profile-tr +share/abiword-2.8/system.profile-tr-TR +share/abiword-2.8/system.profile-tr-TR.CP1254 +share/abiword-2.8/system.profile-uk-UA +share/abiword-2.8/system.profile-ur-PK +share/abiword-2.8/system.profile-yi +share/abiword-2.8/system.profile-zh-CN +share/abiword-2.8/system.profile-zh-TW +share/abiword-2.8/templates/A4.awt +share/abiword-2.8/templates/Business-Letter.awt +share/abiword-2.8/templates/Business-Report.awt +share/abiword-2.8/templates/Employee-Directory.awt +share/abiword-2.8/templates/Fax-Coversheet.awt +share/abiword-2.8/templates/Friendly-Letter.awt +share/abiword-2.8/templates/Memo.awt +share/abiword-2.8/templates/Press-Release.awt +share/abiword-2.8/templates/Resume.awt +share/abiword-2.8/templates/Two-Columns.awt +share/abiword-2.8/templates/US-Letter.awt +share/abiword-2.8/templates/normal.awt +share/abiword-2.8/templates/normal.awt-am_ET +share/abiword-2.8/templates/normal.awt-ar +share/abiword-2.8/templates/normal.awt-ar_EG +share/abiword-2.8/templates/normal.awt-ar_SA +share/abiword-2.8/templates/normal.awt-bg_BG +share/abiword-2.8/templates/normal.awt-ca_ES +share/abiword-2.8/templates/normal.awt-cs_CZ +share/abiword-2.8/templates/normal.awt-da_DK +share/abiword-2.8/templates/normal.awt-de +share/abiword-2.8/templates/normal.awt-de_AT +share/abiword-2.8/templates/normal.awt-de_CH +share/abiword-2.8/templates/normal.awt-de_DE +share/abiword-2.8/templates/normal.awt-div_MV +share/abiword-2.8/templates/normal.awt-el_GR +share/abiword-2.8/templates/normal.awt-en_AU +share/abiword-2.8/templates/normal.awt-en_CA +share/abiword-2.8/templates/normal.awt-en_GB +share/abiword-2.8/templates/normal.awt-en_IE +share/abiword-2.8/templates/normal.awt-en_NZ +share/abiword-2.8/templates/normal.awt-en_ZA +share/abiword-2.8/templates/normal.awt-es +share/abiword-2.8/templates/normal.awt-es_AR +share/abiword-2.8/templates/normal.awt-es_ES +share/abiword-2.8/templates/normal.awt-es_IR +share/abiword-2.8/templates/normal.awt-es_MX +share/abiword-2.8/templates/normal.awt-fa_IR +share/abiword-2.8/templates/normal.awt-fi_FI +share/abiword-2.8/templates/normal.awt-fr +share/abiword-2.8/templates/normal.awt-fr_BE +share/abiword-2.8/templates/normal.awt-fr_CA +share/abiword-2.8/templates/normal.awt-fr_CH +share/abiword-2.8/templates/normal.awt-fr_FR +share/abiword-2.8/templates/normal.awt-gl_ES +share/abiword-2.8/templates/normal.awt-he +share/abiword-2.8/templates/normal.awt-he_IL +share/abiword-2.8/templates/normal.awt-hu_HU +share/abiword-2.8/templates/normal.awt-it_IT +share/abiword-2.8/templates/normal.awt-ja_JP +share/abiword-2.8/templates/normal.awt-lt_LT +share/abiword-2.8/templates/normal.awt-nb_NO +share/abiword-2.8/templates/normal.awt-nl_NL +share/abiword-2.8/templates/normal.awt-nn_NO +share/abiword-2.8/templates/normal.awt-pl_PL +share/abiword-2.8/templates/normal.awt-ps +share/abiword-2.8/templates/normal.awt-pt_BR +share/abiword-2.8/templates/normal.awt-pt_PT +share/abiword-2.8/templates/normal.awt-ro +share/abiword-2.8/templates/normal.awt-ro_RO +share/abiword-2.8/templates/normal.awt-ru +share/abiword-2.8/templates/normal.awt-ru_RU +share/abiword-2.8/templates/normal.awt-sk_SK +share/abiword-2.8/templates/normal.awt-sl +share/abiword-2.8/templates/normal.awt-sv +share/abiword-2.8/templates/normal.awt-sv_SE +share/abiword-2.8/templates/normal.awt-syr +share/abiword-2.8/templates/normal.awt-tr +share/abiword-2.8/templates/normal.awt-tr_TR +share/abiword-2.8/templates/normal.awt-uk_UA +share/abiword-2.8/templates/normal.awt-ur_PK +share/abiword-2.8/templates/normal.awt-yi +share/abiword-2.8/templates/normal.awt-zh_CN +share/abiword-2.8/templates/normal.awt-zh_TW +share/abiword-2.8/ui/ap_UnixDialog_Annotation.xml +share/abiword-2.8/ui/ap_UnixDialog_Break.xml +share/abiword-2.8/ui/ap_UnixDialog_Field.xml +share/abiword-2.8/ui/ap_UnixDialog_FormatFootnotes.xml +share/abiword-2.8/ui/ap_UnixDialog_FormatFrame.xml +share/abiword-2.8/ui/ap_UnixDialog_FormatTOC.xml +share/abiword-2.8/ui/ap_UnixDialog_FormatTable.xml +share/abiword-2.8/ui/ap_UnixDialog_Goto.xml +share/abiword-2.8/ui/ap_UnixDialog_HdrFtr.xml +share/abiword-2.8/ui/ap_UnixDialog_InsertTable.xml +share/abiword-2.8/ui/ap_UnixDialog_Insert_DateTime.xml +share/abiword-2.8/ui/ap_UnixDialog_Latex.xml +share/abiword-2.8/ui/ap_UnixDialog_MailMerge.xml +share/abiword-2.8/ui/ap_UnixDialog_MetaData.xml +share/abiword-2.8/ui/ap_UnixDialog_New.xml +share/abiword-2.8/ui/ap_UnixDialog_Options.xml +share/abiword-2.8/ui/ap_UnixDialog_Options_ColorSel.xml +share/abiword-2.8/ui/ap_UnixDialog_PageNumbers.xml +share/abiword-2.8/ui/ap_UnixDialog_PageSetup.xml +share/abiword-2.8/ui/ap_UnixDialog_Replace.xml +share/abiword-2.8/ui/ap_UnixDialog_Spell.xml +share/abiword-2.8/ui/ap_UnixDialog_Styles.xml +share/abiword-2.8/ui/ap_UnixDialog_Stylist.xml +share/abiword-2.8/ui/ap_UnixDialog_Stylist_modal.xml +share/abiword-2.8/ui/ap_UnixDialog_Tab.xml +share/abiword-2.8/ui/ap_UnixDialog_WordCount.xml +share/abiword-2.8/ui/xap_UnixDlg_DocComparison.xml +share/abiword-2.8/ui/xap_UnixDlg_Encoding.xml +share/abiword-2.8/ui/xap_UnixDlg_History.xml +share/abiword-2.8/ui/xap_UnixDlg_Image.xml +share/abiword-2.8/ui/xap_UnixDlg_Language.xml +share/abiword-2.8/ui/xap_UnixDlg_ListDocuments.xml +share/abiword-2.8/ui/xap_UnixDlg_Password.xml +share/abiword-2.8/ui/xap_UnixDlg_PluginManager.xml +share/abiword-2.8/ui/xap_UnixDlg_WindowMore.xml +share/abiword-2.8/ui/xap_UnixDlg_Zoom.xml share/applications/abiword.desktop share/icons/abiword_48.png -share/mime-info/abiword.keys diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index bd565612fc9..f1cd5eb8c35 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.59 2009/04/07 16:27:08 drochner Exp $ +$NetBSD: distinfo,v 1.60 2010/11/26 14:49:49 adam Exp $ -SHA1 (abiword-2.6.8.tar.gz) = fc979982edc3445385705afdb1e2ebb1fa53a4f6 -RMD160 (abiword-2.6.8.tar.gz) = 8fcf455a5226a5525b9a89f88c9916b20e973607 -Size (abiword-2.6.8.tar.gz) = 9516443 bytes -SHA1 (patch-aa) = b1caaaf57d1baa9514dc4f56854ed1bb529b8652 -SHA1 (patch-ab) = 67e9ea9e8c702b9604643f887398392c371ebcd8 -SHA1 (patch-ac) = 8fe244939c96a322a4db61463b8f66af0fc61e35 -SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5 -SHA1 (patch-ah) = ea0a819d43e9921cb4c63a3cd4af73a169d1150f -SHA1 (patch-sa) = cf67e1e1a75131d323d311f1d138da2d11c1b292 +SHA1 (abiword-2.8.6.tar.gz) = 998f69d038000b3fc027d4259548f02d67c8d0df +RMD160 (abiword-2.8.6.tar.gz) = caabab25d197f9553ea12376de36fc7f5a771a58 +Size (abiword-2.8.6.tar.gz) = 9218827 bytes +SHA1 (patch-aa) = dea737eb09e271f99e2b50f5ffc3037a68116451 +SHA1 (patch-ab) = fa589d531c08bf293eeeaa9a775015e27eaf6da4 +SHA1 (patch-ac) = a82fd781195e9ff52dbc33258fd4774cd23fe5c9 +SHA1 (patch-ad) = 48ff4fcce593f9996e90cce718b2f774b271d5a3 +SHA1 (patch-sa) = 29ee7e9891b11773217ec73bbda01e2591e78b56 diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa index 71733eed975..1b641be6512 100644 --- a/editors/abiword/patches/patch-aa +++ b/editors/abiword/patches/patch-aa @@ -1,13 +1,279 @@ -$NetBSD: patch-aa,v 1.11 2009/04/07 16:27:08 drochner Exp $ +$NetBSD: patch-aa,v 1.12 2010/11/26 14:49:50 adam Exp $ ---- configure.orig 2009-03-06 20:23:34.000000000 +0100 +--- configure.orig 2010-06-13 21:17:37.000000000 +0000 +++ configure -@@ -5097,7 +5097,7 @@ case "$OS_NAME" in - WARNING_CFLAGS="" - ;; - *BSD|DragonFly) -- WARNING_CFLAGS="-Wall -pedantic -D_BSD_SOURCE -pipe" #-ansi -+ WARNING_CFLAGS="-Wall -D_BSD_SOURCE -pipe" #-ansi - ;; - IRIX*) - case "$GCC" in +@@ -17074,7 +17074,7 @@ fi + + # maybe just switch on TOOLKIT instead of the fancy TARGET defines + # also for embedded, e.g. hildon would set TOOLKIT_GTK and TOOLKIT_HILDON +- if test "$TOOLKIT" == "cocoa"; then ++ if test "$TOOLKIT" = "cocoa"; then + TOOLKIT_COCOA_TRUE= + TOOLKIT_COCOA_FALSE='#' + else +@@ -17082,7 +17082,7 @@ else + TOOLKIT_COCOA_FALSE= + fi + +- if test "$TOOLKIT" == "gtk"; then ++ if test "$TOOLKIT" = "gtk"; then + TOOLKIT_GTK_TRUE= + TOOLKIT_GTK_FALSE='#' + else +@@ -17090,7 +17090,7 @@ else + TOOLKIT_GTK_FALSE= + fi + +- if test "$TOOLKIT" == "win"; then ++ if test "$TOOLKIT" = "win"; then + TOOLKIT_WIN_TRUE= + TOOLKIT_WIN_FALSE='#' + else +@@ -17099,15 +17099,15 @@ else + fi + + +-if test "$enable_dynamic" == ""; then ++if test "$enable_dynamic" = ""; then + enable_dynamic="no" + fi + +-if test "$enable_static" == ""; then ++if test "$enable_static" = ""; then + enable_static="no" + fi + +-if test "$TOOLKIT" == "win"; then ++if test "$TOOLKIT" = "win"; then + + $as_echo "#define TOOLKIT_WIN 1" >>confdefs.h + +@@ -17120,7 +17120,7 @@ $as_echo "#define _WIN32_WINNT 0x0500" > + # override static/dynamic, on win32 only static is possible + enable_dynamic="no" + enable_static="yes" +-elif test "$TOOLKIT" == "cocoa"; then ++elif test "$TOOLKIT" = "cocoa"; then + + $as_echo "#define TOOLKIT_COCOA 1" >>confdefs.h + +@@ -17132,7 +17132,7 @@ else + $as_echo "#define TOOLKIT_GTK 1" >>confdefs.h + + fi +- if test "$enable_dynamic" == "yes"; then ++ if test "$enable_dynamic" = "yes"; then + ENABLE_DYNAMIC_TRUE= + ENABLE_DYNAMIC_FALSE='#' + else +@@ -17140,7 +17140,7 @@ else + ENABLE_DYNAMIC_FALSE= + fi + +- if test "$enable_static" == "yes"; then ++ if test "$enable_static" = "yes"; then + ENABLE_STATIC_TRUE= + ENABLE_STATIC_FALSE='#' + else +@@ -17239,33 +17239,33 @@ $as_echo "yes" >&6; } + + fi + PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'${WP_CPPFLAGS} -DABI_DLL' +-if test "$TOOLKIT" == "gtk" && +- test "$enable_dynamic" == "yes"; then ++if test "$TOOLKIT" = "gtk" && ++ test "$enable_dynamic" = "yes"; then + # link plugins to work around gcc visibility issue with + # derived classes in dlopened modules + PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES" +-elif test "$TOOLKIT" == "win"; then ++elif test "$TOOLKIT" = "win"; then + PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'-D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0500' + # link plugins to the executable so they can be loaded + PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src -labiword' +-elif test "$TOOLKIT" == "cocoa" ; then ++elif test "$TOOLKIT" = "cocoa" ; then + PLUGIN_LIBS="$PLUGIN_LIBS "'-L${top_builddir}/src'" -labiword-$ABIWORD_SERIES" + fi + + + +-if test "$abi_cv_disable_exports" == "yes"; then ++if test "$abi_cv_disable_exports" = "yes"; then + + $as_echo "#define DISABLE_EXPORTS 1" >>confdefs.h + + fi + +-if test "$abi_cv_menubutton" == "yes"; then ++if test "$abi_cv_menubutton" = "yes"; then + + $as_echo "#define ENABLE_MENUBUTTON 1" >>confdefs.h + + fi +- if test "$abi_cv_menubutton" == "yes"; then ++ if test "$abi_cv_menubutton" = "yes"; then + ENABLE_MENUBUTTON_TRUE= + ENABLE_MENUBUTTON_FALSE='#' + else +@@ -17274,12 +17274,12 @@ else + fi + + +-if test "$abi_cv_print" == "yes"; then ++if test "$abi_cv_print" = "yes"; then + + $as_echo "#define ENABLE_PRINT 1" >>confdefs.h + + fi +- if test "$abi_cv_print" == "yes"; then ++ if test "$abi_cv_print" = "yes"; then + ENABLE_PRINT_TRUE= + ENABLE_PRINT_FALSE='#' + else +@@ -17288,7 +17288,7 @@ else + fi + + +-if test "$abi_cv_spell" == "yes"; then ++if test "$abi_cv_spell" = "yes"; then + + $as_echo "#define ENABLE_SPELL 1" >>confdefs.h + +@@ -17297,7 +17297,7 @@ $as_echo "#define ENABLE_SPELL 1" >>conf + $as_echo "#define WITH_ENCHANT 1" >>confdefs.h + + fi +- if test "$abi_cv_spell" == "yes"; then ++ if test "$abi_cv_spell" = "yes"; then + ENABLE_SPELL_TRUE= + ENABLE_SPELL_FALSE='#' + else +@@ -17306,12 +17306,12 @@ else + fi + + +-if test "$abi_cv_statusbar" == "yes"; then ++if test "$abi_cv_statusbar" = "yes"; then + + $as_echo "#define ENABLE_STATUSBAR 1" >>confdefs.h + + fi +- if test "$abi_cv_statusbar" == "yes"; then ++ if test "$abi_cv_statusbar" = "yes"; then + ENABLE_STATUSBAR_TRUE= + ENABLE_STATUSBAR_FALSE='#' + else +@@ -17327,7 +17327,7 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + fi +- if test "$abi_cv_embedded_target" == "EMBEDDED_TARGET_HILDON"; then ++ if test "$abi_cv_embedded_target" = "EMBEDDED_TARGET_HILDON"; then + EMBEDDED_HILDON_TRUE= + EMBEDDED_HILDON_FALSE='#' + else +@@ -17336,12 +17336,12 @@ else + fi + + +-if test "$abi_cv_emacs_keybinding" == "yes"; then ++if test "$abi_cv_emacs_keybinding" = "yes"; then + + $as_echo "#define ENABLE_EMACS_KEYBINDING 1" >>confdefs.h + + fi +- if test "$abi_cv_emacs_keybinding" == "yes"; then ++ if test "$abi_cv_emacs_keybinding" = "yes"; then + ENABLE_EMACS_KEYBINDING_TRUE= + ENABLE_EMACS_KEYBINDING_FALSE='#' + else +@@ -17350,12 +17350,12 @@ else + fi + + +-if test "$abi_cv_vi_keybinding" == "yes"; then ++if test "$abi_cv_vi_keybinding" = "yes"; then + + $as_echo "#define ENABLE_VI_KEYBINDING 1" >>confdefs.h + + fi +- if test "$abi_cv_vi_keybinding" == "yes"; then ++ if test "$abi_cv_vi_keybinding" = "yes"; then + ENABLE_VI_KEYBINDING_TRUE= + ENABLE_VI_KEYBINDING_FALSE='#' + else +@@ -17364,7 +17364,7 @@ else + fi + + +- if test "$abi_cv_clipart" == "yes"; then ++ if test "$abi_cv_clipart" = "yes"; then + ENABLE_CLIPART_TRUE= + ENABLE_CLIPART_FALSE='#' + else +@@ -17372,7 +17372,7 @@ else + ENABLE_CLIPART_FALSE= + fi + +- if test "$abi_cv_templates" == "yes"; then ++ if test "$abi_cv_templates" = "yes"; then + ENABLE_TEMPLATES_TRUE= + ENABLE_TEMPLATES_FALSE='#' + else +@@ -17381,7 +17381,7 @@ else + fi + + +-if test "$abi_cv_debug" == "yes"; then ++if test "$abi_cv_debug" = "yes"; then + + $as_echo "#define DEBUG 1" >>confdefs.h + +@@ -17390,7 +17390,7 @@ else + $as_echo "#define NDEBUG 1" >>confdefs.h + + fi +- if test "$abi_cv_debug" == "yes"; then ++ if test "$abi_cv_debug" = "yes"; then + DEBUG_TRUE= + DEBUG_FALSE='#' + else +@@ -17403,24 +17403,24 @@ fi + # Optional dependencies handling + # + +-if test "$abi_cv_gnomevfs" == "yes"; then ++if test "$abi_cv_gnomevfs" = "yes"; then + + $as_echo "#define WITH_GNOMEVFS 1" >>confdefs.h + + fi + +-if test "$abi_cv_gio" == "yes"; then ++if test "$abi_cv_gio" = "yes"; then + + $as_echo "#define WITH_GIO 1" >>confdefs.h + + fi + +-if test "$abi_cv_goffice" == "yes"; then ++if test "$abi_cv_goffice" = "yes"; then + + $as_echo "#define WITH_GOFFICE 1" >>confdefs.h + + fi +- if test "$TOOLKIT" == "gtk" && test "$abi_cv_goffice" != "yes"; then ++ if test "$TOOLKIT" = "gtk" && test "$abi_cv_goffice" != "yes"; then + WITH_GOFFICE_BUILTIN_TRUE= + WITH_GOFFICE_BUILTIN_FALSE='#' + else +@@ -17447,7 +17447,7 @@ if test "$abi_cv_plugins" = "auto"; then + eval $(echo "enable_$plugin")="auto" + done + else +- default_plugins="opendocument" ++ default_plugins="" + + if test "$abi_cv_disable_default_plugins" != "yes"; then + PLUGINS="$default_plugins" diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab index de2145bffd3..0f5ecb9891d 100644 --- a/editors/abiword/patches/patch-ab +++ b/editors/abiword/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.16 2009/04/07 16:27:08 drochner Exp $ +$NetBSD: patch-ab,v 1.17 2010/11/26 14:49:50 adam Exp $ ---- src/af/util/xp/ut_iconv.cpp.orig 2008-04-06 17:32:28.000000000 +0200 +--- src/af/util/xp/ut_iconv.cpp.orig 2009-06-25 00:52:27.000000000 +0000 +++ src/af/util/xp/ut_iconv.cpp -@@ -265,9 +265,11 @@ const char * ucs4Internal () +@@ -267,9 +267,11 @@ const char * ucs4Internal () #elif defined(_LIBICONV_H) // libiconv seems to prefer UCS-4-INTERNAL to UCS-4BE and UCS-4LE return "UCS-4-INTERNAL"; diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac index 42005e50e01..8767848a01b 100644 --- a/editors/abiword/patches/patch-ac +++ b/editors/abiword/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.16 2006/06/07 19:19:28 rillig Exp $ +$NetBSD: patch-ac,v 1.17 2010/11/26 14:49:50 adam Exp $ ---- src/af/util/xp/ut_endian.h.orig 2005-10-08 12:53:33.000000000 +0200 -+++ src/af/util/xp/ut_endian.h 2006-06-07 21:15:51.188428052 +0200 -@@ -47,6 +47,13 @@ +--- src/af/util/xp/ut_endian.h.orig 2009-12-13 20:26:17.000000000 +0000 ++++ src/af/util/xp/ut_endian.h +@@ -56,6 +56,13 @@ #else #define UT_BIG_ENDIAN #endif @@ -16,12 +16,3 @@ $NetBSD: patch-ac,v 1.16 2006/06/07 19:19:28 rillig Exp $ #elif defined(__sgi) #include #if BYTE_ORDER == LITTLE_ENDIAN -@@ -60,7 +67,7 @@ - #else - #define UT_LITTLE_ENDIAN - #endif --#elif defined(SunOS) /* this is defined by src/config/platform/sunos.mk */ -+#elif defined(SunOS) || defined(__sun) /* this is defined by src/config/platform/sunos.mk */ - #include - #if defined(_BIG_ENDIAN) - #define UT_BIG_ENDIAN diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-ad index cb8ea2afdea..ae5fe156f36 100644 --- a/editors/abiword/patches/patch-ad +++ b/editors/abiword/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.14 2005/01/11 11:09:27 adam Exp $ +$NetBSD: patch-ad,v 1.15 2010/11/26 14:49:50 adam Exp $ ---- src/af/util/xp/ut_iconv.h.orig 2003-11-19 02:38:27.000000000 +0000 +--- src/af/util/xp/ut_iconv.h.orig 2009-06-25 00:52:27.000000000 +0000 +++ src/af/util/xp/ut_iconv.h @@ -32,8 +32,14 @@ @@ -16,4 +16,4 @@ $NetBSD: patch-ad,v 1.14 2005/01/11 11:09:27 adam Exp $ + #ifdef __cplusplus - #include "ut_exception.h" + diff --git a/editors/abiword/patches/patch-ah b/editors/abiword/patches/patch-ah deleted file mode 100644 index 7831ebced17..00000000000 --- a/editors/abiword/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.6 2009/04/07 16:27:08 drochner Exp $ - ---- src/af/util/xp/ut_mbtowc.cpp.orig 2009-03-12 14:54:05.000000000 +0100 -+++ src/af/util/xp/ut_mbtowc.cpp -@@ -179,11 +179,11 @@ int UT_UCS4_mbtowc::mbtowc (UT_UCS4Char - const char * inptr = m_buf; - - // need eight bytes in order for the hack below to work (see below) -- UT_UCS4Char ucs4[2]; -+ UT_UCS4Char ucs4[5]; - char * outptr = reinterpret_cast(&ucs4); - - size_t inlen = m_bufLen; -- size_t outlen = sizeof (ucs4[0]); -+ size_t outlen = 4 * sizeof (ucs4[0]); - - const UT_iconv_t cd = m_converter->cd (); - diff --git a/editors/abiword/patches/patch-sa b/editors/abiword/patches/patch-sa index a81135ee2ef..4440c95b854 100644 --- a/editors/abiword/patches/patch-sa +++ b/editors/abiword/patches/patch-sa @@ -1,8 +1,8 @@ -$NetBSD: patch-sa,v 1.2 2009/04/07 16:27:08 drochner Exp $ +$NetBSD: patch-sa,v 1.3 2010/11/26 14:49:50 adam Exp $ ---- src/af/util/xp/ut_misc.cpp.orig 2008-11-10 22:00:35.000000000 +0100 +--- src/af/util/xp/ut_misc.cpp.orig 2009-06-28 22:09:08.000000000 +0000 +++ src/af/util/xp/ut_misc.cpp -@@ -1077,7 +1077,7 @@ const gchar ** UT_splitPropsToArray(gcha +@@ -625,7 +625,7 @@ const gchar ** UT_splitPropsToArray(gcha } char * semi = NULL; @@ -11,7 +11,7 @@ $NetBSD: patch-sa,v 1.2 2009/04/07 16:27:08 drochner Exp $ while((semi = (char *) strchr(p, ';'))) { *semi = 0; -@@ -1091,7 +1091,7 @@ const gchar ** UT_splitPropsToArray(gcha +@@ -639,7 +639,7 @@ const gchar ** UT_splitPropsToArray(gcha const gchar ** pPropsArray = new const gchar *[2 * iPropCount + 1]; UT_return_val_if_fail( pPropsArray, NULL ); -- cgit v1.2.3