Update abiword to version 3.0.1.

Packaged for pkgsrc-wip by Ottavio Caruso and nros.

Changes found on homepage.
Core:
Bug 13564 - Fix crash in abw to HTML conversion. Uplifted from master (Hubert Figuière)
Bug 13565 - Missing cdump.pl in the tarball. Uplifted from master (Hubert Figuière)
Fix 13572: libabiword_init annotation is wrong (Daniel Narvaez ). Cherry-pick from trunk@33573. (Hubert Figuière)
Fix 13548: Need method to hide/show rulers in the python bindings (Gonzalo Odiard ) Cherry-pick from trunk@33575. (Hubert Figuière)
Fix comments that mention "AiksaurusABI_invoke" when a different name is involved. Bad cut and paste. No code change. (UPLIFT from trunk) (Hubert Figuière)
Bug 13586 - We don't have a frame when printing. UPLIFTED from trunk (Hubert Figuière)
Bug 13593 - Fix build issue with bison 3.0 Author: Dimitri John Ledkov (Hubert Figuière)
Bug 13582 - Fix redraw region in custom widget. Cherry-picked from trunk@33870 and reworked for 3.0.x (Hubert Figuière)
Bug 13585 - fix abi_widget_get_content annotation. from Danel Narvaez. Cherry-picked from trunk@33877 (Hubert Figuière)
Bug 13596 - Fix extending selection with Ctrl+Shift+arrow key. Cherry-picked from trunk@33878. by jbrefort. (Hubert Figuière)
Evolution needs to be 3.6 now Cherry-picked from trunk@33916 trunk@33921 (Hubert Figuière)
Bug 11283 - Don't print slection background in tab runs [#11283]. Cherry-pick from trunk@33902. (jbrefort) with indent fixes (Hubert Figuière)
Bug 13549 - Add a Gtk3 backend for Aiksaurus. Still needs to fix warnings, but seems things work. Cherry-pick from trunk@33959. By jbrefort (Hubert Figuière)
Bug 13605 - Use GsfInputHTTP for URLs starting with "http://" or "https://". Helps with #13605 (also needs a fix in libgsf). Cherry-pick from trunk@33977. By jbrefort (Hubert Figuière)
Fix linkage for libjpeg. (Hubert Figuière)
Bug 13605 - Fix UT_go_url_resolve_relative(). Backport form trunk@33872. By jbrefort (Hubert Figuière)
Fix an automake warning (Hubert Figuière)
Added .docx as a default plugin. (Hubert Figuière)
Fix crash when loading a file from abicommand. Cherry-pick from trunk@34036. From jbrefort. (Hubert Figuière)
Fix all warnings of builtin aiksaurus-gtk3 library and don't use it whaen available from aiksaurus itself. Cherry-pick from trunk@34043. From jbrefort. (Hubert Figuière)
Bug 13621 - Fix crash when editing an hyperlink with either NULL title or target. Cherry-pick from trunk@34128. By jbrefort (Hubert Figuière)
Bug 13622 - Fix crash when dragging or resizing floating images Cherry-pick from trunk@34144. By jbrefort (Hubert Figuière)
Bug 13624 - Fixed applying a format change to only a table column when using the format table dialog Cherry-pick from trunk@34145 by jbrefort. (Hubert Figuière)
Make formatting tools work correctly when applied to a table column. Cherry-pick from trunk@34160. By jbrefort. (Hubert Figuière)
Bug 11447 - Check --enable-plugins value. Extracted from trunk@34163. By jbrefort. (Hubert Figuière)
Fixed configure when aiksaurus is not enabled. Cherry-pick from trunk@34226. By jbrefort. (Hubert Figuière)
Bug 13638 - Don't crash when validating a color change in the background dialog, see #13638, comment #3. Cherry-pick from trunk@34396. By jbrefort (Hubert Figuière)
Bug 13835 - Do not remember click type when scrolling (#13635). Cherry-pick from trunk@34410. By jbrefort (Hubert Figuière)
Bug 13629 - Avoid crashes when loading a file with multiple text frames. Cherry-pick from trunk@34431. By jbrefort. (Hubert Figuière)
Bug 13649 - Fix crash on empty hyperlinks in RTF files. Cherry-pick from trunk@34569. By jbrefort (Hubert Figuière)
Fix crasher in font dialog. Cherry-pick from trunk@34689. By jbrefort. (Hubert Figuière)
Fix a logic error: this is a sparse vector. Cherry-pick from trunk@34947 (Hubert Figuière)
Bug 13682 - Fix theming support for ruler. Cherry-pick from trunk@34948 (Hubert Figuière)
Bug 13683 - Replace GtkTable by GtkGrid to have the dialog properly sized. By jbrefort. Cherry-pick from trunk@34956 (Hubert Figuière)
Fix the dtyle modify dialog. (Jean Bréfort)
Gtk Graphics: fix a PangoFontDesc memory leak introduced in ABI-3-0-0-STABLE@34954 Cherry-pick from trunk@35024. (Hubert Figuière)
Bug 12577 - new scalable icons and sizes. Also set an icon list for the window (to scale) Cherry-pick from trunk@35027. (Hubert Figuière)
Gtk Background Dialog: properly get the color on close with the new color chooser widget. Cherry-pick from trunk@35029 (Hubert Figuière)
Bug 12577 - Missing Makefile creation (Hubert Figuière)
Gtk Dialogs Background and options: fix the color chooser. (Hubert Figuière)
Gtk option dialog: fix the color selector for gtk3: We instantiate it manually instead of doing it in the UI file. This diverge from trunk. (Hubert Figuière)
Gtk frame: shorter list of icon to make Gtk2 quiet. (Hubert Figuière)
Bug 13689 - Fix initial focus. Cherry-pick from trunk@35044. By jbrefort (Hubert Figuière)
Add doublebuffering support for most of the drawing to reduce flickering. (Andrei Sfrent)
Some robustness fixes for lists. (Martin Sevior)
fl_BlockLayout::_doInsertRDFAnchorRun() needs to create fp_RDFAnchorRun or else a text:meta right at the start of a text:p will assert violently. Of course, I have to update the code in that method and that class to be tailored to RDF instead of fp_AnnotationRun which it is based on. Thanks to Martin for the info on the Dummy run assertion I was getting! (Ben Martin)
Updated ff localization by Ibraahiima Saar (Urmas)
A little bit of restructure in there because we now have hyperlinks, annotations, and rdfanchors which all share the same fp_run class tree. RDF Anchors can now be highlighted and the annotation bubble for them shows their xmlid and how many RDF triples are associated with that part of the document. Still things to do with it, but a decent step in the right direction. Oh yeah, and a new menu item to turn on/off highlighting. (Ben Martin)
Robustness fixes. (Martin Sevior)
Updated Copyright year (Xun Sun)
Fix crash attempting to import one of Marc's secret HTML documents from the command line. (Martin Sevior)
Added some Portuguese characters. (13138) (Urmas)
Allow backspace, delete and arrows again (Ben Martin)
Some RDF D&D goodness. (Ben Martin)
Do not show up in the File/Open dialog types, its confusing. (Ben Martin)
Added missing printStyleTree method to IE_Exp_HTML for usage in other plugins (Volodymyr Rudyj)
A few issues with double buffering and abicommand, in that mode there is no GUI so some asserts failed and some code would crash (selectclear). These new app variables shouldn't effect GUI programs but should help abicommand ones where dbl buffer is not needed. (Ben Martin)
Unicode list labels fix. (Urmas)
Removed use of deprecated GtkDialog::vbox (Volodymyr Rudyj)
Fix 13129 Numbered Heading is turned into Numbered List (Martin Sevior)
Don't create a painter when not needed. (Jean Bréfort)
RDF marshaled into a \*\rdf section with rdf/xml in it inside RTF on the clipboard. Copy of triples from one document to another now works. (Ben Martin)
The pl_ListenerCoupleCloser is designed to pass along start and end tags for objects which have only one tag in the selected range. This way copying a selection will result in a document with both start and end tags in it. See the class docs for more. Still tinkering on this a bit. (Ben Martin)
Now tracking bookmark open and close elements too. (Ben Martin)
The remains are in odf-2011-track-changes-git-svn/git-diff-2011-oct-3-cleaned.patch. Some code is added here but enclosed in #ifdef ODF_GCT guards to disable it until it is required for the ODF plugin. (Ben Martin)
Absolute movement bugfix (Ben Martin)
AbiCommand now allows multi process copy and paste, and has a "run" command to execute the gtk mainloop for X seconds. Some little things for win builds (Ben Martin)
Bad things used to happen when there was an RDF Link but no triples at all. A simple guard to stop that from happening in SPARQL on empty RDF cases. (Ben Martin)
On repeated copy and paste, do not just keep appending a new uuid to the end of the string. Instead, first remove the old uuid and then append the new one. This keeps xml:id values from continuously growing during repeated copy,paste,copy,paste,... cycles. (Ben Martin)
const T& use in the header file which makes a warning in msvc. (Ben Martin)
Reversed unwanted change in fv_ViewDoubleBuffering.cpp (Jean Bréfort)
Removed revision toolbar buttons until proper icons are available. (Urmas)
Do not include vertical fonts in the toolbar list. (Urmas)
Don't use horizontal scroll bars (Hubert Figuiere)
Scroll the list to the selected language. (Hubert Figuiere)
Mismatch free() with g_strdup(). Seems to crash on Windows. (Urmas)
Fixed an invalid write (valgrind). (Jean Bréfort)
Fixed a double buffering related crasher and other details (Jean Bréfort)
Better fix for the double buffering issue, hopefully. (Jean Bréfort)
Fix bug 6511: Word count on selected lines is wrong (Simon Larochelle) (Marc Maurer)
On linux, when I incorporate a frame image, the line breaks for the surrounding text are sometimes in the middle of a word. The patch makes sure that two static pointers do not inadvertently point to a newly created structure during the execution of fp_Textrun::split(). (Simon Larochelle)
Fix win64 build of the EPub plugin (Fridrich Strba)
Be sure we link the libabiword we are building and not one that is installed (Fridrich Strba)
Fix GTK2 build. Define new key names. Patch by Simon Larochelle, larochelle.simon.1 gmail com. (Ingo Brückl)
Fix GTK2 build. gtk_widget_set_visible() was only introduced in v2.18 while AbiWord only requires v2.12, so allow building with GTK2 versions in between. (Ingo Brückl)
Fix GTK2 build. Build in src/text/fmt/gtk for GTK2 as well. (Ingo Brückl)
Fix GTK2 build. Build in plugins/epub/dialogs/gtk for GTK2 as well. (Ingo Brückl)
Cosmetic: Change coding style. Break and indent lines. (Ingo Brückl)
Bug 13182: add BOOST_CPPFLAGS to the CPPFLAGS (Hubert Figuière)
Fix warning: initialization order. (Hubert Figuière)
Bug 12880: the list level is constrained to 0-8 in RTF. Ensure that (Hubert Figuière)
Fix GTK2 build. Make several features work again. Since re-enabling GTK2 support in r30397 these weren't functioning. Patch by Simon Larochelle, larochelle.simon.1 gmail com. (Ingo Brückl)
Fix GTK2 build. Make WMF plugin work again. Since re-enabling GTK2 support in r30397 it only creates blurred images. (Ingo Brückl)
Bug 13182: Fail configure on missing boost because it is now required. (Hubert Figuière)
Bug 13192: Fix GtkBuilder files (Hubert Figuière)
Bug 13197: only import glib.h (Hubert Figuière)
Fix const-ness (Hubert Figuière)
Update doxygen file for new syntax. (Hubert Figuière)
Fix some more warnings in trunk (Hubert Figuière)
Allow building plugins for Gtk2 Patch by Simon Larochelle (Hubert Figuière)
Bug 13187: use xmlURIEscape for UT_UTF8String::escapeURL(). (Hubert Figuière)
First patch from Simon Larochelle to partially fix 13208. Thanks Simon! (Martin Sevior)
Thanks Simon. ( (Martin Sevior)
(. (Martin Sevior)
Allow building plugins for Gtk2 - missing file Patch by Simon Larochelle. (Hubert Figuière)
Fix for bug 13101 from Simon Larochelle. Thanks very much Simon! (Martin Sevior)
Fix bug 13209 Centered line may move off the left margin. Patch from Simon Larochelle. (Martin Sevior)
Fix 13210 Strange division of paragraphs at bottom of columns. Patch by Simon Larochelle. Thanks Simon! (Martin Sevior)
Fix GTK2 build. Directory src/text/fmt/gtk2 does not exist, use src/text/fmt/gtk to look for include files. (Ingo Brückl)
Fixed text display in preview window. (urmaslt)
Bug 13217: refactor init3dColors to use a widget. (Hubert Figuière)
Bug 13217 - remove gtk2 dir from Makefile.am (Hubert Figuière)
Fix some improper cast in the RDF editor. Gtk2 AND Gtk3 (Hubert Figuière)
Bug 13220 - Remove iostream and cerr usage to use xxx_UT_DEBUGMSG (Hubert Figuière)
Fix warnings (Hubert Figuière)
more gtk2 compat (Hubert Figuière)
Fix warnings. (Hubert Figuière)
Fix Gtk2 build for Gtk 2.20 - Patch by Simon Larochelle. (Hubert Figuière)
Fix the unit tests. (Hubert Figuière)
Fix the properties misordered and missing comas. This validate the test framework by finding the first bug (Hubert Figuière)
More comments (Hubert Figuière)
Bug 10707 - Reenable the locale test. (Hubert Figuière)
Verify the number of properties. (Hubert Figuière)
Remove unused code that I missed in the refactor (Hubert Figuière)
classes with virtual methods require a virtual destructor (Hubert Figuière)
Some code needs it with spaces. (urmaslt)
Fix a warning (Hubert Figuière)
Fix a bug due to wrong type. PL_StuxDocHandle MUST die. (Hubert Figuière)
wrong "Handle" type. (Hubert Figuière)
Remove __MRC__. Who cares about a compiler that was obsolete 10 years ago. (Hubert Figuière)
Fix some warnings. Need more testing Add UT_DebugOnly<> (Hubert Figuière)
Get rid of UT_String in RTF. (Hubert Figuière)
Unit test for new ut_std_string function (ported from UT_String) (Hubert Figuière)
Remove some UT_UTF8String (Hubert Figuière)
Get rid of most UT_Vector (Hubert Figuière)
fix some more warnings in RDF (Hubert Figuière)
A little tidy up. (Ben Martin)
New GOTO Annotation tab. (Ben Martin)
Missing pt_types.h (Hubert Figuière)
test must run with valgrind. The output is in tf-vgdump (Hubert Figuière)
Bug 13215 - remove the print button if print is disabled. (Hubert Figuière)
Add missing widgets to Gtk2. Remove duplicate line. (Hubert Figuière)
Right clicking RDF links works again :/ (Ben Martin)
Use std::string in EPUB. (Hubert Figuière)
Annotation stubs now use std::string. (Hubert Figuière)
Bookmarks are now std containers (Hubert Figuière)
Bug 9287 - remove higly inefficient use of PD_Document::enumStyles() (Hubert Figuière)
Silence UT_DEBUGMSG (Hubert Figuière)
Bug 13229 - check if stylenames are in UTF-8 from wv. (Hubert Figuière)
Fix GTK2 build. Add gtk_widget_set_can_default(), gtk_widget_get_sensitive(), gtk_widget_get_visible(), and gtk_widget_get_requisition() to xap_Gtk2Compat.h. (Ingo Brückl)
Fix GTK2 build. Include xap_Gtk2Compat.h in xap_UnixWidget.cpp. (Ingo Brückl)
Fix GTK2 build. Install xap_UnixDlg_Image-2.ui, not xap_UnixDlg_Image.ui. (Ingo Brückl)
PL_ObjectHandle -> pf_Frag_Object* (Hubert Figuière)
Remove UT_StringMap from Unix toolbar style combo. Was not really used anyway. (Hubert Figuière)
Remove obsolete gtk2 directories. (Ingo Brückl)
Fix xap_Gtk2Compat.h. gtk_widget_set_can_default() and gtk_widget_set_can_focus() should set or unset according to their boolean parameters. (Ingo Brückl)
Fixed crash when loading some large files (Jean Bréfort)
Fix some more warnings (Hubert Figuière)
Bug 12045 - Make sure to not dereference nil. (Hubert Figuière)
Fix the detroy method of the widget as it was crashing. (Hubert Figuière)
Simple PieceTable tests to reveal the basic leaks. (Hubert Figuière)
Properly purge the fragments maintaining the ownerhsip rules: the PT. This suppress the leaks. Add an assert in a place where leakage opens but shouldn't happen. Make sure Node is not copyable (Hubert Figuière)
Fix memory leaks. UT_go_* usually return an allocated string. (check the code/doc) (Hubert Figuière)
Fix memory leaks from Pango (Hubert Figuière)
en_GB L10n from cjl (Chris Leonard)
Fulah (ff) L10n from Ibrahima SARR (Chris Leonard)
Fulah (ff) L10n from Ibrahima SARR (Chris Leonard)
fix layout bug for multi-column documents (Simon Larochelle)
Dutch (nl-NL) L10n from Pjotr Kan (Chris Leonard)
Warning fixes. (Hubert Figuière)
Build fix for GNU/Hurd. Patch by Svante Signell. (Hubert Figuière)
Fixed bug with incorrect TOC in case if document splitting is disabled (Volodymyr Rudyj)
Turn off debugmsg in fv_View::getHyperLinkRun(). Add files to svn:ignore lists. (Simon Larochelle)
Fix some frame related bugs described in Bug 13208 (comment 4) (Simon Larochelle)
Bug 13008 - Fix build with libpng 1.5. Patch by hanno AT gentoo. (Hubert Figuière)
Include config.h conditionally (Marc Maurer)
Compile with and *without* WITH_CHAMPLAIN (Ben Martin)
remove the optional debug block. (Ben Martin)
XP code for saveRectangle / restoreRectangle using cairo (Andrei Sfrent)
Removed saveRectangle / restoreRectangle from GR_UnixCairoGraphics; Unix uses xp implementation now (Andrei Sfrent)
Fixed a warning in gr_CairoGraphics.cpp (Andrei Sfrent)
Added UT_std_vector_freeall to ut_std_vector.h (Andrei Sfrent)
Use UT_std_vector_freeall() in GR_CairoGraphics destructor to free m_vSaveRectBuf (Andrei Sfrent)
Double buffering for rulers (flickering occured on win32) (Andrei Sfrent)
Fix xpm warning. (Hubert Figuière)
Bug 13256 - fix linker flags. Patch from Mageia. (Hubert Figuière)
Remove a #warning by fixing the bad cast. How did this ever worked? (Hubert Figuière)
Warning fixing. (Hubert Figuière)
Fix an unitialized variable leading to a possible bug (Hubert Figuière)
Fix some warning, debug only code (Hubert Figuière)
const-ness (Hubert Figuière)
IE_Exp_HTML_ListenerImpl is pure virtual. Fix the ensuing bugs. (Hubert Figuière)
Make sure that the gtk champlain wants to use and the gtk we want to use are version compatible. (Ben Martin)
Move UI stuff into other files as planned (Ben Martin)
and here are the new files / redistributed GUI functionality. (Ben Martin)
Fix champlain related tests (Jean Bréfort)
Cleaned configure.in from unuseful things (Jean Bréfort)
Fixed plugins dialog layout. [#13264] (Jean Bréfort)
Fix warnings (Hubert Figuière)
Bug 12734 - fix X11 include for XKeysym. (Hubert Figuière)
Bug 13265 - cairo-fc is only on cairo 1.10. (Hubert Figuière)
Bug 13262 - Fix the page background color (Hubert Figuière)
Fix some related bugs described in Bug 13208 (comment 4) (Simon Larochelle)
Fix frame related issue: text frames no longer move when changing the position mode. (Simon Larochelle)
Fix regression causing failure when building from source. This regression was introduced in r30629. Patch with support by Dmitry Smirnov, onlyjob member.fsf org. (Ingo Brückl)
First block inside a frame inherits properties from the parent block of the frame. (Simon Larochelle)
Fix style / indent (Hubert Figuière)
Fix a pango leak. (Hubert Figuière)
Fix some warnings (Hubert Figuière)
Minversion is 10.4 on MacOS as to be able to link (Hubert Figuière)
UT_Assert is no-op in DEBUG on Mac too (Hubert Figuière)
Regenerated PNG (Hubert Figuière)
Fix build following configure change: cairo-fc is gtk only (Hubert Figuière)
add virtual dtor (Hubert Figuière)
Removed unused variables (Volodymyr Rudyj)
Two minor changes in abi-extract.pl: 1. Prettify output by adding a line break after (improved) status message. 2. Don't call msgmerge if there is nothing to merge (i.e. avoid an error message). (Ingo Brückl)
Fix copy & cut for frames (Simon Larochelle)
Added MSVC-compilant warning message (Volodymyr Rudyj)
Replaced utf8_str with c_str in Win32-dependent code for std::string (Volodymyr Rudyj)
Changed XAP_Win32Toolbar_ControlFactory member type to AP_Win32Toolbar_ControlFactory (Volodymyr Rudyj)
Added std:: prefix before inserter (Volodymyr Rudyj)
Added missing include (Volodymyr Rudyj)
Fix const-ness. (Hubert Figuière)
Fix URL opening to honour Gnome settings in Gtk3 (Hubert Figuière)
Bug 13278 - Change gnome-office URL (Hubert Figuière)
This inlined and static stuff was just insane. This reduce bloat. (Hubert Figuière)
Fix open_url on Mac to use CoreFoundation launch services. (Hubert Figuière)
Bug 13285 - fix parameter type. (Hubert Figuière)
Fix some TOC related bugs: 1) Bug 9126: Incorrect page number reported in table of content when a heading is preceded by a page break (Simon Larochelle)
Fix constantness (Simon Larochelle)
Fixed bug 13240 with Kousik Kumar's patch (Volodymyr Rudyj)
constness (Hubert Figuière)
Fix small issues with rev. 30681-30682; move fillTOC from class fl_DocLayout to class fl_TOCLayout (Simon Larochelle)
Added virtual destructors to avoid possible memory leaks (Volodymyr Rudyj)
Added another one virtual destructor (Volodymyr Rudyj)
Rename duplicate string declaration. TB_Table is declared twice which renders one of them untranslatable. (Ingo Brückl)
Make MENU_STATUSLINE_TOOLS_REVISIONS translatable. In order to be translatable, it must not be an empty string even if it isn't used anywhere. Assign the space character instead which seems to be common for unused string declarations. (Ingo Brückl)
Bug 13276 - Fix GtkComboBox usage to be compatible with Gtk2 and Gtk3. (Hubert Figuière)
Fix footnotes and endnotes formatting dialog. The spin button controls were virtual invisible and unusable due to wrong packing. Enlarge them and make them uneditable and unfocusable, so that they can be used as designed. Additionally, remove the text label for the value and set the lower value to 1. (Ingo Brückl)
Fix a layout bug: adding a page to a section which is followed by another section (Simon Larochelle)
Fix bug 13286 (Simon Larochelle)
Fix bug: crash when deleting a section with a TOC (Simon Larochelle)
remove these PNG from the repository. they don't belong. (Hubert Figuière)
Fixed error with assignment to const std::string& (Volodymyr Rudyj)
Fixed error in HTML generation in case if document contain headings (Volodymyr Rudyj)
Added encoding information for the generated document (Volodymyr Rudyj)
Fixed bug in HTML exporter which caused memory being freed twice if non-default writer factory was supplied (Volodymyr Rudyj)
Fix compilation error after r30697. Undefined reference to loadRDFXML(boost::shared_ptr, std::string, std::string). (Ingo Brückl)
Improved generated HTML by avoiding creating empty 'class', 'style' and 'id' attributes (Volodymyr Rudyj)
Partly fix crashes with the Borders and Shading formatting dialog. This makes the dialog appear and usable, but doesn't fix all problems. The crash seemed to occur only on GTK2. (Ingo Brückl)
Add missing localization to Text Box dialog. (Ingo Brückl)
Add missing localizations to Borders and Shading dialog. (Ingo Brückl)
Change packing parameters for check buttons subscript and superscript. Don't divide extra space evenly between them, because this box contains less children than the box above which would result in a too spacious layout. (Ingo Brückl)
Set dialog window titles to maximum size. Don't variously limit the length which often cuts off a short document name. Additionally, remove pointless variable title_width and use sizeof() instead which is also safer. (Ingo Brückl)
Fix bug with Lists dialog on GTK2. Signal 'draw' is invalid for instance. (Ingo Brückl)
Prettify spin only controls. Change the width to 14 which makes the controls look more like normal spin button controls instead of looking clipped off. Additionally, remove property "width_request" from ui file where the request is performed in the cpp file anyway. (Ingo Brückl)
Fix some issues with frames: 1) initial layout of a document with a frame on a page which is different from that of its associated block 2) Frame on the last line on a page (Simon Larochelle)
Fix warnings + style (Hubert Figuière)
Bug 13102 - Change checkbox to radio button. Patch by Tanya Guza. (Hubert Figuière)
Fix toggle button images for the border lines. The images of the border line buttons (top/right/bottom/left) in the dialogs "Format -> Table", "Format -> Text Box" and "Format -> Borders and Shading" which represent the border line locations aren't discernible due to image scaling. (Ingo Brückl)
Fix toggle button states for the border lines. The border line buttons (top/right/bottom/left) in the dialogs "Format -> Table", "Format -> Text Box" and "Format -> Borders and Shading" behave strangely. After a line has been switched off and after opening the dialog a second time, the button for the line switched off has to be pressed twice in oder to switch the line on again. (Ingo Brückl)
Remove useless labels from dialog buttons. The GTK2 Table and the Borders & Shading formatting dialogs have labels for the border line buttons (top/right/bottom/left) which are removed when constructing the dialogs to replace them by images. The GTK2 Text Box dialog as well as the respective GTK3 dialogs don't have these labels nor the code to remove them. Remove labels and removal instructions to harmonize GTK2 and GTK3 code. (Ingo Brückl)
Prevent out-of-bounds array access of sBorderStyle. (Ingo Brückl)
Fix 13295: Misleading label in Table menu (Kousik ) (Marc Maurer)
Update the abiword.pot file (you can use ./update.pl --pot to do this!) (Marc Maurer)
Update all .po files (with abi-update-all.sh) to keep the strings in sync with abiword.pot (Marc Maurer)
Enable UT_WARNINGMSG. Currently, this is a no-op for the unix build. (Ingo Brückl)
Fixing bug 7435. Tested and applying the patch from Aaditya. (Kathiravelu Pradeeban)
Fix r30721 / bugzilla bug 13295. The patched menu item is used in two different menus - the table menu (Ingo Brückl)
Fallback of gtk_show_uri() fails. (Hubert Figuière)
Bug 13291 - Fix the encoding "guess": deprioritize LANGUAGE. (Hubert Figuière)
Bug 13277 - Delete table / row / column if first crashes: check that prev isn't NULL (Hubert Figuière)
Fix crash when applying background image to table (bug 13276). (Ingo Brückl)
Set width and height of the image when creating it from strux. Otherwise, width and height will always be reported to be zero. (Ingo Brückl)
Patch from Kousik for the rfe - running word count (http://bugzilla.abisource.com/show_bug.cgi?id=12862). (Kathiravelu Pradeeban)
.strings files generated with make (Simon Larochelle)
typos in comment (Hubert Figuière)
Bug 13284 - implement strptime() to allow building on Windows. (Hubert Figuière)
Fix po to string conversion to work if the builddir isnt the srcdir (Hubert Figuière)
Reverting the commit of the patch, http://bugzilla.abisource.com/show_bug.cgi?id=12862 (Kathiravelu Pradeeban)
but is of no use whatsoever. It has been put under version control in r30739. (Ingo Brückl)
header files and needs to be fixed due to the changes in r30739. (Ingo Brückl)
Improve GTK progress bar. Currently, the GTK progress bar might burst the status bar, because its default height might be too big (compared to the font used to render the status bar texts). Fix this by requesting a height that will make the progress bar fit into the status bar. (Ingo Brückl)
Fix crash with the Edit -> Go To dialog. This partly resolves bug 13276. (Ingo Brückl)
Remove ellipses from dialog titles. Dialog titles don't have ellipses, only menu entries. (Ingo Brückl)
Ignore tags file under version control. (Ingo Brückl)
[Cosmetic] Removing unnecessary comment at the start of a class. (Kathiravelu Pradeeban)
Revert removal of modelines. Don't do that. (Hubert Figuière)
Bug 12591: cut/paste changes background color of textbox (Simon Larochelle)
Insert Textbox was disabled in the Normal and Web Mode. Patch from Aaditya (id=13312), as this seems to be a bug. (Kathiravelu Pradeeban)
Bug 13284 - Compile C with C compiler on MacOS for strptime. (Hubert Figuière)
Patch from Vincent for Windows build issue (id=13313) (Kathiravelu Pradeeban)
Reverting the commit 30755. (Kathiravelu Pradeeban)
But 13276: Fix crash in border and shading. From Ingo. DO NOT COMMIT (Hubert Figuière)
Remove obsolete po scripts. Since r30739 we don't supply .strings files any longer, but build (Ingo Brückl)
Improve abi-update-all shell script. Simplify code and update .po files with --dist which prevents the .pot file from being built unnecessarily over and over again. (Ingo Brückl)
Prettify output of update.pl. Additionally, remove the generated message catalog output file which we don't need. (Ingo Brückl)
Prettify output to .strings files. (Ingo Brückl)
Enable xgettext flag hints. This is, because the xgettext heuristic might guess a wrong flag like c-format for a string that looks like a format specifier, but is not used in printf(). The syntax for such a hint is //xgettext: (i.e. a comment behind the string dcl). (Ingo Brückl)
Flag DLG_PageSetup_Percent as no-c-format for xgettext. This avoids a constant fuzziness for the string in the .po files. (Ingo Brückl)
Update German po file. (Ingo Brückl)
Prettify the Go To dialog Position layout. Increase table border width so that the widgets do not stick so close to the edge. (Ingo Brückl)
Remove an #if 0, MSVC needs it (patch by hub) (Marc Maurer)
Bug 13284 - Fix build on both Win and Linux: __P is unecessary /me think. (Hubert Figuière)
Cosmetic: Fix typo and change function names. These names seem to be common practice in all the other dialog files. (Ingo Brückl)
Enable non-UTF-8 encoded filenames. (G_FILENAME_ENCODING set to a specific character set name, not @locale.) (Ingo Brückl)
Enable non-ASCII, non-UTF-8 user names. If the user name is in the current locale, convert it. (Ingo Brückl)
Set user name as default author for new annotation. (Ingo Brückl)
Cosmetic: Adjust indent. (Ingo Brückl)
Fix bug: prevent some false match in function UT_String_removeProperty (match of strings 'frame-col-xpos:' and 'xpos:') (Simon Larochelle)
Bug 13320 - Remove the last bits of shave. Patch by Adrian Bunk (Hubert Figuière)
Bug 13311 - Fix ambiguous call in MSVC. (Hubert Figuière)
before the start of the selection has been affected as well. This closes bug #13290. (Ingo Brückl)
Cosmetic: Adjust indent. (Ingo Brückl)
Set value to page and line spin button without jumping there. The cursor will be moved every time the dialog is opened or activated else. (Ingo Brückl)
Improve Go To dialog usability. Rearrange the goto buttons. Put prev button left and jump button in the middle. (Ingo Brückl)
Fix the handling of static variables and static methods. With the current code there is no guarantee of initialization order. The static variables are private now and access is only possible by a public get function which controls the initialization of the variable. (Ingo Brückl)
slightly revised. This closes bug #13322. (Ingo Brückl)
Share common code. FV_View::cmdEditAnnotationWithDialog() and insertAnnotation() are using the same code in their bApply branches. Transfer the common code to new FV_View::insertAnnotationDescription(). (Ingo Brückl)
Simplify insertAnnotation(). (Ingo Brückl)
Cosmetic: Adjust indent. (Ingo Brückl)
Add missing GTK2 ui files for RDF support. This closes bug #13273. (Ingo Brückl)
Don't let title or author being selected when moving with the tab key. (Ingo Brückl)
Bug 13319 - Remove dolt. Patch by Adrian Bunk (Hubert Figuière)
Bug 13319 - Part 2: really remove dolt.m4 (Hubert Figuière)
Improve Go To dialog. Don't set page (and fixed line) number only when dialog window needs update, but also when the notebook page switches to the position page. Move page and line setting code to new AP_UnixDialog_Goto::updatePosition(). (Ingo Brückl)
Improve Go To dialog. Set (fixed, non-current) line number to 0 instead to 1 indicating that it doesn't really represent the line number the cursor is currently in. This will become obsolete as soon as we are able to get the current line number for the dialog. (Ingo Brückl)
Fix Go To dialog. Update page info field in status bar after jump to page or line. (Ingo Brückl)
Fix Go To dialog. Scroll page to ensure the cursor is visible on screen after jump to RDF link. (Ingo Brückl)
Fix Go To dialog. Scroll page to ensure the cursor is visible on screen after jump to bookmark. (Ingo Brückl)
Cosmetic: Rename variable. (Ingo Brückl)
Resize RDF Query and Editor dialogs. Decrease default size so that they aren't full-screen on displays with lower resolution. (Ingo Brückl)
Remove abiword.pot from version control. The .po files are being updated by calling the update.pl perl script which creates abiword.pot afresh. There is no need to have version control for this temporary auxiliary file. Additionally, update documentation. (Ingo Brückl)
Remove abiword.pot from version control. Remove file from repository. (Ingo Brückl)
Remove line number information from .po files. This information refers to the temporary header files and is of no use whatsoever. On the contrary, if there is a new string, most of the other strings (which didn't change at all) will be in different lines in the temporary files then, which makes the new line information find its way into the diff that thereby becomes unnecessarily cluttering and unnecessarily increases traffic to and from the repository server. Additionally, fix file extension (.h.h to .h) in file name information for cosmetic reasons. (Ingo Brückl)
Fix syntax error in en-GB language file. (Ingo Brückl)
Fix invalid multibyte sequence in ko language file. (Ingo Brückl)
Update all .po files. (Ingo Brückl)
Remove unused variable and unnecessary call. According to Aaditya (see bug #7435) we don't need to (Ingo Brückl)
Fix GTK2 build. Remove property unknown until GTK 2.20 from GTK2 .ui file. (Ingo Brückl)
Remove junk from RDF Query dialog. All this is unused (and even part of other dialogs). (Ingo Brückl)
Remove junk from RDF Editor dialog. All this is unused (and even part of other dialogs). Additionally, remove localization of text for removed text view "query". (Ingo Brückl)
Improve RDF Editor dialog. Add image from stock to copy button which is the only one without image. (Ingo Brückl)
Remove include of unused xpm. This fixes the compiler warning: 'tb_semitem_select_first_xpm' defined but not used (Ingo Brückl)
Revise r30836. Avoid using UT_UTF8String and stringstream. (Ingo Brückl)
Revise r30838. Avoid using UT_String. Additionally, rename variable. (Ingo Brückl)
Remove pointless addStatement(). There is no code in AP_UnixDialog_RDFQuery::addStatement() to display any PD_RDFStatement value. Since without redland RDF library RDFQuery is pointless anyway, set RDFQuery execution buttons insensitive instead. (Ingo Brückl)
Change cerr messages into UT_DEBUGMSG() in RDF Editor and Query code. (Ingo Brückl)
Bug 12591: cut/paste changes background color of textbox (Simon Larochelle)
Use bit operators (patch by Ingo Brückl) (Simon Larochelle)
Don't return NULL as a value of type std::string. This might cause the std::string constructor to throw an exception. (Ingo Brückl)
Remove unnecessary initialization. (Ingo Brückl)
Improve Semantic Item Insert Reference dialog usability. Don't create a toplevel node if there will be no child items. Additionally, prettify the toplevel node name. (Ingo Brückl)
Cosmetic: Adjust indent. (Ingo Brückl)
Improve RDF usability. Set the menu entry RDF_SEMITEM_CREATEREF insensitive without redland RDF library since it will be pointless then anyway. (Ingo Brückl)
Remove useless ap_GetState_RDFAnchorOK, always returning EV_MIS_ZERO. In r30841, RDFQuery execution buttons have been set insensitive (Ingo Brückl)
Improve RDF Editor usability. Since without redland RDF library RDF import and export are pointless anyway, set RDF import and export menu items insensitive. (Ingo Brückl)
Improve RDF usability. Set the menu entry RDF_SEMITEM_NEW_CONTACT_FROM_FILE insensitive without libebook and libecal (Evolution Data Server) since it will be pointless then anyway. (Ingo Brückl)
Fix bug with strings for RDF menu labels. There is no need for three dots in the string declaration. This is done by setting action bRaisesDialog for the menu ID. Additionally, add bRaisesDialog for menu ID RDF_SEMITEM_CREATEREF. (Ingo Brückl)
Fix spelling. This closes bug #13337. (Ingo Brückl)
Remove menu entry RDF Advanced for non-debug builds. Everything under this menu entry uses UT_DEBUGMSG for its output. Therefore it doesn't make sense to have it in a non-debug build. Additionally, compile more debug-only stuff in pd_DocumentRDF conditionally. (Ingo Brückl)
Fix compiler warnings with libical. warning: 'void addCalPropSZ()' defined but not used warning: unused parameter 'szEncoding' warning: 'std::string tostr()' defined but not used (Ingo Brückl)
Add missing icons for RDF toolbar items. Additionally, remove unused tb_semitem_select_first; tb_semitem_this is used instead. (Ingo Brückl)
Move RDF toolbar items to toolbar "Extra". These are not that important and could easily confuse users (primarily since the revision toolbar items are next to them). (Ingo Brückl)
Fix a format warning (debug only) (Hubert Figuière)
Fix the Borders and Shading dialog. It crashed on GTK2. This finally resolves bug 13276. (Ingo Brückl)
Update man page. Update date and version, fix formatting and replace UTF-8 right single quotation mark by ASCII apostrophe. (Ingo Brückl)
Avoid CamelCase naming for user settings. Since there is no AbiSuite package, don't use this term. This closes bug 11452. Additionally, update man page. (Ingo Brückl)
than in all the other tb_semitem icons. This closes bug 13339. (Ingo Brückl)
Fix the Semantic Stylesheets dialog .ui file for GTK2. The combo boxes were defined wrongly and caused a crash when selecting an entry. Additionally, remove default stuff. (Ingo Brückl)
Implement gtk_combo_box_get_active_id() for GTK2. This isn't exactly what gtk_combo_box_get_active_id() does on GTK3, but it's close enough for our purpose and allows us to identify the combo box entry selected, i.e. there will be no difference for the user between GTK3 and GTK2 builds. (Ingo Brückl)
Remove unused variables in Semantic Stylesheets Dialog. (Ingo Brückl)
Remove unused ap_EditMethods function. (Ingo Brückl)
The icon list should be in alphabetical order (Simon Larochelle)
Fix RDF stylesheet strings for menu items and status bar. One was wrong, one had a different spelling than the other ones, some were incomplete, and one had a wrong symbolic ID. Additionally, avoid use of ampersand. (Ingo Brückl)
Prettify appearance of Semantic Stylesheets dialog. The explanation text now uses the full width of the dialog window, but keeps a neat distance from the border as well as from the combo boxes. (Ingo Brückl)
Remove unused icon. (Ingo Brückl)
but at least not as ugly as the existing ones. Anyone with artistic skills volunteering? This closes bug 13340. (Ingo Brückl)
and won't be bothered by the change. This is an improvement to r30873 and closes bug 11452. (Ingo Brückl)
Define RDF semantic stylesheets as symbolic constants. (Ingo Brückl)
Fix compiler warnings about unused items. These are only used in debug mode. (Ingo Brückl)
Allow usage of font family 'Standard Symbols L'. Don't unconditionally disable it by commenting the code. Check whether libwmf has installed the font and if so, use it. (Ingo Brückl)
and are being considered more as normal text. This closes bug 8653. (Ingo Brückl)
Don't check runtime ability at compile time. Replace the check with an option. This fixes r30900. (Ingo Brückl)
Prettify appearance of RDF stylesheet dialog. Give labels and buttons a little bit more space and align labels to the left. (Ingo Brückl)
Rename a few RDF strings, IDs and function names. This is for consistency reasons and to ease understanding, because similar things should have similar names. Rename string "Show RDF for cursor position" "Query RDF for cursor position" (because a query will be executed). Rename string "Stylesheet Settings" "Settings" (because it is already in main menu "Stylesheet"). Rename string "Reapply Current" "Apply Current" (because nothing is reapplied, but simply newly applied) and rename ID RDF_SEMITEM_STYLESHEET_REAPPLY RDF_SEMITEM_STYLESHEET_APPLY. The related function already had the correct name (rdfApplyCurrentStyleSheet). Rename string "Show RDF" "Edit RDF" (because the editor will be called) and rename ID RDFANCHOR_SHOW_TRIPLES RDFANCHOR_EDIT_TRIPLES as well as the related function rdfAnchorShowTriples rdfAnchorEditTriples. Rename string "SPARQL Query" "Query RDF" (because a fixed query will be executed) and rename ID RDFANCHOR_SPARQL RDFANCHOR_QUERY as well as the related function rdfAnchorSPARQL rdfAnchorQuery. Additionally, shift ampersand for menu item "Edit Semantic Items". (Ingo Brückl)
Rename icon semitem_stylesheet_reflow semitem_stylesheet_apply. Rename all SEMITEM_STYLESHEET_REFLOW IDs as well. This is for consistency reasons and to ease understanding, because most of the references to these are already named "apply" instead of "reflow". Additionally, change and fix former SEMITEM_STYLESHEET_REFLOW strings. (Ingo Brückl)
Fix clang warning. (Hubert Figuière)
Fix an overloaded method warning from clang. (Hubert Figuière)
Slightly change color. (Ingo Brückl)
Remove pointless script. We are no longer supplying .strings files. In addition, update.pl is responsible for this job. (Ingo Brückl)
Fix ui-extract script. Don't extract commented out declarations. Additionally, allow whitespace after id. (Ingo Brückl)
Fix bug in ui-backport.pl. Don't drop last msgstr! Cosmetic: Add period. (Ingo Brückl)
Silence execution. (Ingo Brückl)
Fix dumpstrings script. Build date according to ISO 8601. Use same regex for extraction as ui-extract.pl does. Find .strings files in ./po now. Print out the languages sortedly. Don't cross-compare all languages, because en-US is the reference (Ingo Brückl)
Clean up dumpstrings script. Remove unsed code. Prettify output. (Ingo Brückl)
Fix name. (Ingo Brückl)
Rename two RDF toolbar icons. This is for consistency reasons. It matches the other RDF toolbar icons and the IDs used in context of these. (Ingo Brückl)
Fix bug 12591: values of frame properties change during copy/paste add RTF keyword abiframeprops with the complete property string as data (Simon Larochelle)
Afrikaans L10n fixes (Chris Leonard)
Amharic L10n fixes (Chris Leonard)
Arabic L10n fixes (Chris Leonard)
Dutch (nl_NL) L10n from Pjotr Kan (Chris Leonard)
Update some .po files. (Ingo Brückl)
Afrikaans L10n fixes (Chris Leonard)
Amharic L10n fixes (Chris Leonard)
Arabic L10n fixes (Chris Leonard)
Dutch L10n fixes (Chris Leonard)
Slovenian (sl_SI) L10n from Martin Srebotnjak (Chris Leonard)
Songhay (son) L10n from Mohomodou Houssouba (Chris Leonard)
Dutch (nl-NL) L10n from Pjotr Kan (Chris Leonard)
Add a reflow to RDF Stylesheet Disassociate. The user won't see any effect otherwise. (Ingo Brückl)
Explain menu entry "Disassociate". (Ingo Brückl)
Automatically add msgid bugs address to .po files. (Ingo Brückl)
Add missing localization to RDF Editor. (Ingo Brückl)
Prettify appearance of RDF Editor dialog. Give label a little bit more space and align label to the left. (Ingo Brückl)
Fix RDF Editor's combo box entries and improve usability. Only add separate xmlids entries if there was a combined entry. Without a combined entry (i.e. with only one entry) this single entry would otherwise appear twice. Moreover, for a single entry we don't need a combo box at all, so don't show it in that case. (Ingo Brückl)
Cosmetic: Adjust indent. (Ingo Brückl)
Fix bug with setRestrictedXMLID(). For a single xmlid no triples were displayed. (Ingo Brückl)
Prettify appearance of RDF Editor dialog. Add border-width property to children. (Ingo Brückl)
Fix German language file. (Ingo Brückl)
Fix bug 13269: undo fails after insert footnte/endnote (Simon Larochelle)
Slovenian (sl_SI) L10n from Martin Srebotnjak (Chris Leonard)
Fix bug in getStylesheetName(). The pointer (combo box entry text) may be NULL if no entry has been selected. (Ingo Brückl)
Fix debug message. (Ingo Brückl)
Allow applying a semantic stylesheet without reflow. This is a prerequisite to be able to set a current stylesheet that can be applied later. (Ingo Brückl)
Cosmetic: Adjust indent. (Ingo Brückl)
Fix stylesheet settings dialog. Selecting a stylesheet and pressing OK didn't have any effect so far. It now sets the current stylesheet (as promised in the explanation text). (Ingo Brückl)
Fix explanation text of stylesheet settings dialog. Distinguish between "current" (i.e. set) and "default" (i.e. fallback) stylesheet. (Ingo Brückl)
Don't suddenly use a different expression for "Semantic Item". (Ingo Brückl)
Don't use string constant to name the stylesheet. Use the symbolic constant instead. (Ingo Brückl)
Improve usability of Semantic Stylesheets dialog. Show the current stylesheets by activating them in the combo boxes. (Ingo Brückl)
Simplify semantic stylesheets code. Replace three almost identical callback functions by one. (Ingo Brückl)
Danish (da) L10n from aputsiaq (Chris Leonard)
Dutch L10n fixes (Chris Leonard)
Arabic L10n fixes (Chris Leonard)
Slovenian (sl_SI) L10n from Martin Srebotnjak (Chris Leonard)
British English (en_GB) L10n from Chris Leonard (Chris Leonard)
Welsh (cy_GB) L10n from Rhoslyn Prys (Chris Leonard)
Amharic L10n fixes (Chris Leonard)
Afrikaans L10n fixes (Chris Leonard)
Songhay (son) L10n from Mohomodou Houssouba (Chris Leonard)
Remove model definition from .ui files. This is pointless, because it is set in the .cpp source anyway (and with a different column layout). (Ingo Brückl)
Remove model definition from .ui files. It is pointless, because it is set in the .cpp source anyway (and with a different column layout). (Ingo Brückl)
Remove renderer definition from GTK2 .ui file. This is needless, because a GtkComboBoxEntry already comes with a text renderer. (Ingo Brückl)
Remove the text column definition from the .cpp file. Put it into the .ui files instead. Moreover, a GtkComboBox with entry is only defined for GTK3 builds, so it is wrong to set entry-text-column starting with version 2.24. The GTK2 build uses a GtkComboBoxEntry which requires text-column to be set. This fixes a crash with pre-2.24 GTK builds when selecting an entry from the combo boxes. (Ingo Brückl)
Let defined image appear on button. (Ingo Brückl)
Set a minimum width for the find button. It is too small in the find dialog and far larger in the replace dialog else. (Ingo Brückl)
Dutch L10n from Pjotr Kan (Chris Leonard)
Fix bug 9325: font formatting of text surrounding footnotes and endnotes (Simon Larochelle)
Spanish L10n fixes (Chris Leonard)
Czech L10n fixes (Chris Leonard)
Remove defaults from GTK2 .ui file. (Ingo Brückl)
Clean up GTK2 .ui file. Let defined image appear on button. Sort properties. Comment translatable texts. Use proper constant names. (Ingo Brückl)
Wolof L10n fixes (Chris Leonard)
Vietnamese L10n fixes (Chris Leonard)
Quechua (Cusco-Collao) L10n upload (Chris Leonard)
Yiddish L10n fixes (Chris Leonard)
Zulu L10n upload (Chris Leonard)
Add new languages. (Ingo Brückl)
Clean up GTK2 .ui file. Add image to button. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Fix layout bug. Give types list its maximum height. (Ingo Brückl)
Fix layout bug. Give list its maximum height. (Ingo Brückl)
Add image to button. (Ingo Brückl)
Fix invalid structure. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. (Ingo Brückl)
Add image to button. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Add image to button. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Remove unneeded definitions. Additionally, remove separator. (Ingo Brückl)
Remove defaults from GTK2 .ui files. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Remove unneeded definitions. (Ingo Brückl)
Add image to button. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Fix bug 13185: crash when erasing a line (Simon Larochelle)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Additionally, translate OK button by using a stock ID. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Let defined image appear on button. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui files. Sort properties. Remove unneeded definitions. (Ingo Brückl)
German L10n fixes (Chris Leonard)
Bulgarian L10n fixes (Chris Leonard)
Ukranian L10n fixes (Chris Leonard)
Turkish L10n fixes (Chris Leonard)
Tamil L10n fixes (Chris Leonard)
clang warning: fix method overloading. (Hubert Figuière)
Fix a cast error found by clang (Hubert Figuière)
Return NULL instead of false. Found by clang. (Hubert Figuière)
non-const override for const version. Found by clang. (Hubert Figuière)
Fix self assign found by clang (Hubert Figuière)
with -Wextra in clang). See bug 13350 to reenable it. (Hubert Figuière)
Fix extra parenthesis (clang warning) (Hubert Figuière)
Fix self assignment (clang warning) (Hubert Figuière)
Nepali L10n fixes (Chris Leonard)
Remove defaults from GTK2 .ui files. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Add image to button. Sort properties. Remove unneeded definitions. Additionally, tag formula as non-translatable (just as a reminder, doesn't have an effect). (Ingo Brückl)
Fix warnings: comparison of signed and unsigned integers (Simon Larochelle)
Remove defaults from GTK2 .ui files. Note: These files aren't yet used. (Ingo Brückl)
Disable RDF context menu. It isn't yet implemented. (Ingo Brückl)
Disable toolbar entry. It isn't yet implemented. (Ingo Brückl)
Disable RDF context menu. It isn't available without libebook and libecal (Evolution Data Server). (Ingo Brückl)
Cosmetic: Don't put statement on the same line. (Ingo Brückl)
Clean up GTK2 .ui file. Add image to button. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Remove pointless properties. The label text is set without markup. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. Additionally, add shadow_type to GtkScrolledWindow. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. Additionally, add shadow_type to GtkScrolledWindow and improve some spacings. (Ingo Brückl)
Use setLabelMarkup() and restore properties. This seems to be common practice for this type of dialogs. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Fix localization bug. (Ingo Brückl)
Fix wrong button. The button accepts the selection. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Remove unneeded definitions. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Improve Plugin Manager dialog layout. Increase height and reduce width. Add image to button. (Ingo Brückl)
Fix bug 10802: check that no section is empty when loading a document (Simon Larochelle)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. (Ingo Brückl)
Improve Zoom dialog layout. Add some spacing. (Ingo Brückl)
Clean up GTK2 .ui file. Add image to button. Sort properties. Use proper constant names. Remove unneeded definitions. (Ingo Brückl)
Chiga L10n upload (Chris Leonard)
Breton L10n from Denis Arnaud (Chris Leonard)
Chinese (China) L10n fixes (Chris Leonard)
Swiss German L10n fixes (Chris Leonard)
Swedish L10n fixes (Chris Leonard)
Conform localization method. Actually, almost all our widgets contain a label and we localize it without removing. (Ingo Brückl)
Clean up GTK2 .ui file. Sort properties. Use proper constant names. Remove unneeded definitions. Additionally, remove adjustments, because they are created in the .cpp file, and the separator. (Ingo Brückl)
Remove one of two almost identical .ui files. Add different handling (of only one button) to the .cpp file. Additionally, remove unused code. (Ingo Brückl)
Improve Stylist dialog layout. Add shadow_type to GtkScrolledWindow. (Ingo Brückl)
Prettify dialogs. Remove separator. (Ingo Brückl)
Add new language. (Ingo Brückl)
Improve usage information of update.pl script. (Ingo Brückl)
Update German po file. (Ingo Brückl)
Update option --maintain of update.pl script. (Ingo Brückl)
Tag strings as "not translatable". This is just for cosmetic reasons (and a reminder). (Ingo Brückl)
Tag strings as "not translatable". This is just for cosmetic reasons (and a reminder). (Ingo Brückl)
Fix wrong usage of setLabelMarkup(). These labels are simple texts, no markup included. (Ingo Brückl)
Fix wrong usage of setLabelMarkup(). These labels are simple texts, no markup included. (Ingo Brückl)
Enhance Latex dialog. (Ingo Brückl)
Welsh (cy_GB) L10n from Rhoslyn Prys (Chris Leonard)
Polish L10n fixes (Chris Leonard)
Slovak L10n fixes (Chris Leonard)
sr@latin L10n fixes from cjl (Kathiravelu Pradeeban)
Add mnemonic to top level menu item RDF. (Ingo Brückl)
Fix bug 13296: copy/paste of LibreOffice tables (Simon Larochelle)
Fix bugs 13304 & 13305: table dialog issues (Simon Larochelle)
Install icon in right directory. Additionally, make the directory configurable and rename icon. This closes bug 11510. (Ingo Brückl)
Fix trivial crasher. (Jean Bréfort)
Fix some labels used as caption. (Ingo Brückl)
Scale all images when using cairo (GTK) (Simon Larochelle)
Fix bug 13356: numerical props should be encoded using english locale (Simon Larochelle)
Luganda L10n upload (Chris Leonard)
Esperanto L10n fixes (Chris Leonard)
Croatian L10n fixes (Chris Leonard)
Swahii L10n upload (Chris Leonard)
Acholi L10n upload (Chris Leonard)
Bahasa Melayu L10n fixes (Chris Leonard)
Galician L10n fixes (Chris Leonard)
Portuguese (pt_PT) L10n fixes (Chris Leonard)
Greek L10n fixes (Chris Leonard)
Estonian L10n fixes (Chris Leonard)
Thai L10n upload (Chris Leonard)
Hungarian L10n fixes (Chris Leonard)
Akan (Twi Asante) L10n upload (Chris Leonard)
Danish (da) L10n from aputsiaq (Chris Leonard)
Spanish L10n fixes (Chris Leonard)
Add new languages. (Ingo Brückl)
Fix r31145. Variable $prefix isn't set until the end of the configure script. (Ingo Brückl)
Galician L10n from Miguel Bouzada (Chris Leonard)
French L10n fixes (Chris Leonard)
Only check for matching versions if champlain is actually present. Additionally, change some message texts cosmetically. (Ingo Brückl)
Khmer L10n upload (Chris Leonard)
Mandinka L10n upload (Chris Leonard)
Basque L10n fixes (Chris Leonard)
Pashto L10n upload (Chris Leonard)
Brazilian Portuguese L10n fixes (Chris Leonard)
Norwegian Bokmal L10n fixes (Chris Leonard)
Albanian L10n fixes (Chris Leonard)
Sardinian L10n fixes (Chris Leonard)
Serbian L10n fixes (Chris Leonard)
Norwegian Nynorsk L10n fixes (Chris Leonard)
Russian L10n fixes (Chris Leonard)
Romanian L10n fixes (Chris Leonard)
Add new language. (Ingo Brückl)
Cosmetic: Arrange alphabetically. (Ingo Brückl)
Add missing template. Additionally, arrange alphabetically. (Ingo Brückl)
Dutch L10n from Pjotr Kan (Chris Leonard)
Malagasy L10n fixes (Chris Leonard)
Macedonian L10n fixes (Chris Leonard)
Lojban L10n upload (Chris Leonard)
Lithuanian L10n fixes (Chris Leonard)
Spanish L10n fixes (Chris Leonard)
Chinese (China) L10n ffrom lite (Chris Leonard)
Korean L10n fixes (Chris Leonard)
Indonesian L10n fixes (Chris Leonard)
Latvian L10n fixes (Chris Leonard)
Italian L10n fixes (Chris Leonard)
Japanese L10n fixes (Chris Leonard)
Kurdish L10n fixes (Chris Leonard)
Zulu L10n fixes (Chris Leonard)
Irish L10n fixes (Chris Leonard)
Kazakh L10n fixes (Chris Leonard)
Dutch L10n from Pjotr Kan (Chris Leonard)
Bamanakan L10n upload (Chris Leonard)
Finnish L10n fixes (Chris Leonard)
Fulah L10n fixes (Chris Leonard)
Belarusian L10n fixes (Chris Leonard)
Chinese (Hong Kong) L10n fixes (Chris Leonard)
Catalan L10n fixes (Chris Leonard)
Chinese (Taiwan) L10n fixes (Chris Leonard)
Belarusian-latin L10n fixes (Chris Leonard)
Asturian L10n fixes (Chris Leonard)
Hebrew L10n fixes (Chris Leonard)
Clear character style with ctrl-space (in addition to font properties) Fix bugs in FV_View::resetCharCharFormat and in pt_PT_InsertSpan (Simon Larochelle)
Chinese (Taiwan) L10n from YuanChao (Chris Leonard)
Albanian L10n from Besnik Bleta (Chris Leonard)
Galician L10n from Miguel Bouzada (Chris Leonard)
Fulah L10n from Ibrahima Saar (Chris Leonard)
Fix "=+" to "+=" (Martin Sevior)
Slovenian (sl_SI) L10n from Martin Srebotnjak (Chris Leonard)
Remove UT_String (Hubert Figuière)
Spanish L10n from F Serrador (Chris Leonard)
Changed tableLayout to accomodate header information (tnkk)
Revert wrong commit (tnkk)
Revise the language descriptions. Don't add a country (in parentheses) if there is only one language entry (and it's the main dialect). If there is a specification in parentheses, refer to the country code rather than to geographical or descriptive information. Add other information such as variant information solely by using a comma. (Ingo Brückl)
Fix two language descriptions. (Ingo Brückl)
Fix bug and minor issue in encoding descriptions. (Ingo Brückl)
Improve Encoding dialog layout. (Ingo Brückl)
Improve Language dialog layout. (Ingo Brückl)
Fix a dialog caption. (Ingo Brückl)
Dutch L10n from Pjotr Kan (Chris Leonard)
Nepali L10n fixes (Chris Leonard)
Fulah L10n from Ibrahima Saar (Chris Leonard)
Example script to create a changelog for a particual release. Part of the release process I will share in a bit. (Marc Maurer)
Slovenian (sl_SI) L10n from Martin Srebotnjak (Chris Leonard)
Slovak L10n from Jaroslav Ryník (Chris Leonard)
Remove separator bar above buttons in message boxes. This is default in GTK+ 3 (the option has been removed). (Ingo Brückl)
Remove some unnecessary ellipses. (Ingo Brückl)
Fulah L10n from Ibrahima Saar (Chris Leonard)
Slovak L10n from Jaroslav Ryník (Chris Leonard)
Chinese (Hong Kong) L10n from wwycheuk (Chris Leonard)
Chinese (Taiwan) L10n from wwycheuk (Chris Leonard)
Chinese (China) L10n from lite (Chris Leonard)
Welsh (cy_GB) L10n from Rhoslyn Prys (Chris Leonard)
Galician L10n from Miguel Bouzada (Chris Leonard)
Fix spacing in Latex dialog. (Ingo Brückl)
Fix minor issues in Encoding dialog. (Ingo Brückl)
Fix dialog captions. (Ingo Brückl)
Center all modal windows on their parent. Additionally, fix minor issues like adjusting the size and, usually, removing the separator bar above buttons (for GTK2 only). (Ingo Brückl)
Fix dialog labels and captions. (Ingo Brückl)
Center all modal windows on their parent. Additionally, fix minor issues like spacing and resizing and, usually, removing the separator bar above buttons (for GTK2 only). (Ingo Brückl)
Remove pointless call. The window position is specified in the .ui files. (Ingo Brückl)
Center modal window on its parent. Additionally, fix a minor spacing issue. (Ingo Brückl)
Center modal window on its parent. Additionally, fix minor spacing issues. (Ingo Brückl)
Position settings windows at the mouse position. This allows immediate handling and improves usability. Additionally, fix minor spacing issues. (Ingo Brückl)
Fix window position for Zoom dialog. It's modal. (Ingo Brückl)
Remove GtkDialog property "visible" (set to True) from GTK2 .ui files. Setting this property prevents (at least on GTK2) the XSizeHints flag PPosition for the window manager from getting set which is done by GTK when changing the property "window-position". As a result, the window won't be properly positioned. (Ingo Brückl)
Fix breaking of tables (Simon Larochelle)
Czech L10n fixes, correct encoding conversion errors (Chris Leonard)
Danish (da) L10n from aputsiaq (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Punctuation tweaks (Chris Leonard)
Remove GtkDialog property "modal" (set to True) from GTK2 .ui files. This is pointless, because it's coded whether a dialog runs modally or not. (Ingo Brückl)
Fix some captions in dialogs. (Ingo Brückl)
Adjust Columns dialog layout to common style. (Ingo Brückl)
Adjust Styles (new/modify) dialog layout to common style. (Ingo Brückl)
Center modal Tab dialog on its parent. Additionally, fix minor spacing issue and use normal label for lbDefaultTab. (Ingo Brückl)
Position dialog at the mouse position. This allows immediate handling and improves usability. Additionally, fix minor spacing issue. (Ingo Brückl)
Position Stylist dialog at the mouse position. This allows immediate handling and improves usability. Additionally, fix minor spacing issue. (Ingo Brückl)
Center modal Styles dialog on its parent. Additionally, fix minor spacing and shadow issue. (Ingo Brückl)
Center modal Spell dialog on its parent. (Ingo Brückl)
Position Semantic Stylesheets dialog at the mouse position. This allows immediate handling and improves usability. (Ingo Brückl)
Fix minor spacing issue. (Ingo Brückl)
Fix minor spacing issue. (Ingo Brückl)
Remove the separator bar above buttons (for GTK2 only). (Ingo Brückl)
Center modal Page Setup dialog on its parent. (Ingo Brückl)
Center modal Page Numbers dialog on its parent. Additionally, fix minor spacing issue. (Ingo Brückl)
Center modal Options ColorSel dialog on its parent. (Ingo Brückl)
Center modal New dialog on its parent. (Ingo Brückl)
Position Mail Merge dialog at the mouse position. This allows immediate handling and improves usability. (Ingo Brückl)
Center modal HdrFtr dialog on its parent. (Ingo Brückl)
Position Goto dialog at the mouse position. This allows immediate handling and improves usability. Additionally, fix minor spacing issue. (Ingo Brückl)
Position Format TOC dialog at the mouse position. This allows immediate handling and improves usability. (Ingo Brückl)
Position Format Table dialog at the mouse position. This allows immediate handling and improves usability. (Ingo Brückl)
Position Format Frame dialog at the mouse position. This allows immediate handling and improves usability. (Ingo Brückl)
Center modal Break dialog on its parent. Additionally, fix minor spacing issue. (Ingo Brückl)
Position Border Shading dialog at the mouse position. This allows immediate handling and improves usability. Additionally, fix minor expanding issue. (Ingo Brückl)
Fix bug in Goto dialog .ui file. There were no scrolled windows for RDF links and annotations, making the dialog window grow with the number of entries. Please port to GTK3 .ui file. (Ingo Brückl)
Polish L10n from marcinu (Chris Leonard)
Hungarian L10n from Gabor Kelemen (Chris Leonard)
Bug 12264 - Revert trunk@30914 (Hubert Figuière)
Nepali L10n from Niraj Paudel (Chris Leonard)
Set default width for Stylist dialog. (Ingo Brückl)
Make mouse wheel scrolling work (gtk backend). (Jean Bréfort)
Fix bug 7274: set caret position correctly after deleting a footnote (Simon Larochelle)
Fix bug 12496: when applying style to a block, do not remove char styles. Also do not touch embedded structures and only remove span properties that were unnecessary with the old style. (Simon Larochelle)
Fix bug 8187: Access of image dialog through top and context menus (Simon Larochelle)
Fix warning (Simon Larochelle)
Replace assert by function exit (Simon Larochelle)
Fix assert firing when opening style dialog (Simon Larochelle)
Initialize correctly a variable-size array (fix rev. 31392) (Simon Larochelle)
Bug 13323 - Fix export for UT_strptime on Windows. (Hubert Figuière)
Add Bamanakan language (Simon Larochelle)
Cosmetic: Remove trailing whitespace from po perl scripts. (Ingo Brückl)
Restrict unsafe constructs in update.pl perl script. (Ingo Brückl)
Add languages to the UT_LangRecord table; also realign table (cosmetic) (Simon Larochelle)
Correct spelling; arrange list in alphabetical order (Chris Leonard, Simon Larochelle)
Arrange English language entries alphabetically. There is no reason to have the English entries at the top, because the whole language name table will be sorted in the UT_Language constructor anyway. Additionally, add some information on how to add languages. (Ingo Brückl)
Fix some warning of unhandled cases in switch, unused variable or format. (Hubert Figuière)
Don't crash if inserting a footnote / endnote in an empty document. Also get rid of some UT_String right there (Hubert Figuière)
Remove a const_cast (Hubert Figuière)
The Format Footnote dialog didn't allow changing the initial values. Gtk3 only. (Hubert Figuière)
Bug 13361 - Gtk 3.4 warnings removal (Hubert Figuière)
cleanup the code of unecessary cast (Hubert Figuière)
Don't use "slots" as an identifier. (Hubert Figuière)
Remove unused variable. It's redundant after r31496. (Ingo Brückl)
Fix compiler warnings. Tag arguments only needed in debug mode. (Ingo Brückl)
Add introspection support for the Gtk-3 build. Needs --enable-introspection=yes (or auto) to work. (Jean Bréfort)
Fix introspection warnings. (Jean Bréfort)
Enhance introspection build. (Jean Bréfort)
Fix warning: remove unused code since rev. 14457 (Simon Larochelle)
Fix warnings: unused variables (Simon Larochelle)
Fix breaking of multi-page TOCs (partial fix of bug 12884). (Simon Larochelle)
Fix regression from rev. 31392 (Simon Larochelle)
Fix bug 13385: text selection with shift-page up (Simon Larochelle)
Fix bug 13365: new line moves vertical scrolling to top of document (Simon Larochelle)
Fix labels. Use colon with labels for entry fields, selection lists and such. (Ingo Brückl)
Fix labels. Use colon with labels for entry fields, selection lists and such. (Ingo Brückl)
Fix spacing in Options dialog. (Ingo Brückl)
Improve Insert Symbol dialog. Position dialog at the mouse position. Reduce height of font selector combo box. Add some spacing. Add (stock) image to button. Remove separator (GTK2 only). (Ingo Brückl)
Rearrange date and time formats. Order them: date, time, date and time. Arrange international formats before American ones. (Ingo Brückl)
Add some non-US date and time formats. (Ingo Brückl)
Improve Insert Bookmark dialog. Add (stock) image to button. (Ingo Brückl)
Improve Insert XMLID dialog. Add (stock) image to button. (Ingo Brückl)
Fix labels. Use colon with labels for entry fields, selection lists and such. (Ingo Brückl)
Improve Exit Message Box dialog. Add (stock) image to button. (Ingo Brückl)
Fix the Insert XMLID (RDF link) dialog. As long as the combo box is misused as a simple entry field, because the XMLIDs won't be collected for the dialog at all, choose a GtkEntry instead. This is less confusing to the user and more user-friendly. Comment the GtkComboBox code as well as pointless code. Additionally, declare m_combo a GtkWidget pointer to avoid casts. (Ingo Brückl)
Remove separator from Insert dialogs (GTK2 only). (Ingo Brückl)
Bug 13382 - revert changes from r29670 (and another cosmetic revision). Suggested by Simon Larochelle. (Hubert Figuière)
Bug 13361 - More Gtk 3.4 warnings removal: gtk_widget_requested_size() (Hubert Figuière)
Fix some const_cast abuse. (Hubert Figuière)
Bug 13361 - Fix warning of deprecation in Pango with fallback for Pango < 1.22 (Hubert Figuière)
Remove dead code in ut_misc. (Hubert Figuière)
Move the HAVE_INTROSPECTION out of the conditionnal, or configure will fail. (Hubert Figuière)
ut_unixTimer shouldn't include Gtk but Glib (unless on Cocoa) (Hubert Figuière)
Improve Clip Art dialog. Remove separator (GTK2 only) and fix punctuation in labels. (Ingo Brückl)
Fix wrong field label descriptions. (Ingo Brückl)
Rearrange date and time fields. Order them: date, time, special ones. Arrange locale formats before US onces. (Ingo Brückl)
Rearrange application fields. Order more important fields first. (Ingo Brückl)
Fix document field names. Use the same names as in the Document Properties dialog. (Ingo Brückl)
Rearrange document fields. Order them as they appear in the Document Properties dialog. (Ingo Brückl)
Rearrange time fields. Arrange important fields in front. (Ingo Brückl)
Reposition Paragraphs line in Word Count dialog. Put it to a more appropriate position. (Ingo Brückl)
Clarify Page Reference field function. (Ingo Brückl)
Rearrange numbers fields. Group count, sum and reference fields together. (Ingo Brückl)
Fix wrong dialog title. (Ingo Brückl)
Improve Lists dialog. Add (stock) image to button. Remove separator (GTK2 only). (Ingo Brückl)
Improve Lists dialog. Increase spacing between radio buttons. (Ingo Brückl)
Fix bug with font list in Lists dialog. There were no items in the list so far. (Ingo Brückl)
Fix option with-standard-symbols-l. Don't unconditionally replace font Symbol, but only when it is used for bullet lists. (Ingo Brückl)
fix bug in table breaking (Kousik Kumar, Simon Larochelle)
Make sure sections follow each other in multi-sections documents; load document completely before doing column layout (Simon Larochelle)
Test for page break if a column does not seems to fit on a page (this may occurs at the beginning of a section) (Simon Larochelle)
Partly revert r31610. Fix error: Don't touch the font name when exporting, but when importing. (Ingo Brückl)
Improve Lists dialog layout. Change spacing on text folding page. (Ingo Brückl)
Fix an other issue with option with-standard-symbols-l. Recognize the appropriate font family as Symbol. (Ingo Brückl)
Fix bad label for image format notebook page. (Ingo Brückl)
Fix bug in Border Shading dialog. Dotted and dashed line style indices had been confused. (Ingo Brückl)
Fix bug with cairo graphics. Dotted lines did not show up. (Ingo Brückl)
Improve Tab dialog. Remove odd numbering of the leader styles. This improves usability. (Ingo Brückl)
Fix bug in Tab dialog. The labels didn't show up. (Ingo Brückl)
Fix labels. Use colon with labels for entry fields, selection lists and such. (Ingo Brückl)
Improve usability of Tab dialog. Use textual leader style descriptions. (Ingo Brückl)
Harmonize footnote and endnote type descriptions. (Ingo Brückl)
Fix bug with footnote dialog. Restart of footnote numbering didn't work correctly and selection wasn't displayed correctly in the combo box. (Ingo Brückl)
Fix bug with endnote dialog. Placement of endnote didn't work correctly and selection wasn't displayed correctly in the combo box. (Ingo Brückl)
Improve Toggle Case dialog layout. Insert vertical container box to improve spacing. Remove separator (GTK2 only). (Ingo Brückl)
Fix wrong status line message. (Ingo Brückl)
Indicate dialog to come. (Ingo Brückl)
Indicate dialog to come the right way. This reverts r31646. (Ingo Brückl)
Improve RDF Insert Reference dialog. Add (stock) image to button. (Ingo Brückl)
Improve About dialog. Set window icon. Center dialog. Additionally, update copyright date. (Ingo Brückl)
Remove unused code. (Ingo Brückl)
Improve stylesheet settings dialog. Use colon with labels for entry fields, selection lists and such. (Ingo Brückl)
Improve History dialog. Assign more appropriate label to button and increase spacing. (Ingo Brückl)
Improve DocComparison dialog. Increase spacing. (Ingo Brückl)
Fix Windows build. Add missing comma. (Ingo Brückl)
Fix Windows build. Add #ifdef HAVE_CONFIG_H. (Ingo Brückl)
Indicate dialog to come. (Ingo Brückl)
Improve Mark Revisions dialog. Fix layout by removing default size. Remove separator (GTK2 only). Fix spacing. (Ingo Brückl)
Fix character conversion bug in Mark Revisions dialog. The conversion for GTK must not be performed to local encoding but to UTF-8. (Ingo Brückl)
Fix character conversion bug in List Revisions dialog. The conversion for GTK must not be performed to local encoding but to UTF-8. (Ingo Brückl)
Improve List Revisions dialog. Set caption bold. Remove separator (GTK2 only). (Ingo Brückl)
the time where this feature wasn't yet implemented (see r13380). There (Ingo Brückl)
Improve Merge Cells dialog. Position dialog at the mouse position. Don't use a frame label. Remove separator (GTK2 only). (Ingo Brückl)
Improve Split Cells dialog. Position dialog at the mouse position. Don't use a frame label. Remove separator (GTK2 only). (Ingo Brückl)
Improve Font Chooser dialog. Center modal dialog on its parent. Remove separator (GTK2 only). (Ingo Brückl)
Improve Paragraph dialog. Center modal dialog on its parent. Remove separator (GTK2 only). (Ingo Brückl)
Fix character conversion bug with localized date. The date string for GTK must not be in local encoding but in UTF-8. (Ingo Brückl)
Improve Font Chooser dialog. Increase spacing. Arrange effects in table to avoid clutter. Additionally, use colon with labels for entry fields, selection lists and such. (Ingo Brückl)
Improve Paragraph dialog. Add (stock) image to button. (Ingo Brückl)
Disable menu entry "Purge History". It actually doesn't purge the history, but the revisions and is a duplicate of the menu entry "Purge Revisions". Don't confuse the user with a menu entry that doesn't do what it says but something completely different. It may be enabled again when there is a function purgeAllHistory for it. (Ingo Brückl)
Improve Font Chooser dialog's spacing. (Ingo Brückl)
Improve Paragraph dialog. Increase spacing. (Ingo Brückl)
Localize break indicators. The column and page break formatting mark labels were hard-coded. (Ingo Brückl)
Switch two radio buttons in Lists dialog. The "Apply to Current List" seems more common and should be default. (Ingo Brückl)
Fix character conversion bug in Paragraph dialog preview area. Our strings are UTF-8 encoded. The string is only UCS-4 encoded if it's a paragraph from the document. (Ingo Brückl)
Fix label. (Ingo Brückl)
Improve Styles dialog layout. Fix issue with too small display of description text. Update title and labels. Fix spacing. (Ingo Brückl)
Add an appropriate toolbar label. Add TB_ClearForeground for the foreground color picker (which was missing) whereas there already was TB_ClearBackground for the background color picker. (Ingo Brückl)
Fix Bug 11446 (Prashant Bafna)
Add option --stat to the update.pl script. This will make msgmerge run with option --no-fuzzy-matching and will thus not add untranslated and uninspected strings to the .po file. It is primarily meant to generate a .po file for statistical purposes, but is useful for translators who rather like to have empty new strings as well. (Ingo Brückl)
Explain (non-)usage of argument 'fuzzy' more emphatically. (Ingo Brückl)
Fix crash with copy & paste. Don't provide a NULL pointer as callback function. It's a regression from r30427. This closes bugzilla bug 13329. (Ingo Brückl)
Fix bug with copy & paste. The condition checks the wrong data (target instead of data). (Ingo Brückl)
Add gtk_selection_data_get_data() to xap_Gtk2Compat.h. It was missing there. (Ingo Brückl)
Avoid drawing in the draw event handler when we are already painting from elsewhere. Seems to fix the unformated paste issue in #13280, and might fix #13355 as well. (Jean Bréfort)
Don't paste from buffer if character conversion has failed. Otherwise a segmentation fault will occur. (Ingo Brückl)
Cosmetic: Adjust indent. (Ingo Brückl)
Convert the child iter to the sort iter before selecting. This closes bugzilla bug 13393. Additionally, scroll to newly selected entry in tree view to improve (Ingo Brückl)
Fix Bug 13030 for the linux build, changing the libgsf req to 1.14.18 (Prashant Bafna)
Fix warning: explicit cast for size_t argument (Simon Larochelle)
Fix Debian bug #681060: Use utf-16 as default encoder instead of ucs-2; (Simon Larochelle)
Prevent bug #13355/comment #17: only recalculate scrollbar widgets when needed (Simon Larochelle)
Fix bug: correct horizontal scroll limit (Simon Larochelle)
Fix bug: missing 'msgstr' section. (Ingo Brückl)
Fix name of file. We don't use underscores. (Ingo Brückl)
Add new languages. (Ingo Brückl)
Fix bug: unref good object during font substitution (Simon Larochelle)
Make sure m_pAlignment is not NULL (prevent crash) (Simon Larochelle)
Modify color selection for rulers and main window frame (GTK3+ only) (Simon Larochelle)
Bug 13401: fix program hanging during paste unformatted (Simon Larochelle)
Added implementation of copyToBuffer method to HTML exporter class to fix bug 13351 (Volodymyr Rudyj)
Fix bug 13397 (RTF importer): Use PopRTFState on a closing backet if PushRTFState was called on the corresponding opening bracket. (Simon Larochelle)
Closes #13405. (Carlos Garnacho, Jean Bréfort)
Simplify code. (Ingo Brückl)
Fix bug in UT_UTF8String_removeProperty(). In case of a real match, szLoc points to the semicolon of the previous property. Thus, looking for semicolon and taking that as the right part (i.e. the properties behind the property to be removed) won't remove anything. As a result the property to be removed remains in the property list. This caused a lot of strange issues with the FormatTOC dialog where old properties seem randomly to show up, including the toc-header property which is localized but doesn't appear so in the dialog. (Ingo Brückl)
Don't lose the text entries when selecting a different level. (Ingo Brückl)
Fix bug with wrong level data in FormatTOC dialog. The level data displayed is the data from level m_iDetailsLevel which contains the recently selected level, but the dialog always starts with (i.e. sets the combo box to) level 1. Add missing call to get the right level data. (Ingo Brückl)
Arrange children entries (styles) in Stylist dialog alphabetically. (Ingo Brückl)
Localize style names in Stylist dialog. (Ingo Brückl)
Localize style names in Format TOC dialog. Additionally, remove pointless gtk_label_set_text() from setStyle() that causes an awkward and unnecessary double update of the dialog window. (Ingo Brückl)
Add a counterpart to s_getLocalisedStyleName(). New s_getUnlocalisedStyleName() allows to retrieve the original style name from a localized one. (Ingo Brückl)
Localize style names in Styles dialog. In order to do so, change the GtkListStore to hold both the original and the localized names. Display the localized names and internally used the original ones. Additionally, fix a problem with "basedon" and "followedby" property values caused by earlier localization of DLG_Styles_DefNone and DLG_Styles_DefCurrent. Now the English style names will be used again to set the values. (Ingo Brückl)
Allow pango to do font substitution on field runs (Simon Larochelle)
Adapt RTF exporter to handle unicode bullets (Simon Larochelle)
Fix caret position for broken tables after a continuous section break (Simon Larochelle)
Silent debug msgs (Simon Larochelle)
Reimplement handling of breakable containers in fb_ColumnBreaker; use virtual functions to handle TOCs and tables with the same function; cleanup indents in function fb_ColumnBreaker::_breakSection (Simon Larochelle)
Remove TopOffset and BottomOffset parameters from table height calculation; set minimum height for broken table (TOC) pieces (Simon Larochelle)
Start layout only after document is fully loaded (Simon Larochelle)
Fix warning. (Ingo Brückl)
Fix warning. Remove unnecessary call and unused variable. (Ingo Brückl)
Remove everything related to former option --with-standard-symbols-l. It's obsolete after r31870-r31872. (Ingo Brückl)
Get rid of the Symbol/Dingbats to Unicode converting functions. They are obsolete after r31870-r31872. (Ingo Brückl)
Fix warning. (Ingo Brückl)
Add "None" to the style name localization table. This style name appears after the current line style has been deleted. (Ingo Brückl)
Localize chapter and section heading style definitions. (Ingo Brückl)
Localize style names in toolbar's styles combo box. Additionally, make sure that the localized entries will be arranged alphabetically. (Ingo Brückl)
Simplify EV_UnixToolbar::repopulateStyles(). The item that is being looked for is the styles combo box. If it isn't found, the function will return. There is even an UT_ASSERT() to ensure that we're really dealing with the styles combo box. So, the id surely is AP_TOOLBAR_ID_FMT_STYLE and all checks for it or for other combo boxes are pointless. (Ingo Brückl)
Cosmetic: Adjust indent. Additionally, add some blank lines. (Ingo Brückl)
Localize page size formats. Add AP_STRING_IDs to the paper size definitions and a function to return this ID, so that the GUI can localize prior to displaying. (Ingo Brückl)
Fix wrong page size of Folio. Additionally, use millimeters as unit for it, because it's a traditional European format. (Ingo Brückl)
Set msgctxt for DLG_Lists_Type_none. This allows different translations for it. (Ingo Brückl)
Add DLG_Lists_Style_none for the style list. Additionally, add msgctxt which allows different translations for it. (Ingo Brückl)
Set msgctxt for DLG_Styles_DefNone. This allows different translations for it. (Ingo Brückl)
Localize Format TOC dialog. Use textual leader style descriptions. Additionally, set msgctxt for DLG_FormatTOC_None. This allows different translations for it. (Ingo Brückl)
Avoid rounding error. The stats on the translation web page are wrong. (Ingo Brückl)
Update all .po files. This is a dummy update in order to remove unwanted fuzzy strings from the .po files on the web server used for the translation stats web page. (Ingo Brückl)
Add an other bullet style: arrowhead lists. This seems more useful than some of the existing ones. (Ingo Brückl)
Fix bug 12334: use unicode fonts for list bullets (Simon Larochelle)
Fix warnings: explicit cast for size_t arguments, unused variables, uint variables (Simon Larochelle)
Fix bug 12757: opening a document with a header containing a table (Simon Larochelle)
Fix bug 13243: import RTF with list (Simon Larochelle)
Fix bug 13225: save file with a hyperlink directly following another one (Simon Larochelle)
Remove memory leak (ABW exporter) (Simon Larochelle)
Adapt importers for MsWord97 RTF and XHTML to lists with Unicode bullets (Simon Larochelle)
Fix bug 13402: make vbox expandable (Simon Larochelle)
Hyperlink dialog: make bookmark list expandable (Simon Larochelle)
Fix warnings + whitespace (Hubert Figuière)
Add a cache that knows if there are *any* semantic items in the document. Since all changes go through a mutation object, that cache always gets updated there and all other code that might need to sniff around for RDF can first use this cache to see if there are any to potentially find. (Ben Martin)
Fix bug 13417 (crash). (Simon Larochelle)
Actually check the result code for document conversions (Marc Maurer)
Fix bug 13422: compiler warning (Simon Larochelle)
Fix bug 13428 (Matti Hämäläinen, Simon Larochelle)
Reversed 31882 since it broke mathview plugin. (Jean Bréfort)
Add GR_EmbedManager::setFont(). (Jean Bréfort)
Fix warnings (Simon Larochelle)
Skip over footnotes when formatting a text span. Only format main text (bugs 5046 & 12496) (Simon Larochelle)

Collaboration-plugin:
Missing include. (reported over IRC) (Hubert Figuière)
Bug 13602 - Add missing boost header Cherry-picked from trunk@33734 (Hubert Figuière)
Bug 13657 - Remove gcrypt from tls_tunnel. Cherry-pick from trunk@34946 (Hubert Figuière)
Update for compatibility with recent GtkBuilder. Cherry-picked from trunk@34945. By jbrefort (Hubert Figuière)
Move the RDF menu from the collab plugin (wrong place) to the core menus structure... (Ben Martin)
A tiny improvement in the status reporting of the collab backend (Marc Maurer)
Fixed plugins build with both gtk versions (Jean Bréfort)
Make the collab xmpp backend work with gtk3 (Jean Bréfort)
Dist ap_Win32Res_DlgCollaborationEditAccount.rc2 (Fridrich Strba)
Make goffice plugin work again and fix the collab accounts dialog. (Jean Bréfort)
Bug 13217 - refactor gtk2 / gtk3 frontend. (Hubert Figuière)
Bug 13219 - fix collab on Gtk2. (Hubert Figuière)
Bug 13219 - Fix collab for gtk2: missing (Hubert Figuière)
Bug 13218 - rename the glade files to .ui (Hubert Figuière)
Fix a memory leak (Hubert Figuière)
fix build breakage (Hubert Figuière)
PL_DocStruxHandle -> pf_Frag_Strux* (Hubert Figuière)
Fix various memory leaks (Hubert Figuière)
Fix to build with [-Werror=format-security]. Patch from Debian, by Dmitri Smirnov. (Hubert Figuière)
Warning fixes. (Hubert Figuière)
Fix bug 13317: MSVC 2008 Build Error : abicollab_export.cpp (Marc Maurer)
Fix format warnings (clang) (Hubert Figuière)
Fix return of bool when pointer is expected (clang found this) (Hubert Figuière)
Reverted wrong commit. (tnkk)
Removed remaining extra white spaces. (Jean Bréfort)
Revert r31230 (tnkk)
Make fake collab backend work. (Ingo Brückl)
Fix warnings. Compile debug-only functions conditionally. Additionally, fix debug messages. (Ingo Brückl)
a GTK2 build, there is the additional variable TOOLKIT_IS_GTK2. This closes bugzilla bug 13400. (Dmitry Smirnov, Ingo Brückl)
Prefer TOOLKIT_GTK_ALL. We did so in all other source files. (Ingo Brückl)


Opendocument import/exporter:
Bug 13570 - Fix crasher in OpenDocument import. Cherry-pick from trunk@33939. (jbrefort) with indent fixes. (Hubert Figuière)
Bug 13539 - Correctly escape links in odt exporter. Cherry-pick from trunk@33978. By jbrefort. (Hubert Figuière)
Don't crash when exporting to .odt without a frame. Cherry-pick fron trunk@34041. From jbrefort. (Hubert Figuière)
Bug 13661 - We must ignore OpenDoc soft page breaks, they are not manual page breaks. Cherry-pick from trunk@34703. By jbrefort. (Hubert Figuière)
Some new STL like methods for the string. In TextContent_ListenerState the code should perform as it did before but also fold newlines and multiple spaces inside the first call to charData(). See http://docs.oasis-open.org/office/v1.2/cos01/ In particular section 6.1.2 of http://docs.oasis-open.org/office/v1.2/cos01/OpenDocument-v1.2-cos01-part1.pdf (Ben Martin)
Initial support for creating unique xml:id values during copy and paste. ODF (including embedded RDF) on the clipboard now works for copy and paste to and from Calligra trunk. (Ben Martin)
PD_Object has to be respected in order to retain m_objectType which is crucial in serializing correctly to RDF/XML. This now allows copy and paste to Calligra and rdf links follow to the destination too. (Ben Martin)
New codepath which uses libgcrypt for decoding blowfish encrypted ODF files. New PL_ListenerCoupleCloser class which will emit closing elements that happen after the desired document range. For example, "te(a)xt bm-start this is(b)more bm-end" selected from (a) to (b) the bm-end will be sent to the listener too even though it is after the official range. (Ben Martin)
Remove the old blowfish code itself, added a link line for gcrypt which I didn't seem to need in my build but which might be required in some builds. (Ben Martin)
These should allow the opendoc plugin to compile without redland. (Ben Martin)
Bug 12716: revert a change for bug 10627 that cause a stack smash. (Hubert Figuière)
Bug 13176: our URL escaping is buggy. Use libxml instead. This allow the document (Hubert Figuière)
Bug 12754: if there is no mimetype but a content.xml, just have a confidence SOSO (Hubert Figuière)
Bug 12754: Fix breakage with previous attempt to fix Bug 12754: (Hubert Figuière)
Faster RDF selections, gtk3 font dialog startup fix for machines with many fonts, good initial work on ODF accepting the optional annotation-end to associate a range with annotations instead of a single point. You can now click on the (1) markers for annotations to edit them and thus edit annotations that are for a single point such as those saved by OO/LO. (Ben Martin)
More warning fixage (Hubert Figuière)
Fix more warnings (non-debug mostly) (Hubert Figuière)
Slight change in namespace definition. (Ben Martin)
Metadata are now pure std::string. (Hubert Figuière)
PL_FmtStruxHandle -> fl_Container* (Hubert Figuière)
DataItems are now stored in a std::map<>. No longer use a void *. This also fix a memory leak that I suspect was in the string map. (Hubert Figuière)
RDF Semantic Items for GTK3 build. (Ben Martin)
Warning fix (Hubert Figuière)
Fix 13181: Missing file extention for svg images (Tanya Guza) (Marc Maurer)
Fix 12310: ODF, tracked changes info shown at start of document (Tanya Guza) (Marc Maurer)
Bug 12206 - date-format in ODF annotation. (Hubert Figuière)
Fix export of frame objects to ODe 1) fix a crash during copy to clipboard 2) replace asserts with if tests: some frame properties are not always defined (Simon Larochelle)
Add back an assert removed in rev. 30775 (Simon Larochelle)
Adapt ODT importer to lists with Unicode bullets (Simon Larochelle)


rtf:
Fix crash when parsing bogus list in RTF. Bug #12880 (Hubert Figuiere)
Bug 12045: Fix parsing of annotation, frame properties and a few others. (Hubert Figuiere)

gtk+:
Bug 12345: explicitly make empty XML tags due to a buggy parser in Maemo. (Hubert Figuiere)
Lots of image dialog fixes from Simon Larochelle's first contribution. (Simon Larochelle)
Merged the gtk3 branch. (Jean Bréfort)
Fix widget alignments (Hubert Figuiere)
Cleanup the widgets alignment. Disable the labels along the other controls (Hubert Figuiere)
Honour the markup in the title label. Fix a bit the paddings in the GtkTable (Hubert Figuiere)
Enhanced the pseudo-2d colors in the gtk backend. Still not perfect, does not work for high contrast themes, but abiword-2.8 was not better in this respect. (Jean Bréfort)

macosx:
Adding -headerpad_max_install_names on Mac LDFLAGS From ld(1) man page: " -headerpad_max_install_names (32-bit only) Add to the header padding enough space to allow changing all dynamic shared library paths recorded in the output file to be changed to MAXPATHLEN in length. " It will avoid problems to change dynamic shared library install names and rpaths recorded in a Mach-O binary (Fabiano Fidêncio)
Disabling Double Buffering on OS X Unfortunately, OS X still isn't ready to Double Buffering. To avoid strange behavior, at least for now, we're desabling it. (Fabiano Fidêncio)
Fixing text selection issue (bug 13116) Calling _generalUpdate() into _drawOrClearBetweenPosition(). According with msevior and andreisfrent, it don't will up performance, because _generalUpdate() doesn't redraw everything, just dirty runs (Fabiano Fidêncio)
EPUB's dialog, see you soon! For now, EPUB's dialog build is being disabled in OS X. I need/want to implement it as soon as possible. (Fabiano Fidêncio)
DoubleBuffering is working on OS X Thanks, Jean! (Fabiano Fidêncio)
Adding -headerpad_max_install_names on some plugins From ld(1) man page: " -headerpad_max_install_names (32-bit only) Add to the header padding enough space to allow changing all dynamic shared library paths recorded in the output file to be changed to MAXPATHLEN in length. " Plugins: latex, docbook, openxml, epub, openwriter, opml and (still with some problems) opendocument It will avoid problems to change dynamic shared library install names and rpaths recorded in a Mach-O binary (Fabiano Fidêncio)
Welcome plugins! latex, docbook, openxml, epub, openwriter and opml is a great pleasure having then with us! (Fabiano Fidêncio)
Big cleanup/refactor in xap_CocoaModule.cpp to The cleanup/refactor was did as an attempt to improve and simplify code's readability. (Fabiano Fidêncio)
Plugins in Mac are .so too instead of .dylib All file compiled with "-module" option will generate a .so and not a .dylib, as in our case. The difference between a .so and a .dylib is that first is a dynamically loadable module and the second is a shared library. So, we only can load the first, while we can link against the second. (Fabiano Fidêncio)
Many updates to the RDF core. Two new dialogs for RDF: an editor and a query dialog. A few new dialog superclasses to inject into the inheritance tree to get default 'boilerplate' code instead of having each dialog implement that itself. This is still a WIP. Many little utility functions and methods. (Ben Martin)
Link plugins properly against libabiword-x.y.dynlib (Marc Maurer)
Fix bug 12183: Generated PDF contains lower quality images. I hope I did the OSX port correct, as I can't test it. The Win32 cairo branch probably needs a similar fix. A patch against 2.8.x has been attached to the bugreport. (Marc Maurer)
[mac] Fix build break Please, compile on 64bits too! :-) (fidencio)
Missing header on Mac (Hubert Figuière)
Fix build if spelling is disabled (Hubert Figuière)
Make sure CGFloat is defined Make sure the we use the right controller interface (Hubert Figuière)
Missing IBAction (Hubert Figuière)
Fix build with older SDK: -don't use fast enumeration -alternative new APIs Also fix several leaks in the enumeration. (Hubert Figuière)
Warning fixes 64-bits fixes (Hubert Figuière)
Fix build with spell disabled, again. (Hubert Figuière)
Fix dialogs due to internal API changes. (Hubert Figuière)
Bug 9287 - stop using the wrong enumStyles() on MacOS. (Hubert Figuière)
Bug 1434 - rename ap_Toolbar_Icons to xap_Toolbar_Icons as they (Hubert Figuière)
Fix warnings (Hubert Figuière)
Fix missing include. (Hubert Figuière)
Fix warnings (Hubert Figuière)
Revise captions in dialogs. Use colon only in captions for entry fields and selection lists (i.e. where user input is expected). Use capitalized captions by default throughout. Avoid verbs (imperatives) in captions. Additionally, revise some texts and remove unused strings. (Ingo Brückl)
Set locale territory to "" instead of "US" when none is available (Simon Larochelle)
Revert rev. 31219 (Simon Larochelle)
Don't change adjustment for the X-scrollbar when not needed. Hopefully fix #13355. Also removed extra spaces at end of lines in src directory. (Jean Bréfort)


ms write plugin:
Committed Ingo's patch. The codepage conversion had to be reverted due to issues with some documents. (Urmas)
Added importer option to specify default codepage ("-i 'encoding:CP1252'"). (Urmas)
Patch from Ingo fixing the MS Write plugin. (Marc Maurer)
was written. By passing an importer argument, namely '-i mswrite-codepage:CP1250' (Ingo Brückl)
Clean up source code and format to AbiWord coding style. (Ingo Brückl)
Fixes writing 4 garbage bytes in output file if invalid character is encountered. CAVEAT: Untested on MBCS locales (do we support them, to begin with?) (Urmas)
Add debug messages. These messages dump the internal structure of a Write file and will make troubleshooting easier. (Ingo Brückl)
Replaced stdio debug output with UT_DEBUGMSG. - Implement proper error handling when converting single-byte characters, and correct translation of multibyte characters for corresponding codepages. (urmaslt)
Added translation table for names of standard FE fonts, as Abiword cannot use localized font names. - Added automatic codepage detection for standard FE fonts. (urmaslt)
Fix compiler warnings. This fixes "unused parameter" and "suggest braces around empty body" warnings when compiling without enabling debug. (Ingo Brückl)
Fixed build (Jean Bréfort)
Revise debug output for fonts. Enumerate by starting from zero which matches the debug output for ftc. (Ingo Brückl)
Fixed reuse-after-free error. (urmaslt)
Revert r30527. There is no error. The property exists as long as the importer class exists. (Ingo Brückl)
Fixed reuse-after-free error, v2. Attemps to revert without discussion will be considered a vandalism. (urmaslt)
Properly fix the default codepage. see previous revisions and before. (Hubert Figuière)
Revert back to r30532 (from r30529). Other patches since were undiscussed and not approved. (Ingo Brückl)
Replace fprintf() and perror() by UT_WARNINGMSG. (Ingo Brückl)
Improve definition and output of read_pic() warning messages. (Ingo Brückl)


gnome office plugin:
Add missing files and request a stable goffice release. (Jean Bréfort)
Add the gtk2 version of goffice-bits (Jean Bréfort)
Fixed warnings in goffice-bits (Jean Bréfort)
Implement SVG snapshots for components when possible. (Jean Bréfort)
Fixed GValue initialization. (Jean Bréfort)
Make SVG snapshots of charts (Jean Bréfort)
Bug 13247 - Fix glib headers. Patch by Funda Wang (Hubert Figuière)
Bug 13361 - Fix Gtk3 warnings in goffice. (Hubert Figuière)
Bug 13361 - Fix Gtk and Xlib deprecation warnings (Hubert Figuière)
Fix to build with -Werror=format-security (Dmitry Smirnov, Simon Larochelle)
Fix warnings in directory goffice-bit2 (Simon Larochelle)
Fixed EXTRA_DIST in src/af/xap/gtk (Jean Bréfort)


epub plugin:
EPUB plugin now using separate file for each book chapter. Fixed generation of incorrect TOC. (Volodymyr Rudyj)
Added temporary files cleanup (Volodymyr Rudyj)
Changed EPUB plugin and html exporter to handle option of exporter "bAddIdentifiers" like other exporter options (Volodymyr Rudyj)
Removed obsolete code fragment from HTML exporter (Volodymyr Rudyj)
Handle epub dialog build when builddir != srcdir (Xun Sun)
Correct epub dialog title and label (Xun Sun)
Added new HTML export options to Win32 UI (Urmas)
MERGE gsoc2011-refactoring [30061]:[30295] into trunk (Volodymyr Rudyj)
EPUB dialog for Win32, first edition. (Urmas)

internationalization:
Updated ar translation (by OLPC translation team) (Urmas)
Updated ar, br, da, gl, sl by SugarLabs translation service contributors. Updated es translation by F.J.F. Serrador.
Updated Slovak translation (Jaroslav Rynik)
Update spanish translation (Fco. Javier Fdez. Serrador)
Update galician "gl" translation (Miguel Bouzada)
Updated Fulah complete translation (Ibraahiima SAAR)
Update breton translation (Denis ARNAUD)
Update Spanish translation (Fco. Javier Fdez. Serrador) (Marc Maurer)
Update kk translation (Baurzhan Muftahidinov) (urmaslt)
Improve po documentation. Explain in brief what needs to be done to update a translation of a single language. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Enable translation of labels in Go To dialog. These labels were hard-coded and untranslatable so far. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Enable translation of labels in RDF Query dialog. These labels were hard-coded and untranslatable so far. (Ingo Brückl)
Enable translation of help text in RDF Query and Editor dialogs. Move the text portion that should be translatable from the ui file to the code and insert it into the text buffer there. (Ingo Brückl)
Enable xgettext msgctxt hints. This is, because the same English expression may need different translations depending on the context. The syntax for such a hint is //xgettext:msgctxt (i.e. a comment behind the string dcl). (Ingo Brückl)
Set msgctxt for FIELD_Document_Subject and DLG_RDF_Query_Column_Subject. This allows different translations for them. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Enable translation of menu items in RDF Editor dialog. Do so by using stock ids instead of labels. (Ingo Brückl)
Enable translation of labels in RDF Editor dialog. These labels were hard-coded and untranslatable so far. Additionally, add three dots to menu items raising a dialog. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Enable translation of RDF Query and Editor status lines. These texts were hard-coded and untranslatable so far. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Fix German translation. (Ingo Brückl)
Enable translation of name of new semantic item (class "Contact"). This was hard-coded and untranslatable so far. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Fix appearance of Semantic Item Insert Reference Dialog window. Increase default width of window so that its title will fit. Revise GTK2 .ui file to match GTK3 .ui file's appearance. Set window icon. Enable translation of labels and texts. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Update German translation. Additionally, remove all obsolete #~ messages. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Fix German translation. (Ingo Brückl)
Fix appearance of Semantic Stylesheets Dialog window. Set window icon and title. Enable translation of title. (Ingo Brückl)
Enable translation of labels in RDF stylesheet dialog. These labels were hard-coded and untranslatable so far. Additionally, give labels a reasonable id. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Fix German translation. (Ingo Brückl)
Enable translation of stylesheets names in RDF stylesheet dialog. These names were hard-coded and untranslatable so far. Moreover, the internal (English) stylesheet name was presented to the user. Improve usability by separating the internal name from the presented one and present translated names only. Remove the combo box items from the .ui files and add them using XAP_appendComboBoxText(). (Ingo Brückl)
Update and fix German translation. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Restore abi-backport-all script. It only is needed for translation statistics by dumpstrings.pl and completely useless for every other purpose. (Ingo Brückl)
Update German translation file's header fields. (Ingo Brückl)
Update German translation. (Ingo Brückl)
Remove commented texts that are subject to translation. (Ingo Brückl)
Remove defaults from GTK2 .ui file. Additionally, remove texts that are subject to translation. (Ingo Brückl)
Enable translation of button label. This label was hard-coded. (Ingo Brückl)
Acholi L10n fixes (Chris Leonard)
Afrikaans L10n fixes (Chris Leonard)
Akan (Twi Asante) L10n fixes (Chris Leonard)
Amharic L10n fixes (Chris Leonard)
Arabic L10n fixes (Chris Leonard)
Asturian L10n fixes (Chris Leonard)
Belarusian L10n fixes (Chris Leonard)
Bulgarian L10n fixes (Chris Leonard)
Bamanakan L10n fixes (Chris Leonard)
Breton L10n from Denis Arnaud (Chris Leonard)
Catalan L10n fixes (Chris Leonard)
Chiga L10n fixes (Chris Leonard)
Czech L10n fixes (Chris Leonard)
Welsh (cy_GB) L10n from Rhoslyn Prys (Chris Leonard)
Swiss German L10n fixes (Chris Leonard)
Greek L10n fixes (Chris Leonard)
British English (en_GB) L10n from Chris Leonard (Chris Leonard)
Esperanto L10n fixes (Chris Leonard)
Estonian L10n fixes (Chris Leonard)
Basque L10n fixes (Chris Leonard)
Fulah L10n from Ibrahima Saar (Chris Leonard)
Irish L10n fixes (Chris Leonard)
Galician L10n from Miguel Bouzada (Chris Leonard)
Hebrew L10n fixes (Chris Leonard)
Croatian L10n fixes (Chris Leonard)
Hungarian L10n from Gabor Kelemen (Chris Leonard)
Indonesian L10n fixes (Chris Leonard)
Italian L10n fixes (Chris Leonard)
Luganda L10n fixes (Chris Leonard)
Latvian L10n fixes (Chris Leonard)
Malagasy L10n fixes (Chris Leonard)
Macedonian L10n fixes (Chris Leonard)
Dutch L10n from Pjotr Kan (Chris Leonard)
Polish L10n from marcinu (Chris Leonard)
Pashto L10n fixes (Chris Leonard)
Brazilian Portuguese L10n fixes (Chris Leonard)
Quechua (Cusco-Collao) L10n fixes (Chris Leonard)
Romanian L10n fixes (Chris Leonard)
Russian L10n fixes (Chris Leonard)
Sardinian L10n fixes (Chris Leonard)
Slovak L10n from Jaroslav Ryník (Chris Leonard)
Slovenian (sl_SI) L10n from Martin Srebotnjak (Chris Leonard)
Songhay (son) L10n from Mohomodou Houssouba (Chris Leonard)
Albanian L10n from Besnik Bleta (Chris Leonard)
Serbian L10n fixes (Chris Leonard)
sr@latin L10n fixes (Chris Leonard)
Tamil L10n fixes (Chris Leonard)
Turkish L10n fixes (Chris Leonard)
Vietnamese L10n fixes (Chris Leonard)
Wolof L10n fixes (Chris Leonard)
Yiddish L10n fixes (Chris Leonard)
Zulu L10n fixes (Chris Leonard)
Mandinka L10n fixes (Chris Leonard)
Nepali L10n fixes (Chris Leonard)
Bengali L10n fixes (Chris Leonard)
Bosnian L10n fixes (Chris Leonard)
Dari L10n fixes (Chris Leonard)
Hindi L10n fixes (Chris Leonard)
Filipino L10n fixes (Chris Leonard)
qul L10n fixes (Chris Leonard)
quh L10n fixes (Chris Leonard)
Swedish L10n update from Per Larsson and Svante Signell (Chris Leonard)
French L10n update from Simon Larochelle (Chris Leonard)
Danish (da) L10n from aputsiaq (Chris Leonard)
Spanish L10n from AlanJAS (Chris Leonard)
Chinese (China) L10n from lite (Chris Leonard)
Chinese (Taiwan) L10n from Walter Cheuk (Chris Leonard)
Chinese (Hong Kong) L10n from Walter Cheuk (Chris Leonard)
Songhay (son) L10n from Mohomodou Houssouba (Chris Leonard)



OXML import/export:
Libraries into *LIBADD and not *LDFLAGS (Fridrich Strba)
Fix some weird test. (Hubert Figuière)
Adapt DOCX importer to lists with Unicode bullets (Simon Larochelle)

paint plugin:
Fix an assert in Paint plugin. Regression from r31393. (Hubert Figuière)
Get rid of UT_String in AbiPaint Add std::string version in xap_Prefs.h (Hubert Figuière)

86 files changed, 2566 insertions, 829 deletions

diff --git a/editors/abiword/DESCR b/editors/abiword/DESCR
index 7e49bcadd90..474d9a7f8c3 100644
--- a/editors/abiword/DESCR
+++ b/editors/abiword/DESCR
@@ -1,5 +1,5 @@
 AbiWord is an open-source, cross-platform WYSIWYG word processor.
-This version uses GTK+2.
+This version uses GTK+3.
 
 Features include:
 - Basic character formatting (bold, underline, italics, etc.)
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 7031770b32e..3dc21d01143 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,22 +1,52 @@
-# $NetBSD: Makefile,v 1.154 2015/06/12 10:50:01 wiz Exp $
+# $NetBSD: Makefile,v 1.155 2015/09/13 21:32:12 nros Exp $
 
-.include "Makefile.common"
-PKGREVISION=		27
+.include 	"Makefile.common"
+DISTNAME=	abiword-${ABIVERSION}
+CATEGORIES=	editors
+MASTER_SITES=	http://www.abiword.com/downloads/abiword/${PKGVERSION_NOREV}/source/
 
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.abiword.com/
 COMMENT=	Open Source cross-platform word processor
+LICENSE=	gnu-gpl-v2
 
-# GTK1 version and previous name of the GTK2 version
-CONFLICTS=	abiword-personal-[0-9]* abiword2-[0-9]*
+CONFLICTS=      abiword-personal-[0-9]* abiword2-[0-9]*
 
-USE_TOOLS+=		perl
-CONFIGURE_ARGS+=	--disable-builtin-plugins
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	autoconf automake gmake pkg-config
+USE_LANGUAGES=	c c++
+
+CONFIGURE_ARGS+=	--disable-default-plugins	#do not build any plugins by default
+CONFIGURE_ARGS+=	--enable-spell         # (Gtk+ only) include spell checking support
 CONFIGURE_ARGS+=	--enable-plugins=""
-CONFIGURE_ARGS+=	--without-gnomevfs
+# evolution data server can't be found even if buildlinked
+# disable to make  usre it's not found somewhere else
+CONFIGURE_ARGS+=        --with-evolution-data-server=no
 
-REPLACE_SH+=	${WRKDIR}/${DISTNAME}/abiword-docs/make-html.sh
-REPLACE_PERL+=	user/wp/scripts/abw2html.pl
 
-.include "../../textproc/enchant/buildlink3.mk"
-.include "../../databases/shared-mime-info/mimedb.mk"
+PKGCONFIG_OVERRIDE+=	libabiword.pc.in
+
+pre-configure:
+	cd ${WRKSRC}; \
+	autoreconf --force --install
+
+.include "options.mk"
+
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../converters/wv/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/redland/buildlink3.mk"
+.include "../../time/libical/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 9ba63301d19..3ad13f0e345 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,39 +1 @@
-# $NetBSD: Makefile.common,v 1.43 2013/07/15 02:02:21 ryoon Exp $
-#
-# used by editors/abiword-plugins/Makefile
-
-# 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/${ABIVERSION}/source/
-
-MAINTAINER?=	adam@NetBSD.org
-HOMEPAGE=	http://www.abisource.com/
-LICENSE=	gnu-gpl-v2
-
-USE_LANGUAGES=		c c++
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake msgfmt pkg-config
-GNU_CONFIGURE=		yes
-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/libgsf/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-.include "../../mk/pthread.buildlink3.mk"
+ABIVERSION=3.0.1
diff --git a/editors/abiword/PLIST b/editors/abiword/PLIST
index 6ca010c5add..770691b0b91 100644
--- a/editors/abiword/PLIST
+++ b/editors/abiword/PLIST
@@ -1,291 +1,290 @@
-@comment $NetBSD: PLIST,v 1.26 2010/11/26 14:49:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2015/09/13 21:32:12 nros Exp $
 bin/abiword
-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
+include/abiword-3.0/abiwidget.h
+include/abiword-3.0/libabiword.h
+include/abiword-3.0/xap_UnixTableWidget.h
+lib/libabiword-3.0.la
+lib/pkgconfig/abiword-3.0.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/abiword-3.0/mime-info/abiword.keys
+share/abiword-3.0/readme.abw
+share/abiword-3.0/readme.txt
+share/abiword-3.0/strings/ach.strings
+share/abiword-3.0/strings/af-ZA.strings
+share/abiword-3.0/strings/ak.strings
+share/abiword-3.0/strings/am-ET.strings
+share/abiword-3.0/strings/ar.strings
+share/abiword-3.0/strings/ast-ES.strings
+share/abiword-3.0/strings/ayc-BO.strings
+share/abiword-3.0/strings/aym-BO.strings
+share/abiword-3.0/strings/be-BY.strings
+share/abiword-3.0/strings/be@latin.strings
+share/abiword-3.0/strings/bg-BG.strings
+share/abiword-3.0/strings/bm.strings
+share/abiword-3.0/strings/bn.strings
+share/abiword-3.0/strings/br-FR.strings
+share/abiword-3.0/strings/bs.strings
+share/abiword-3.0/strings/ca-ES.strings
+share/abiword-3.0/strings/cgg.strings
+share/abiword-3.0/strings/cs-CZ.strings
+share/abiword-3.0/strings/cy-GB.strings
+share/abiword-3.0/strings/da-DK.strings
+share/abiword-3.0/strings/de-CH.strings
+share/abiword-3.0/strings/de-DE.strings
+share/abiword-3.0/strings/el-GR.strings
+share/abiword-3.0/strings/en-AU.strings
+share/abiword-3.0/strings/en-CA.strings
+share/abiword-3.0/strings/en-GB.strings
+share/abiword-3.0/strings/en-IE.strings
+share/abiword-3.0/strings/eo.strings
+share/abiword-3.0/strings/es-ES.strings
+share/abiword-3.0/strings/es-MX.strings
+share/abiword-3.0/strings/et.strings
+share/abiword-3.0/strings/eu-ES.strings
+share/abiword-3.0/strings/fa-AF.strings
+share/abiword-3.0/strings/ff.strings
+share/abiword-3.0/strings/fi-FI.strings
+share/abiword-3.0/strings/fil.strings
+share/abiword-3.0/strings/fr-FR.strings
+share/abiword-3.0/strings/ga-IE.strings
+share/abiword-3.0/strings/gl.strings
+share/abiword-3.0/strings/he-IL.strings
+share/abiword-3.0/strings/hi.strings
+share/abiword-3.0/strings/hr-HR.strings
+share/abiword-3.0/strings/hu-HU.strings
+share/abiword-3.0/strings/id-ID.strings
+share/abiword-3.0/strings/it-IT.strings
+share/abiword-3.0/strings/ja-JP.strings
+share/abiword-3.0/strings/jbo.strings
+share/abiword-3.0/strings/kk-KZ.strings
+share/abiword-3.0/strings/km.strings
+share/abiword-3.0/strings/ko.strings
+share/abiword-3.0/strings/ku.strings
+share/abiword-3.0/strings/lg.strings
+share/abiword-3.0/strings/lt-LT.strings
+share/abiword-3.0/strings/lv-LV.strings
+share/abiword-3.0/strings/mg-MG.strings
+share/abiword-3.0/strings/mk-MK.strings
+share/abiword-3.0/strings/mnk-SN.strings
+share/abiword-3.0/strings/ms-MY.strings
+share/abiword-3.0/strings/nb-NO.strings
+share/abiword-3.0/strings/ne-NP.strings
+share/abiword-3.0/strings/nl-NL.strings
+share/abiword-3.0/strings/nn-NO.strings
+share/abiword-3.0/strings/pl-PL.strings
+share/abiword-3.0/strings/ps.strings
+share/abiword-3.0/strings/pt-BR.strings
+share/abiword-3.0/strings/pt-PT.strings
+share/abiword-3.0/strings/quh-BO.strings
+share/abiword-3.0/strings/qul-BO.strings
+share/abiword-3.0/strings/quz.strings
+share/abiword-3.0/strings/ro-RO.strings
+share/abiword-3.0/strings/ru-RU.strings
+share/abiword-3.0/strings/sc-IT.strings
+share/abiword-3.0/strings/sk-SK.strings
+share/abiword-3.0/strings/sl-SI.strings
+share/abiword-3.0/strings/son.strings
+share/abiword-3.0/strings/sq-AL.strings
+share/abiword-3.0/strings/sr.strings
+share/abiword-3.0/strings/sr@latin.strings
+share/abiword-3.0/strings/sv-SE.strings
+share/abiword-3.0/strings/sw.strings
+share/abiword-3.0/strings/ta-IN.strings
+share/abiword-3.0/strings/th.strings
+share/abiword-3.0/strings/tr-TR.strings
+share/abiword-3.0/strings/uk-UA.strings
+share/abiword-3.0/strings/vi-VN.strings
+share/abiword-3.0/strings/wo-SN.strings
+share/abiword-3.0/strings/yi.strings
+share/abiword-3.0/strings/zh-CN.strings
+share/abiword-3.0/strings/zh-HK.strings
+share/abiword-3.0/strings/zh-TW.strings
+share/abiword-3.0/strings/zu.strings
+share/abiword-3.0/system.profile
+share/abiword-3.0/system.profile-CP1254
+share/abiword-3.0/system.profile-KOI8-R
+share/abiword-3.0/system.profile-KOI8-U
+share/abiword-3.0/system.profile-KOI8-UB
+share/abiword-3.0/system.profile-am-ET
+share/abiword-3.0/system.profile-ar
+share/abiword-3.0/system.profile-ar-EG
+share/abiword-3.0/system.profile-ar-SA
+share/abiword-3.0/system.profile-bg-BG
+share/abiword-3.0/system.profile-ca-ES
+share/abiword-3.0/system.profile-cs-CZ
+share/abiword-3.0/system.profile-da-DK
+share/abiword-3.0/system.profile-de
+share/abiword-3.0/system.profile-de-AT
+share/abiword-3.0/system.profile-de-CH
+share/abiword-3.0/system.profile-de-DE
+share/abiword-3.0/system.profile-div-MV
+share/abiword-3.0/system.profile-el-GR
+share/abiword-3.0/system.profile-en
+share/abiword-3.0/system.profile-en-AU
+share/abiword-3.0/system.profile-en-CA
+share/abiword-3.0/system.profile-en-GB
+share/abiword-3.0/system.profile-en-IE
+share/abiword-3.0/system.profile-en-NZ
+share/abiword-3.0/system.profile-en-US
+share/abiword-3.0/system.profile-en-ZA
+share/abiword-3.0/system.profile-es
+share/abiword-3.0/system.profile-es-ES
+share/abiword-3.0/system.profile-es-MX
+share/abiword-3.0/system.profile-eu
+share/abiword-3.0/system.profile-eu-ES
+share/abiword-3.0/system.profile-fa-IR
+share/abiword-3.0/system.profile-fi-FI
+share/abiword-3.0/system.profile-fr
+share/abiword-3.0/system.profile-fr-BE
+share/abiword-3.0/system.profile-fr-CA
+share/abiword-3.0/system.profile-fr-CH
+share/abiword-3.0/system.profile-fr-FR
+share/abiword-3.0/system.profile-gl-ES
+share/abiword-3.0/system.profile-he
+share/abiword-3.0/system.profile-he-IL
+share/abiword-3.0/system.profile-hu-HU
+share/abiword-3.0/system.profile-it-IT
+share/abiword-3.0/system.profile-ja-JP
+share/abiword-3.0/system.profile-kk-KZ
+share/abiword-3.0/system.profile-lt-LT
+share/abiword-3.0/system.profile-nb-NO
+share/abiword-3.0/system.profile-nl-NL
+share/abiword-3.0/system.profile-nn-NO
+share/abiword-3.0/system.profile-pl-PL
+share/abiword-3.0/system.profile-ps
+share/abiword-3.0/system.profile-pt-BR
+share/abiword-3.0/system.profile-pt-PT
+share/abiword-3.0/system.profile-ro
+share/abiword-3.0/system.profile-ro-RO
+share/abiword-3.0/system.profile-ru
+share/abiword-3.0/system.profile-ru-RU
+share/abiword-3.0/system.profile-sk-SK
+share/abiword-3.0/system.profile-sk-SK.CP1250
+share/abiword-3.0/system.profile-sl
+share/abiword-3.0/system.profile-sv
+share/abiword-3.0/system.profile-sv-SE
+share/abiword-3.0/system.profile-syr
+share/abiword-3.0/system.profile-tr
+share/abiword-3.0/system.profile-tr-TR
+share/abiword-3.0/system.profile-tr-TR.CP1254
+share/abiword-3.0/system.profile-uk-UA
+share/abiword-3.0/system.profile-ur-PK
+share/abiword-3.0/system.profile-yi
+share/abiword-3.0/system.profile-zh-CN
+share/abiword-3.0/system.profile-zh-TW
+share/abiword-3.0/templates/normal.awt
+share/abiword-3.0/templates/normal.awt-am_ET
+share/abiword-3.0/templates/normal.awt-ar
+share/abiword-3.0/templates/normal.awt-ar_EG
+share/abiword-3.0/templates/normal.awt-ar_SA
+share/abiword-3.0/templates/normal.awt-bg_BG
+share/abiword-3.0/templates/normal.awt-ca_ES
+share/abiword-3.0/templates/normal.awt-cs_CZ
+share/abiword-3.0/templates/normal.awt-da_DK
+share/abiword-3.0/templates/normal.awt-de
+share/abiword-3.0/templates/normal.awt-de_AT
+share/abiword-3.0/templates/normal.awt-de_CH
+share/abiword-3.0/templates/normal.awt-de_DE
+share/abiword-3.0/templates/normal.awt-div_MV
+share/abiword-3.0/templates/normal.awt-el_GR
+share/abiword-3.0/templates/normal.awt-en_AU
+share/abiword-3.0/templates/normal.awt-en_CA
+share/abiword-3.0/templates/normal.awt-en_GB
+share/abiword-3.0/templates/normal.awt-en_IE
+share/abiword-3.0/templates/normal.awt-en_NZ
+share/abiword-3.0/templates/normal.awt-en_ZA
+share/abiword-3.0/templates/normal.awt-es
+share/abiword-3.0/templates/normal.awt-es_AR
+share/abiword-3.0/templates/normal.awt-es_ES
+share/abiword-3.0/templates/normal.awt-es_IR
+share/abiword-3.0/templates/normal.awt-es_MX
+share/abiword-3.0/templates/normal.awt-fa_IR
+share/abiword-3.0/templates/normal.awt-fi_FI
+share/abiword-3.0/templates/normal.awt-fr
+share/abiword-3.0/templates/normal.awt-fr_BE
+share/abiword-3.0/templates/normal.awt-fr_CA
+share/abiword-3.0/templates/normal.awt-fr_CH
+share/abiword-3.0/templates/normal.awt-fr_FR
+share/abiword-3.0/templates/normal.awt-gl_ES
+share/abiword-3.0/templates/normal.awt-he
+share/abiword-3.0/templates/normal.awt-he_IL
+share/abiword-3.0/templates/normal.awt-hu_HU
+share/abiword-3.0/templates/normal.awt-it_IT
+share/abiword-3.0/templates/normal.awt-ja_JP
+share/abiword-3.0/templates/normal.awt-kk_KZ
+share/abiword-3.0/templates/normal.awt-km_KH
+share/abiword-3.0/templates/normal.awt-lt_LT
+share/abiword-3.0/templates/normal.awt-nb_NO
+share/abiword-3.0/templates/normal.awt-nl_NL
+share/abiword-3.0/templates/normal.awt-nn_NO
+share/abiword-3.0/templates/normal.awt-pl_PL
+share/abiword-3.0/templates/normal.awt-ps
+share/abiword-3.0/templates/normal.awt-pt_BR
+share/abiword-3.0/templates/normal.awt-pt_PT
+share/abiword-3.0/templates/normal.awt-ro
+share/abiword-3.0/templates/normal.awt-ro_RO
+share/abiword-3.0/templates/normal.awt-ru
+share/abiword-3.0/templates/normal.awt-ru_RU
+share/abiword-3.0/templates/normal.awt-sk_SK
+share/abiword-3.0/templates/normal.awt-sl
+share/abiword-3.0/templates/normal.awt-sv
+share/abiword-3.0/templates/normal.awt-sv_SE
+share/abiword-3.0/templates/normal.awt-syr
+share/abiword-3.0/templates/normal.awt-tr
+share/abiword-3.0/templates/normal.awt-tr_TR
+share/abiword-3.0/templates/normal.awt-uk_UA
+share/abiword-3.0/templates/normal.awt-ur_PK
+share/abiword-3.0/templates/normal.awt-yi
+share/abiword-3.0/templates/normal.awt-zh_CN
+share/abiword-3.0/templates/normal.awt-zh_TW
+share/abiword-3.0/ui/ap_UnixDialog_Annotation.ui
+share/abiword-3.0/ui/ap_UnixDialog_Border_Shading.ui
+share/abiword-3.0/ui/ap_UnixDialog_Break.ui
+share/abiword-3.0/ui/ap_UnixDialog_Field.ui
+share/abiword-3.0/ui/ap_UnixDialog_FormatFootnotes.ui
+share/abiword-3.0/ui/ap_UnixDialog_FormatFrame.ui
+share/abiword-3.0/ui/ap_UnixDialog_FormatTOC.ui
+share/abiword-3.0/ui/ap_UnixDialog_FormatTable.ui
+share/abiword-3.0/ui/ap_UnixDialog_Goto.ui
+share/abiword-3.0/ui/ap_UnixDialog_HdrFtr.ui
+share/abiword-3.0/ui/ap_UnixDialog_InsertTable.ui
+share/abiword-3.0/ui/ap_UnixDialog_Insert_DateTime.ui
+share/abiword-3.0/ui/ap_UnixDialog_Latex.ui
+share/abiword-3.0/ui/ap_UnixDialog_MailMerge.ui
+share/abiword-3.0/ui/ap_UnixDialog_MetaData.ui
+share/abiword-3.0/ui/ap_UnixDialog_New.ui
+share/abiword-3.0/ui/ap_UnixDialog_Options.ui
+share/abiword-3.0/ui/ap_UnixDialog_Options_ColorSel.ui
+share/abiword-3.0/ui/ap_UnixDialog_PageNumbers.ui
+share/abiword-3.0/ui/ap_UnixDialog_PageSetup.ui
+share/abiword-3.0/ui/ap_UnixDialog_RDFEditor.ui
+share/abiword-3.0/ui/ap_UnixDialog_RDFQuery.ui
+share/abiword-3.0/ui/ap_UnixDialog_Replace.ui
+share/abiword-3.0/ui/ap_UnixDialog_SemanticStylesheets.ui
+share/abiword-3.0/ui/ap_UnixDialog_Spell.ui
+share/abiword-3.0/ui/ap_UnixDialog_Styles.ui
+share/abiword-3.0/ui/ap_UnixDialog_Stylist.ui
+share/abiword-3.0/ui/ap_UnixDialog_Tab.ui
+share/abiword-3.0/ui/ap_UnixDialog_WordCount.ui
+share/abiword-3.0/ui/pd_RDFContact.ui
+share/abiword-3.0/ui/pd_RDFEvent.ui
+share/abiword-3.0/ui/pd_RDFInsertReference.ui
+share/abiword-3.0/ui/pd_RDFLocation.ui
+share/abiword-3.0/ui/xap_UnixDlg_DocComparison.ui
+share/abiword-3.0/ui/xap_UnixDlg_Encoding.ui
+share/abiword-3.0/ui/xap_UnixDlg_History.ui
+share/abiword-3.0/ui/xap_UnixDlg_Image.ui
+share/abiword-3.0/ui/xap_UnixDlg_Language.ui
+share/abiword-3.0/ui/xap_UnixDlg_ListDocuments.ui
+share/abiword-3.0/ui/xap_UnixDlg_Password.ui
+share/abiword-3.0/ui/xap_UnixDlg_PluginManager.ui
+share/abiword-3.0/ui/xap_UnixDlg_WindowMore.ui
+share/abiword-3.0/ui/xap_UnixDlg_Zoom.ui
 share/applications/abiword.desktop
-share/icons/abiword_48.png
+share/icons/hicolor/16x16/apps/abiword.png
+share/icons/hicolor/22x22/apps/abiword.png
+share/icons/hicolor/256x256/apps/abiword.png
+share/icons/hicolor/32x32/apps/abiword.png
+share/icons/hicolor/48x48/apps/abiword.png
+share/icons/hicolor/512x512/apps/abiword.png
+share/icons/hicolor/scalable/apps/abiword.svg
diff --git a/editors/abiword/buildlink3.mk b/editors/abiword/buildlink3.mk
new file mode 100644
index 00000000000..a4fc00b0847
--- /dev/null
+++ b/editors/abiword/buildlink3.mk
@@ -0,0 +1,25 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/09/13 21:32:12 nros Exp $
+
+BUILDLINK_TREE+=	abiword
+
+.if !defined(ABIWORD_BUILDLINK3_MK)
+ABIWORD_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.abiword+=	abiword>=3.0.1
+BUILDLINK_PKGSRCDIR.abiword?=	../../editors/abiword
+
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../converters/wv/buildlink3.mk"
+.include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/redland/buildlink3.mk"
+.include "../../time/libical/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.endif	# ABIWORD_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-abiword
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index e17754bb0a3..ad7868a03b8 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,17 +1,75 @@
-$NetBSD: distinfo,v 1.64 2012/10/09 19:57:02 marino Exp $
+$NetBSD: distinfo,v 1.65 2015/09/13 21:32:13 nros Exp $
 
-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-ae) = ec3bb0a00100fea97f46b3a25440d7a4e46e30eb
-SHA1 (patch-af) = fc6927eb963c4be956825d1656e8957b358ed1ad
-SHA1 (patch-goffice-bits_goffice_app_goffice-app.h) = 894647ea5d2176db1793673befe703f5be603278
-SHA1 (patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp) = 65852f6f934c9fdf2aa9bf02d0a2ad66b5c2db09
-SHA1 (patch-plugins_garble_xp_abiword-garble-png.cpp) = c9b4b7030fa038da9ba37b5489d8d8571a0e6c77
-SHA1 (patch-sa) = 29ee7e9891b11773217ec73bbda01e2591e78b56
-SHA1 (patch-src_Makefile.in) = cbc7d5e042421b92aa2b1004b2a7d6ca8ea5346d
-SHA1 (patch-src_af_util_xp_ut__go__file.h) = 07a9d580ca9f6b5c1e8814d182d9f56d3f3a7e72
+SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
+RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
+Size (abiword-3.0.1.tar.gz) = 11144990 bytes
+SHA1 (patch-configure.ac) = bbffa133509affe43fdef7e420e3a96a14edf58f
+SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40
+SHA1 (patch-plugins_aiksaurus_Makefile.am) = e859a0af2b436616b1dae45f3be8593cf917c87d
+SHA1 (patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am) = 2790a45fa4590f8f5ac27ec6e1b0e9eacc5c7c6e
+SHA1 (patch-plugins_applix_Makefile.am) = d579e6620189bcdd5cb9286edb77936893d66727
+SHA1 (patch-plugins_babelfish_Makefile.am) = 9a14d52b882824a344e4189b210ea05f15cd5dc4
+SHA1 (patch-plugins_bmp_Makefile.am) = 9919326323259fdb717f1cc1b63be7b5fecb4d85
+SHA1 (patch-plugins_clarisworks_Makefile.am) = 20b149e4ccba72e54421e59f62cee8823737af5d
+SHA1 (patch-plugins_collab_Makefile.am) = 268b976c687e300326f1af9933cea7c060ecef90
+SHA1 (patch-plugins_command_Makefile.am) = 42bf4af0905f83faf21ceabfbf20756c39d9d268
+SHA1 (patch-plugins_docbook_Makefile.am) = 73ef7476c0eae93a79ffd1571081b545a7cf5f0b
+SHA1 (patch-plugins_eml_Makefile.am) = 23bccc8e3aa62275f441635675a2a34f53c5d118
+SHA1 (patch-plugins_epub_Makefile.am) = 0d4f2bca4e2a40d3f0c34f1c5b37284190979d48
+SHA1 (patch-plugins_freetranslation_Makefile.am) = f494b16bdd2d8cb484bec09a61c6e3e0d8f78b44
+SHA1 (patch-plugins_garble_Makefile.am) = b6c3f68a390c0b4a4e5e5d626a7532f4542b5e9f
+SHA1 (patch-plugins_gda_Makefile.am) = 73a112eb3118c6769bef00c5f4c3ad50a735b54a
+SHA1 (patch-plugins_gdict_Makefile.am) = 16e6fc9134bf96e8b924c8ef5f6f57988531684b
+SHA1 (patch-plugins_gimp_Makefile.am) = 0c284afb8e168dff87da0d4ae70936c8759b8cb5
+SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
+SHA1 (patch-plugins_goffice_Makefile.am) = 935af789858b3fbf3b928837acca024a1415bf86
+SHA1 (patch-plugins_google_Makefile.am) = ae883071f847b641ded349e5cb2ac3c126942d8d
+SHA1 (patch-plugins_grammar_Makefile.am) = 0c651d09ae690a22ce70f93fd091ceabb18a44d0
+SHA1 (patch-plugins_hancom_Makefile.am) = 93e6b69160438a254a6c68b81a6385456d328999
+SHA1 (patch-plugins_hrtext_Makefile.am) = 439ecd0ac09b147c5a789bfb498e5da866d0cb59
+SHA1 (patch-plugins_iscii_Makefile.am) = ff740a1d6e308658d18c0102a67fa8c3f32cf95b
+SHA1 (patch-plugins_kword_Makefile.am) = bac30878f5eb8a3d7d037f13bdef81308c5a3e17
+SHA1 (patch-plugins_latex_Makefile.am) = 196edb99bcbc3040ec665bf422472558684c5fe5
+SHA1 (patch-plugins_loadbindings_Makefile.am) = e689adf52c0786f648435e259da3410a98036887
+SHA1 (patch-plugins_mathview_Makefile.am) = 8a779c043b3b9b483ec072e2780240e1ec6f575a
+SHA1 (patch-plugins_mht_Makefile.am) = a302d8af3cbcaa246b1d61cf90adb2276a95d502
+SHA1 (patch-plugins_mif_Makefile.am) = 9dbd23cee5d1f5d56058eb95cf3f247766972110
+SHA1 (patch-plugins_mswrite_Makefile.am) = bd0d7546d07500ce74828e0414ee14278c49a396
+SHA1 (patch-plugins_opendocument_Makefile.am) = db01004db8480509f9c6060f82b7095bfe0b4715
+SHA1 (patch-plugins_openwriter_Makefile.am) = 40fc8135faa71918f02420ba5d527f74bc4e7999
+SHA1 (patch-plugins_openxml_Makefile.am) = 1eb9cf1df2fdd9e707e26412089b08f45ae59581
+SHA1 (patch-plugins_opml_Makefile.am) = 94fe9afb9d8145f36d50abec8c956cc295a6ff4d
+SHA1 (patch-plugins_ots_Makefile.am) = a674a0b2a222ba8d2acc8de002bf6d618c206573
+SHA1 (patch-plugins_paint_Makefile.am) = bbae6fdc2cfa162ccd2dd87178759997c6e7b71b
+SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
+SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
+SHA1 (patch-plugins_passepartout_Makefile.am) = c048ef9cdfab149394a6ecb02f7d5faf027c89ed
+SHA1 (patch-plugins_pdb_Makefile.am) = a01b5ed0ee10d3f72cf6fa2d20b96628844c8217
+SHA1 (patch-plugins_pdf_Makefile.am) = 68fd361019ab4f2a3bd9bc0ea9e5b2d697e13e45
+SHA1 (patch-plugins_presentation_Makefile.am) = 463c2bd628d4cdad9cee89ae1c10c56b0343366d
+SHA1 (patch-plugins_psion_Makefile.am) = 1f8836ea23aa38ad6716461fa4f0c6db1ec6eba0
+SHA1 (patch-plugins_rsvg_Makefile.am) = f844ee15921547e769da8dd5acfb64b57958b33f
+SHA1 (patch-plugins_s5_Makefile.am) = 4cf5ee72bd6878c5e3801141023c1e0ec5ec9002
+SHA1 (patch-plugins_sdw_Makefile.am) = b9a756c639225e7d57543f83d6db6e93be3d411e
+SHA1 (patch-plugins_t602_Makefile.am) = a4714fcefe149b874832683688a7537dcb04ae9f
+SHA1 (patch-plugins_urldict_Makefile.am) = 7cfb2775dd67cce045e31a01b79e4cb04887f7d5
+SHA1 (patch-plugins_wikipedia_Makefile.am) = 57e65f04b202f475c586d399a8c128f51d594630
+SHA1 (patch-plugins_wmf_Makefile.am) = 00bf982683d1d6c122b62a1df1bc241f6e276c4d
+SHA1 (patch-plugins_wml_Makefile.am) = 6c05337b5619864dde5a2100e1859684333fed47
+SHA1 (patch-plugins_wordperfect_Makefile.am) = d08d7d21ed8106bcbe77cc42ffca13d7ad18d3ac
+SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1
+SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9
+SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e
+SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc
+SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3
+SHA1 (patch-plugins_wpg_Makefile.am) = a96fafec05866fb7c3480c8d2a041b970ad8e988
+SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
+SHA1 (patch-plugins_xslfo_Makefile.am) = cceef8d780dc63c1253544f21bd123dac19eba0b
+SHA1 (patch-src_Makefile.am) = b2b898470b842e5bfa45e2b3b653ca9b51714b73
+SHA1 (patch-src_af_util_xp_ut__endian.h) = e73aef0db6ddef0316cca3f7a77fd4c71c870637
+SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
+SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
+SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
+SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
+SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.cpp) = d07eaf64446efc83c24e02e5969e0921451269a8
+SHA1 (patch-src_text_ptbl_xp_pd__DocumentRDF.h) = 59837727c060bc8f8f14478c3a0245b877c2d29a
diff --git a/editors/abiword/options.mk b/editors/abiword/options.mk
new file mode 100644
index 00000000000..4fb29c4a079
--- /dev/null
+++ b/editors/abiword/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2015/09/13 21:32:13 nros Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.abiword
+PKG_SUPPORTED_OPTIONS=		debug
+.include "../../mk/bsd.options.mk"
+
+#
+# Enable debugging funcionality
+# more verbose terminal output
+#
+.if !empty(PKG_OPTIONS:Mdebug)
+CC+=			-ggdb
+CXX+=			-ggdb
+CONFIGURE_ARGS+=        --enable-debug
+INSTALL_UNSTRIPPED=	yes
+CFLAGS+=		-O0
+.endif
+
diff --git a/editors/abiword/patches/patch-aa b/editors/abiword/patches/patch-aa
deleted file mode 100644
index 1b641be6512..00000000000
--- a/editors/abiword/patches/patch-aa
+++ /dev/null
@@ -1,279 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2010/11/26 14:49:50 adam Exp $
-
---- configure.orig	2010-06-13 21:17:37.000000000 +0000
-+++ configure
-@@ -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-ac b/editors/abiword/patches/patch-ac
deleted file mode 100644
index 8767848a01b..00000000000
--- a/editors/abiword/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.17 2010/11/26 14:49:50 adam Exp $
-
---- 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
-+#elif defined(__DragonFly__)
-+	#include <sys/endian.h>
-+	#if _BYTE_ORDER == _LITTLE_ENDIAN		
-+		#define UT_LITTLE_ENDIAN
-+	#else
-+		#define UT_BIG_ENDIAN
-+	#endif
- #elif defined(__sgi)
- 	#include <sys/endian.h>
- 	#if BYTE_ORDER == LITTLE_ENDIAN
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
deleted file mode 100644
index 27025e83fa2..00000000000
--- a/editors/abiword/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
-+++ src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af
deleted file mode 100644
index 7dd327da287..00000000000
--- a/editors/abiword/patches/patch-af
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
-+++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
- /** needed for the stejmp context */
- UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
- {
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		DELETEP(m_pPngBB);
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
diff --git a/editors/abiword/patches/patch-configure.ac b/editors/abiword/patches/patch-configure.ac
new file mode 100644
index 00000000000..6cc08d81d53
--- /dev/null
+++ b/editors/abiword/patches/patch-configure.ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure.ac,v 1.1 2015/09/13 21:32:13 nros Exp $
+Use the installed libabiword instead of the one in the build directory
+This is needed for the plugins so the can build as a separate package
+--- configure.ac.orig	2015-06-06 23:11:58.000000000 +0000
++++ configure.ac
+@@ -893,7 +893,7 @@ if test "$TOOLKIT" = "gtk"  && 
+    test "$enable_shared" = "yes"; then
+ 	# link plugins to work around gcc visibility issue with 
+ 	# derived classes in dlopened modules
+-	PLUGIN_LIBS='${top_builddir}/src/libabiword-'"$ABIWORD_SERIES"'.la'" $PLUGIN_LIBS"
++	PLUGIN_LIBS='${prefix}/lib/libabiword-'"$ABIWORD_SERIES"'.la'" $PLUGIN_LIBS"
+ elif test "$TOOLKIT" = "win"; then
+ 	PLUGIN_CFLAGS="$PLUGIN_CFLAGS "'-D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0500'
+ 	PLUGIN_LIBS='${top_builddir}/src/libabiword-'"$ABIWORD_SERIES"'.la'" $PLUGIN_LIBS"
diff --git a/editors/abiword/patches/patch-goffice-bits_goffice_app_goffice-app.h b/editors/abiword/patches/patch-goffice-bits_goffice_app_goffice-app.h
deleted file mode 100644
index c0a03ed52c0..00000000000
--- a/editors/abiword/patches/patch-goffice-bits_goffice_app_goffice-app.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-goffice-bits_goffice_app_goffice-app.h,v 1.1 2012/05/03 06:16:42 wiz Exp $
-
-Fix build with glib-2.32.
-
---- goffice-bits/goffice/app/goffice-app.h.orig	2007-01-16 23:17:27.000000000 +0000
-+++ goffice-bits/goffice/app/goffice-app.h
-@@ -22,7 +22,7 @@
- #ifndef GOFFICE_APP_H
- #define GOFFICE_APP_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/editors/abiword/patches/patch-plugin-configure.m4 b/editors/abiword/patches/patch-plugin-configure.m4
new file mode 100644
index 00000000000..9654dd3fc1f
--- /dev/null
+++ b/editors/abiword/patches/patch-plugin-configure.m4
@@ -0,0 +1,25 @@
+$NetBSD: patch-plugin-configure.m4,v 1.1 2015/09/13 21:32:13 nros Exp $
+* adapt wordperfect plugins to dependecies available in pkgsrc 
+  from abiword svn date 2014-12-27
+--- plugin-configure.m4.orig	2014-12-23 05:13:14.000000000 +0000
++++ plugin-configure.m4
+@@ -1355,7 +1355,7 @@ AC_SUBST([BMP_CFLAGS])
+ AC_SUBST([BMP_LIBS])
+ 
+ 
+-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
++wpg_pkgs="libwpg-0.3 $gsf_req"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then
+@@ -1469,8 +1469,8 @@ AC_SUBST([AIKSAURUS_CFLAGS])
+ AC_SUBST([AIKSAURUS_LIBS])
+ 
+ 
+-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
++wordperfect_pkgs="libwpd-0.10 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.3'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
diff --git a/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
new file mode 100644
index 00000000000..8994d60efdb
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
@@ -0,0 +1,16 @@
+$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+Use CXX for linking.
+--- plugins/aiksaurus/Makefile.am.orig	2014-03-21 23:51:31.000000000 +0000
++++ plugins/aiksaurus/Makefile.am
+@@ -28,7 +28,8 @@ aiksaurus_la_LIBADD = \
+ aiksaurus_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ aiksaurus_la_SOURCES = 
++nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp
+ 
diff --git a/editors/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am b/editors/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am
new file mode 100644
index 00000000000..8f5a68dee38
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/aiksaurus/aiksaurusgtk3/Makefile.am.orig	2014-03-08 02:55:42.000000000 +0000
++++ plugins/aiksaurus/aiksaurusgtk3/Makefile.am
+@@ -2,7 +2,7 @@ AM_CXXFLAGS = $(AIKSAURUS_CFLAGS) -Wall 
+ 
+ lib_LTLIBRARIES = libAiksaurusGtk3.la
+ 
+-libAiksaurusGtk3_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -export-dynamic
++libAiksaurusGtk3_la_LDFLAGS = -Wl,-no-undefined -release $(LT_RELEASE) -export-dynamic
+ 
+ libAiksaurusGtk3_la_LIBADD = $(AIKSAURUS_LIBS)
+ 
diff --git a/editors/abiword/patches/patch-plugins_applix_Makefile.am b/editors/abiword/patches/patch-plugins_applix_Makefile.am
new file mode 100644
index 00000000000..c6781a57717
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_applix_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_applix_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/applix/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/applix/Makefile.am
+@@ -18,7 +18,7 @@ applix_la_LIBADD = \
+ applix_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ applix_la_SOURCES = 
+ 
diff --git a/editors/abiword/patches/patch-plugins_babelfish_Makefile.am b/editors/abiword/patches/patch-plugins_babelfish_Makefile.am
new file mode 100644
index 00000000000..77563659d4f
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_babelfish_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_babelfish_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/babelfish/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/babelfish/Makefile.am
+@@ -18,7 +18,7 @@ babelfish_la_LIBADD = \
+ babelfish_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ babelfish_la_SOURCES =
+ 
diff --git a/editors/abiword/patches/patch-plugins_bmp_Makefile.am b/editors/abiword/patches/patch-plugins_bmp_Makefile.am
new file mode 100644
index 00000000000..4189c477422
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_bmp_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_bmp_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/bmp/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/bmp/Makefile.am
+@@ -18,7 +18,7 @@ bmp_la_LIBADD = \
+ bmp_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ bmp_la_SOURCES = 
+ nodist_EXTRA_bmp_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp b/editors/abiword/patches/patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp
deleted file mode 100644
index 0efb05dc4f5..00000000000
--- a/editors/abiword/patches/patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
-+++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
-@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
- 
- 	/* Clean Up Memory Used */
- 		
--	FREEP(m_pPNGInfo->palette);
-+	png_colorp palette;
-+	int num_palette;
-+	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
-+	FREEP(palette);
- 	DELETEP(pBB);
- 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-    
-@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in the png_create_read_struct() earlier.
- 	 */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
- 	{
- 		/* Reset error handling for libpng */
--		if (setjmp(m_pPNG->jmpbuf))
-+		if (setjmp(png_jmpbuf(m_pPNG)))
- 		{
- 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 			return UT_ERROR;
-@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
- UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
- {
- 	/* Reset error handling for libpng */
--	if (setjmp(m_pPNG->jmpbuf))
-+	if (setjmp(png_jmpbuf(m_pPNG)))
- 	{
- 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
- 		return UT_ERROR;
diff --git a/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am b/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am
new file mode 100644
index 00000000000..3fbf7a69f5d
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_clarisworks_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/clarisworks/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/clarisworks/Makefile.am
+@@ -18,7 +18,7 @@ clarisworks_la_LIBADD = \
+ clarisworks_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ clarisworks_la_SOURCES = 
+ 
diff --git a/editors/abiword/patches/patch-plugins_collab_Makefile.am b/editors/abiword/patches/patch-plugins_collab_Makefile.am
new file mode 100644
index 00000000000..7308e7ff4e1
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_collab_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_collab_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/collab/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/collab/Makefile.am
+@@ -22,7 +22,7 @@ collab_la_LIBADD = \
+ collab_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ collab_la_SOURCES = 
+ nodist_EXTRA_collab_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_command_Makefile.am b/editors/abiword/patches/patch-plugins_command_Makefile.am
new file mode 100644
index 00000000000..8816eb74ba1
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_command_Makefile.am
@@ -0,0 +1,17 @@
+$NetBSD: patch-plugins_command_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+Use CXX for linking.
+--- plugins/command/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/command/Makefile.am
+@@ -13,8 +13,9 @@ command_la_LIBADD = \
+ command_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ command_la_SOURCES = 
++nodist_EXTRA_command_la_SOURCES = dummy.cpp
+ 
+ endif
diff --git a/editors/abiword/patches/patch-plugins_docbook_Makefile.am b/editors/abiword/patches/patch-plugins_docbook_Makefile.am
new file mode 100644
index 00000000000..0e94e7da1fa
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_docbook_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_docbook_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/docbook/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/docbook/Makefile.am
+@@ -18,7 +18,7 @@ docbook_la_LIBADD = \
+ docbook_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ if TOOLKIT_COCOA
+ docbook_la_LDFLAGS += -headerpad_max_install_names
+ endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_eml_Makefile.am b/editors/abiword/patches/patch-plugins_eml_Makefile.am
new file mode 100644
index 00000000000..cb327e59477
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_eml_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_eml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/eml/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/eml/Makefile.am
+@@ -18,7 +18,7 @@ eml_la_LIBADD = \
+ eml_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ eml_la_SOURCES = 
+ nodist_EXTRA_eml_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_epub_Makefile.am b/editors/abiword/patches/patch-plugins_epub_Makefile.am
new file mode 100644
index 00000000000..412e02ec619
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_epub_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_epub_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/epub/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/epub/Makefile.am
+@@ -28,7 +28,7 @@ epub_la_LIBADD += $(EPUB_LIBS)
+ epub_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ if TOOLKIT_COCOA
+ epub_la_LDFLAGS += -headerpad_max_install_names
+ endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_freetranslation_Makefile.am b/editors/abiword/patches/patch-plugins_freetranslation_Makefile.am
new file mode 100644
index 00000000000..dbdb2b27149
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_freetranslation_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_freetranslation_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/freetranslation/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/freetranslation/Makefile.am
+@@ -18,7 +18,7 @@ freetranslation_la_LIBADD = \
+ freetranslation_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ freetranslation_la_SOURCES = 
+ 
diff --git a/editors/abiword/patches/patch-plugins_garble_Makefile.am b/editors/abiword/patches/patch-plugins_garble_Makefile.am
new file mode 100644
index 00000000000..c58bf86f634
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_garble_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_garble_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/garble/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/garble/Makefile.am
+@@ -13,7 +13,7 @@ garble_la_LIBADD = \
+ garble_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ garble_la_SOURCES = 
+ nodist_EXTRA_garble_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_garble_xp_abiword-garble-png.cpp b/editors/abiword/patches/patch-plugins_garble_xp_abiword-garble-png.cpp
deleted file mode 100644
index fcaa801b8a9..00000000000
--- a/editors/abiword/patches/patch-plugins_garble_xp_abiword-garble-png.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
-
-Fix build with png-1.5.
-
---- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
-+++ plugins/garble/xp/abiword-garble-png.cpp
-@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
- 		png_set_strip_alpha( png_ptr );
- 		png_set_interlace_handling( png_ptr );
- 		png_set_bgr( png_ptr );
--		rowbytes = info_ptr->rowbytes;
-+		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
- 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
- 	}
- 
diff --git a/editors/abiword/patches/patch-plugins_gda_Makefile.am b/editors/abiword/patches/patch-plugins_gda_Makefile.am
new file mode 100644
index 00000000000..8d6b11011eb
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_gda_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_gda_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/gda/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/gda/Makefile.am
+@@ -11,7 +11,7 @@ gda_la_LIBADD = \
+ gda_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ gda_la_SOURCES = 
+ 
diff --git a/editors/abiword/patches/patch-plugins_gdict_Makefile.am b/editors/abiword/patches/patch-plugins_gdict_Makefile.am
new file mode 100644
index 00000000000..31c83de24ad
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_gdict_Makefile.am
@@ -0,0 +1,18 @@
+$NetBSD: patch-plugins_gdict_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+Use CXX for linking.
+--- plugins/gdict/Makefile.am.orig	2011-12-11 05:10:10.000000000 +0000
++++ plugins/gdict/Makefile.am
+@@ -18,9 +18,10 @@ gdict_la_LIBADD = \
+ gdict_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ gdict_la_SOURCES = 
++nodist_EXTRA_gdict_la_SOURCES = dummy.cpp
+ 
+ EXTRA_DIST = \
+ 	plugin.m4
diff --git a/editors/abiword/patches/patch-plugins_gimp_Makefile.am b/editors/abiword/patches/patch-plugins_gimp_Makefile.am
new file mode 100644
index 00000000000..7828e99bcd7
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_gimp_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_gimp_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/gimp/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/gimp/Makefile.am
+@@ -18,7 +18,7 @@ gimp_la_LIBADD = \
+ gimp_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ gimp_la_SOURCES = 
+ nodist_EXTRA_gimp_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp b/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
new file mode 100644
index 00000000000..a6fa799c1f5
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_gimp_xp_AbiGimp.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+* Fix seg fault.
+--- plugins/gimp/xp/AbiGimp.cpp.orig	2013-12-23 02:37:58.000000000 +0000
++++ plugins/gimp/xp/AbiGimp.cpp
+@@ -249,6 +249,10 @@ AbiGimp_invoke(AV_View* /*v*/, EV_EditMe
+ {
+     // Get the current view that the user is in.
+     XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
++    if (pFrame == NULL) {
++      UT_DEBUGMSG(("Gimp plugin: getLastFocussedFrame() returned NULL\n"));
++      return false;
++    }
+     FV_View* pView = static_cast<FV_View*>(pFrame->getCurrentView());
+ 
+ //
diff --git a/editors/abiword/patches/patch-plugins_goffice_Makefile.am b/editors/abiword/patches/patch-plugins_goffice_Makefile.am
new file mode 100644
index 00000000000..cee37edcb49
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_goffice_Makefile.am
@@ -0,0 +1,24 @@
+$NetBSD: patch-plugins_goffice_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+Use CXX for linking.
+--- plugins/goffice/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/goffice/Makefile.am
+@@ -1,4 +1,5 @@
+ 
++
+ SUBDIRS = unix
+ 
+ plugindir = $(ABIWORD_PLUGINSDIR)
+@@ -11,9 +12,10 @@ goffice_la_LIBADD = \
+ goffice_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ goffice_la_SOURCES = 
++nodist_EXTRA_goffice_la_SOURCES = dummy.cpp
+ 
+ EXTRA_DIST = \
+ 	plugin.m4
diff --git a/editors/abiword/patches/patch-plugins_google_Makefile.am b/editors/abiword/patches/patch-plugins_google_Makefile.am
new file mode 100644
index 00000000000..aa0335fc92f
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_google_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_google_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/google/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/google/Makefile.am
+@@ -18,7 +18,7 @@ google_la_LIBADD = \
+ google_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ google_la_SOURCES = 
+ nodist_EXTRA_google_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_grammar_Makefile.am b/editors/abiword/patches/patch-plugins_grammar_Makefile.am
new file mode 100644
index 00000000000..24d6564a463
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_grammar_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_grammar_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/grammar/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/grammar/Makefile.am
+@@ -12,7 +12,7 @@ grammar_la_LIBADD = \
+ grammar_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ nodist_EXTRA_grammar_la_SOURCES = dummy.cpp
+ grammar_la_SOURCES = 
diff --git a/editors/abiword/patches/patch-plugins_hancom_Makefile.am b/editors/abiword/patches/patch-plugins_hancom_Makefile.am
new file mode 100644
index 00000000000..0a1a1243c39
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_hancom_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_hancom_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/hancom/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/hancom/Makefile.am
+@@ -18,7 +18,7 @@ hancom_la_LIBADD = \
+ hancom_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ hancom_la_SOURCES = 
+ nodist_EXTRA_hancom_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_hrtext_Makefile.am b/editors/abiword/patches/patch-plugins_hrtext_Makefile.am
new file mode 100644
index 00000000000..71e03659492
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_hrtext_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_hrtext_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/hrtext/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/hrtext/Makefile.am
+@@ -18,7 +18,7 @@ hrtext_la_LIBADD = \
+ hrtext_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ hrtext_la_SOURCES = 
+ nodist_EXTRA_hrtext_la_SOURCES = dummy.cpp 
diff --git a/editors/abiword/patches/patch-plugins_iscii_Makefile.am b/editors/abiword/patches/patch-plugins_iscii_Makefile.am
new file mode 100644
index 00000000000..d9f2f736686
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_iscii_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_iscii_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/iscii/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/iscii/Makefile.am
+@@ -18,7 +18,7 @@ iscii_la_LIBADD = \
+ iscii_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ iscii_la_SOURCES = 
+ nodist_EXTRA_iscii_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_kword_Makefile.am b/editors/abiword/patches/patch-plugins_kword_Makefile.am
new file mode 100644
index 00000000000..3bf8d1f2356
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_kword_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_kword_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/kword/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/kword/Makefile.am
+@@ -18,7 +18,7 @@ kword_la_LIBADD = \
+ kword_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ kword_la_SOURCES = 
+ nodist_EXTRA_kword_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_latex_Makefile.am b/editors/abiword/patches/patch-plugins_latex_Makefile.am
new file mode 100644
index 00000000000..564c93e4055
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_latex_Makefile.am
@@ -0,0 +1,20 @@
+$NetBSD: patch-plugins_latex_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/latex/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/latex/Makefile.am
+@@ -1,4 +1,5 @@
+ 
++
+ if HAVE_LIBXSLT
+ SUBDIRS = xp xsltml
+ else
+@@ -22,7 +23,7 @@ latex_la_LIBADD = \
+ latex_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ if TOOLKIT_COCOA
+ latex_la_LDFLAGS += -headerpad_max_install_names
+ endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_loadbindings_Makefile.am b/editors/abiword/patches/patch-plugins_loadbindings_Makefile.am
new file mode 100644
index 00000000000..ab35c279068
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_loadbindings_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_loadbindings_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/loadbindings/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/loadbindings/Makefile.am
+@@ -18,7 +18,7 @@ loadbindings_la_LIBADD = \
+ loadbindings_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ loadbindings_la_SOURCES = 
+ nodist_EXTRA_loadbindings_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_mathview_Makefile.am b/editors/abiword/patches/patch-plugins_mathview_Makefile.am
new file mode 100644
index 00000000000..35b1dbcd0f4
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_mathview_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_mathview_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/mathview/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/mathview/Makefile.am
+@@ -12,7 +12,7 @@ mathview_la_LIBADD = \
+ mathview_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ nodist_EXTRA_mathview_la_SOURCES = dummy.cpp
+ mathview_la_SOURCES = 
diff --git a/editors/abiword/patches/patch-plugins_mht_Makefile.am b/editors/abiword/patches/patch-plugins_mht_Makefile.am
new file mode 100644
index 00000000000..b278aed2aec
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_mht_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_mht_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/mht/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/mht/Makefile.am
+@@ -11,7 +11,7 @@ mht_la_LIBADD = \
+ mht_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ mht_la_SOURCES = 
+ nodist_EXTRA_mht_la_SOURCES =  dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_mif_Makefile.am b/editors/abiword/patches/patch-plugins_mif_Makefile.am
new file mode 100644
index 00000000000..c3c75b34d77
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_mif_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_mif_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/mif/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/mif/Makefile.am
+@@ -18,7 +18,7 @@ mif_la_LIBADD = \
+ mif_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ mif_la_SOURCES = 
+ nodist_EXTRA_mif_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_mswrite_Makefile.am b/editors/abiword/patches/patch-plugins_mswrite_Makefile.am
new file mode 100644
index 00000000000..f8d232bd019
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_mswrite_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_mswrite_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/mswrite/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/mswrite/Makefile.am
+@@ -18,7 +18,7 @@ mswrite_la_LIBADD = \
+ mswrite_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ mswrite_la_SOURCES = 
+ nodist_EXTRA_mswrite_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_opendocument_Makefile.am b/editors/abiword/patches/patch-plugins_opendocument_Makefile.am
new file mode 100644
index 00000000000..ae452aa74c4
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_opendocument_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_opendocument_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/opendocument/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/opendocument/Makefile.am
+@@ -21,7 +21,7 @@ opendocument_la_LIBADD = \
+ opendocument_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ if TOOLKIT_COCOA
+ opendocument_la_LDFLAGS += -headerpad_max_install_names
+ endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_openwriter_Makefile.am b/editors/abiword/patches/patch-plugins_openwriter_Makefile.am
new file mode 100644
index 00000000000..d9f5967357a
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_openwriter_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_openwriter_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/openwriter/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/openwriter/Makefile.am
+@@ -18,7 +18,7 @@ openwriter_la_LIBADD = \
+ openwriter_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ if TOOLKIT_COCOA
+ openwriter_la_LDFLAGS += -headerpad_max_install_names
+ endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_openxml_Makefile.am b/editors/abiword/patches/patch-plugins_openxml_Makefile.am
new file mode 100644
index 00000000000..56f94b67b22
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_openxml_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_openxml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/openxml/Makefile.am.orig	2012-11-25 18:08:57.000000000 +0000
++++ plugins/openxml/Makefile.am
+@@ -20,7 +20,7 @@ openxml_la_LIBADD = \
+ openxml_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ if TOOLKIT_COCOA
+ openxml_la_LDFLAGS += -headerpad_max_install_names
+ endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_opml_Makefile.am b/editors/abiword/patches/patch-plugins_opml_Makefile.am
new file mode 100644
index 00000000000..635c9fedc0e
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_opml_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_opml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/opml/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/opml/Makefile.am
+@@ -18,7 +18,7 @@ opml_la_LIBADD = \
+ opml_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ if TOOLKIT_COCOA
+ opml_la_LDFLAGS += -headerpad_max_install_names
+ endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_ots_Makefile.am b/editors/abiword/patches/patch-plugins_ots_Makefile.am
new file mode 100644
index 00000000000..5f88c5055bf
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_ots_Makefile.am
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_ots_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/ots/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/ots/Makefile.am
+@@ -9,6 +9,7 @@ ots_la_LIBADD = \
+ 	$(OTS_LIBS)
+ 
+ ots_la_LDFLAGS = \
++	-Wl, \
+ 	-avoid-version \
+ 	-module \
+ 	-no-undefined
diff --git a/editors/abiword/patches/patch-plugins_paint_Makefile.am b/editors/abiword/patches/patch-plugins_paint_Makefile.am
new file mode 100644
index 00000000000..90e24facd47
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_paint_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_paint_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/paint/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/paint/Makefile.am
+@@ -20,7 +20,7 @@ paint_la_LIBADD = \
+ paint_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ paint_la_SOURCES = 
+ nodist_EXTRA_paint_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp b/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
new file mode 100644
index 00000000000..5148dfc55c5
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_paint_xp_AbiGeneric.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+If pFrame is NULL an image is obviously not selected.
+Fixes seg fault.
+--- plugins/paint/xp/AbiGeneric.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/paint/xp/AbiGeneric.cpp
+@@ -297,6 +297,9 @@ bool isImageSelected (void)
+ {
+ 	// Get the current view that the user is in.
+ 	XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
++	if (pFrame == NULL) {
++	  return false;
++	}
+ 	FV_View* pView = static_cast<FV_View*>(pFrame->getCurrentView());
+ 
+     return (pView->getSelectedImage(NULL) != 0);
diff --git a/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp b/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
new file mode 100644
index 00000000000..2dd14b28b90
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-plugins_paint_xp_AbiPaint.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+* Fix seg fault.
+--- plugins/paint/xp/AbiPaint.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/paint/xp/AbiPaint.cpp
+@@ -177,6 +177,9 @@ static DECLARE_ABI_PLUGIN_METHOD(specify
+ 
+ 	// Get a frame in case we need to show an error message
+ 	XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
++	if (pFrame == NULL) {
++	  return false;
++	}
+ 
+ 	{
+ 		const char * szDescList[3];
+@@ -254,6 +257,10 @@ static DECLARE_ABI_PLUGIN_METHOD(saveAsB
+ {
+ 	// Get a frame (for error messages) and (to) get the current view that the user is in.
+ 	XAP_Frame *pFrame = XAP_App::getApp()->getLastFocussedFrame();
++	if (pFrame == NULL) {
++	  g_varning("paint saveAsBmp: getLastFocussedFrame returned NULL\n");
++	  return false;
++	}
+ 	FV_View* pView = static_cast<FV_View*>(pFrame->getCurrentView());
+ 
+ 	char *szTempFileName = NULL;
diff --git a/editors/abiword/patches/patch-plugins_passepartout_Makefile.am b/editors/abiword/patches/patch-plugins_passepartout_Makefile.am
new file mode 100644
index 00000000000..27f865ac1bb
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_passepartout_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_passepartout_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/passepartout/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/passepartout/Makefile.am
+@@ -18,7 +18,7 @@ passepartout_la_LIBADD = \
+ passepartout_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ passepartout_la_SOURCES = 
+ nodist_EXTRA_passepartout_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_pdb_Makefile.am b/editors/abiword/patches/patch-plugins_pdb_Makefile.am
new file mode 100644
index 00000000000..94be9601292
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_pdb_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_pdb_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/pdb/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/pdb/Makefile.am
+@@ -18,7 +18,7 @@ pdb_la_LIBADD = \
+ pdb_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ pdb_la_SOURCES = 
+ nodist_EXTRA_pdb_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_pdf_Makefile.am b/editors/abiword/patches/patch-plugins_pdf_Makefile.am
new file mode 100644
index 00000000000..96570f5be41
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_pdf_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_pdf_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/pdf/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/pdf/Makefile.am
+@@ -18,7 +18,7 @@ pdf_la_LIBADD = \
+ pdf_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ pdf_la_SOURCES = 
+ nodist_EXTRA_pdf_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_presentation_Makefile.am b/editors/abiword/patches/patch-plugins_presentation_Makefile.am
new file mode 100644
index 00000000000..40c158717be
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_presentation_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_presentation_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/presentation/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/presentation/Makefile.am
+@@ -18,7 +18,7 @@ presentation_la_LIBADD = \
+ presentation_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ presentation_la_SOURCES = 
+ nodist_EXTRA_presentation_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_psion_Makefile.am b/editors/abiword/patches/patch-plugins_psion_Makefile.am
new file mode 100644
index 00000000000..1cb03e62a9e
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_psion_Makefile.am
@@ -0,0 +1,18 @@
+$NetBSD: patch-plugins_psion_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+Use CXX for linking.
+--- plugins/psion/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/psion/Makefile.am
+@@ -11,9 +11,10 @@ psion_la_LIBADD = \
+ psion_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ psion_la_SOURCES = 
++nodist_EXTRA_psion_la_SOURCES = dummy.cpp
+ 
+ EXTRA_DIST = \
+ 	plugin.m4
diff --git a/editors/abiword/patches/patch-plugins_rsvg_Makefile.am b/editors/abiword/patches/patch-plugins_rsvg_Makefile.am
new file mode 100644
index 00000000000..d5bff47d439
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_rsvg_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_rsvg_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/rsvg/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/rsvg/Makefile.am
+@@ -12,7 +12,7 @@ rsvg_la_LIBADD = \
+ rsvg_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ rsvg_la_SOURCES = 
+ nodist_EXTRA_rsvg_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_s5_Makefile.am b/editors/abiword/patches/patch-plugins_s5_Makefile.am
new file mode 100644
index 00000000000..eed86278335
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_s5_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_s5_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/s5/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/s5/Makefile.am
+@@ -18,7 +18,7 @@ s5_la_LIBADD = \
+ s5_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ s5_la_SOURCES = 
+ nodist_EXTRA_s5_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_sdw_Makefile.am b/editors/abiword/patches/patch-plugins_sdw_Makefile.am
new file mode 100644
index 00000000000..3f1a5590c2d
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_sdw_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_sdw_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/sdw/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/sdw/Makefile.am
+@@ -18,7 +18,7 @@ sdw_la_LIBADD = \
+ sdw_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ sdw_la_SOURCES = 
+ nodist_EXTRA_sdw_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_t602_Makefile.am b/editors/abiword/patches/patch-plugins_t602_Makefile.am
new file mode 100644
index 00000000000..d1426652636
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_t602_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_t602_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/t602/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/t602/Makefile.am
+@@ -18,7 +18,7 @@ t602_la_LIBADD = \
+ t602_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ t602_la_SOURCES = 
+ nodist_EXTRA_t602_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_urldict_Makefile.am b/editors/abiword/patches/patch-plugins_urldict_Makefile.am
new file mode 100644
index 00000000000..7e8d85d16c8
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_urldict_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_urldict_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/urldict/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/urldict/Makefile.am
+@@ -18,7 +18,7 @@ urldict_la_LIBADD = \
+ urldict_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ urldict_la_SOURCES = 
+ nodist_EXTRA_urldict_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wikipedia_Makefile.am b/editors/abiword/patches/patch-plugins_wikipedia_Makefile.am
new file mode 100644
index 00000000000..3173602e3ed
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wikipedia_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_wikipedia_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/wikipedia/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/wikipedia/Makefile.am
+@@ -18,7 +18,7 @@ wikipedia_la_LIBADD = \
+ wikipedia_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ wikipedia_la_SOURCES = 
+ nodist_EXTRA_wikipedia_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wmf_Makefile.am b/editors/abiword/patches/patch-plugins_wmf_Makefile.am
new file mode 100644
index 00000000000..5d9f6d50113
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wmf_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_wmf_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/wmf/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/wmf/Makefile.am
+@@ -11,7 +11,7 @@ wmf_la_LIBADD = \
+ wmf_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ wmf_la_SOURCES = 
+ nodist_EXTRA_wmf_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wml_Makefile.am b/editors/abiword/patches/patch-plugins_wml_Makefile.am
new file mode 100644
index 00000000000..d20dc757afd
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wml_Makefile.am
@@ -0,0 +1,20 @@
+$NetBSD: patch-plugins_wml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/wml/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/wml/Makefile.am
+@@ -1,4 +1,5 @@
+ 
++
+ SUBDIRS = xp
+ 
+ if WML_BUILTIN
+@@ -18,7 +19,7 @@ wml_la_LIBADD = \
+ wml_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ wml_la_SOURCES = 
+ nodist_EXTRA_wml_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_Makefile.am b/editors/abiword/patches/patch-plugins_wordperfect_Makefile.am
new file mode 100644
index 00000000000..967d70b37c9
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wordperfect_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_wordperfect_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/wordperfect/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/wordperfect/Makefile.am
+@@ -11,7 +11,7 @@ wordperfect_la_LIBADD = \
+ wordperfect_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ wordperfect_la_SOURCES = 
+ nodist_EXTRA_wordperfect_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am b/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
new file mode 100644
index 00000000000..d397e59401f
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_wordperfect_xp_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+* adapt wordperfect plugins to dependecies available in pkgsrc 
+  from abiword svn date 2014-12-27
+--- plugins/wordperfect/xp/Makefile.am.orig	2008-05-08 13:12:53.000000000 +0000
++++ plugins/wordperfect/xp/Makefile.am
+@@ -6,8 +6,6 @@ AM_CPPFLAGS = \
+ 	-DABI_BUILD_VERSION=\"$(VERSION)\"
+ 
+ libxp_la_SOURCES = \
+-	ie_exp_WordPerfect.cpp \
+-	ie_exp_WordPerfect.h \
+ 	ie_impexp_WordPerfect.cpp \
+ 	ie_impexp_WordPerfect.h \
+ 	ie_imp_WordPerfect.cpp \
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
new file mode 100644
index 00000000000..c315a1cafcd
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
@@ -0,0 +1,653 @@
+$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+* adapt wordperfect plugins to dependecies available in pkgsrc 
+  from abiword svn date 2014-12-27
+--- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
+@@ -31,6 +31,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
++#include <map>
++#include <string>
+ #include <gsf/gsf-utils.h>
+ #include <gsf/gsf-input-memory.h>
+ #include <gsf/gsf-input-stdio.h>
+@@ -60,42 +62,47 @@
+ 
+ // Stream class
+ 
+-#include <libwpd-stream/libwpd-stream.h>
++#include <librevenge-stream/librevenge-stream.h>
++#include <libwpd/libwpd.h>
+ 
+ #include <gsf/gsf-input.h>
+ #include <gsf/gsf-infile.h>
+ #include <gsf/gsf-infile-msole.h>
++#include <gsf/gsf-infile-zip.h>
+ 
+ #ifdef HAVE_LIBWPS
+ #include <libwps/libwps.h>
+ #endif
+ 
+-class AbiWordperfectInputStream : public WPXInputStream
++class AbiWordperfectInputStream : public librevenge::RVNGInputStream
+ {
+ public:
+ 	AbiWordperfectInputStream(GsfInput *input);
+ 	~AbiWordperfectInputStream();
+ 
+-	virtual bool isOLEStream();
+-	virtual WPXInputStream * getDocumentOLEStream();
+-
+-	virtual WPXInputStream * getDocumentOLEStream(const char * name);
+-
++	virtual bool isStructured();
++	virtual unsigned subStreamCount();
++	virtual const char* subStreamName(unsigned);
++	bool existsSubStream(const char*);
++	virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
++	virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
+ 	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+-	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
++	virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
+ 	virtual long tell();
+-	virtual bool atEOS();
++	virtual bool isEnd();
+ 
+ private:
+ 
+ 	GsfInput *m_input;
+ 	GsfInfile *m_ole;
++	std::map<unsigned, std::string> m_substreams;
+ };
+ 
+ AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) :
+-	WPXInputStream(),
++	librevenge::RVNGInputStream(),
+ 	m_input(input),
+-	m_ole(NULL)
++	m_ole(NULL),
++	m_substreams()
+ {
+ 	g_object_ref(G_OBJECT(input));
+ }
+@@ -120,45 +127,115 @@ const unsigned char * AbiWordperfectInpu
+ 	return buf;
+ }
+ 
+-int AbiWordperfectInputStream::seek(long offset, WPX_SEEK_TYPE seekType) 
++int AbiWordperfectInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) 
+ {
+ 	GSeekType gsfSeekType = G_SEEK_SET;
+ 	switch(seekType)
+ 	{
+-	case WPX_SEEK_CUR:
++	case librevenge::RVNG_SEEK_CUR:
+ 		gsfSeekType = G_SEEK_CUR;
+ 		break;
+-	case WPX_SEEK_SET:
++	case librevenge::RVNG_SEEK_SET:
+ 		gsfSeekType = G_SEEK_SET;
+ 		break;
++	case librevenge::RVNG_SEEK_END:
++		gsfSeekType = G_SEEK_END;
++		break;
+ 	}
+ 
+ 	return gsf_input_seek(m_input, offset, gsfSeekType);
+ }
+ 
+-bool AbiWordperfectInputStream::isOLEStream()
++bool AbiWordperfectInputStream::isStructured()
+ {
+ 	if (!m_ole)
+ 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
+ 
+-	if (m_ole != NULL)
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
+ 		return true;
+ 
+ 	return false;
+ }
+ 
+-WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream()
++unsigned AbiWordperfectInputStream::subStreamCount()
+ {
+-	return getDocumentOLEStream("PerfectOffice_MAIN");
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
++		{
++			int numChildren = gsf_infile_num_children(m_ole);
++			if (numChildren > 0)
++				return numChildren;
++			return 0;
++		}
++	
++	return 0;
+ }
+ 
+-WPXInputStream * AbiWordperfectInputStream::getDocumentOLEStream(const char * name)
++const char * AbiWordperfectInputStream::subStreamName(unsigned id)
+ {
+-	WPXInputStream *documentStream = NULL;
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
+ 	
+ 	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
++		{
++			if ((int)id >= gsf_infile_num_children(m_ole))
++			{
++				return 0;
++			}
++			std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
++			if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
++				{
++					std::string name = gsf_infile_name_by_index(m_ole, (int)id);
++					i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
++				}
++			return i->second.c_str();
++		}
++	
++	return 0;
++}
++
++bool AbiWordperfectInputStream::existsSubStream(const char * name)
++{
++	if (!m_ole)
+ 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
+ 	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
++		{
++			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
++			if (document) 
++				{
++					g_object_unref(G_OBJECT (document));
++					return true;
++				}
++		}
++	
++	return false;
++}
++
++librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamByName(const char * name)
++{
++	librevenge::RVNGInputStream *documentStream = NULL;
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
+ 	if (m_ole)
+ 		{
+ 			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
+@@ -172,12 +249,35 @@ WPXInputStream * AbiWordperfectInputStre
+ 	return documentStream;
+ }
+ 
++librevenge::RVNGInputStream * AbiWordperfectInputStream::getSubStreamById(unsigned id)
++{
++	librevenge::RVNGInputStream *documentStream = NULL;
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
++		{
++			GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
++			if (document) 
++				{
++					documentStream = new AbiWordperfectInputStream(document);
++					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
++				}
++		}
++	
++	return documentStream;
++}
++
+ long AbiWordperfectInputStream::tell()
+ {
+ 	return gsf_input_tell(m_input);
+ }
+ 
+-bool AbiWordperfectInputStream::atEOS()
++bool AbiWordperfectInputStream::isEnd()
+ {
+ 	return gsf_input_eof(m_input);
+ }
+@@ -247,13 +347,13 @@ UT_Confidence_t IE_Imp_WordPerfect_Sniff
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+-	WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput);
+-
++	libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(&gsfInput);
++	
+ 	switch (confidence)
+ 	{
+-		case WPD_CONFIDENCE_NONE:
++		case libwpd::WPD_CONFIDENCE_NONE:
+ 			return UT_CONFIDENCE_ZILCH;
+-		case WPD_CONFIDENCE_EXCELLENT:
++		case libwpd::WPD_CONFIDENCE_EXCELLENT:
+ 			return UT_CONFIDENCE_PERFECT;
+ 		default:
+ 			return UT_CONFIDENCE_ZILCH;
+@@ -312,9 +412,9 @@ IE_Imp_WordPerfect::~IE_Imp_WordPerfect(
+ UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input)
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+-	WPDResult error = WPDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this), NULL);
++	libwpd::WPDResult error = libwpd::WPDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this), NULL);
+ 
+-	if (error != WPD_OK)
++	if (error != libwpd::WPD_OK)
+ 	{
+ 		UT_DEBUGMSG(("AbiWordPerfect: ERROR: %i!\n", (int)error));
+ 		return UT_IE_IMPORTERROR;
+@@ -329,7 +429,7 @@ void IE_Imp_WordPerfect::pasteFromBuffer
+ 	// nada
+ }
+ 
+-void IE_Imp_WordPerfect::setDocumentMetaData(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::setDocumentMetaData(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (propList["dc:author"])
+ 		getDoc()->setMetaDataProp(PD_META_KEY_CREATOR, propList["dc:author"]->getStr().cstr());
+@@ -339,15 +439,15 @@ void IE_Imp_WordPerfect::setDocumentMeta
+ 		getDoc()->setMetaDataProp(PD_META_KEY_PUBLISHER, propList["dc:publisher"]->getStr().cstr());
+ 	if (propList["dc:type"])
+ 		getDoc()->setMetaDataProp(PD_META_KEY_TYPE, propList["dc:category"]->getStr().cstr());
+-	if (propList["libwpd:keywords"])
+-		getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["libwpd:keywords"]->getStr().cstr());
++	if (propList["librevenge:keywords"])
++		getDoc()->setMetaDataProp(PD_META_KEY_KEYWORDS, propList["librevenge:keywords"]->getStr().cstr());
+ 	if (propList["dc:language"])
+ 		getDoc()->setMetaDataProp(PD_META_KEY_LANGUAGE, propList["dc:language"]->getStr().cstr());
+-	if (propList["libwpd:abstract"])
+-		getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["libwpd:abstract"]->getStr().cstr());
++	if (propList["librevenge:abstract"])
++		getDoc()->setMetaDataProp(PD_META_KEY_DESCRIPTION, propList["librevenge:abstract"]->getStr().cstr());
+ }
+ 
+-void IE_Imp_WordPerfect::startDocument()
++void IE_Imp_WordPerfect::startDocument(const librevenge::RVNGPropertyList & /* propList */)
+ {
+ 	UT_DEBUGMSG(("AbiWordPerfect: startDocument\n"));
+ }
+@@ -357,7 +457,7 @@ void IE_Imp_WordPerfect::endDocument()
+ 	UT_DEBUGMSG(("AbiWordPerfect: endDocument\n"));
+ }
+ 
+-void IE_Imp_WordPerfect::openPageSpan(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openPageSpan(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	UT_DEBUGMSG(("AbiWordPerfect: openPageSpan\n"));
+@@ -378,7 +478,7 @@ void IE_Imp_WordPerfect::openPageSpan(co
+ 		
+ }
+ 
+-void IE_Imp_WordPerfect::openHeader(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openHeader(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ 	m_bHdrFtrOpenCount++;
+ 	
+@@ -420,7 +520,7 @@ void IE_Imp_WordPerfect::closeHeader()
+ 	*/
+ }
+ 
+-void IE_Imp_WordPerfect::openFooter(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openFooter(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ 	m_bHdrFtrOpenCount++;
+ 	// see above comments re: openHeader
+@@ -432,7 +532,7 @@ void IE_Imp_WordPerfect::closeFooter()
+ 	// see above comments re: closeHeader
+ }
+ 
+-void IE_Imp_WordPerfect::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
++void IE_Imp_WordPerfect::openParagraph(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	UT_DEBUGMSG(("AbiWordPerfect: openParagraph()\n"));
+@@ -478,13 +578,15 @@ void IE_Imp_WordPerfect::openParagraph(c
+ 		(int)(m_topMargin*72), (int)(m_bottomMargin*72), m_leftMarginOffset, m_rightMarginOffset, m_textIndent, lineSpacing);
+ 	propBuffer += tmpBuffer;
+ 	
+-	if (tabStops.count() > 0) // Append the tabstop information
++	const librevenge::RVNGPropertyListVector *tabStops = propList.child("style:tab-stops");
++	
++	if (tabStops && tabStops->count()) // Append the tabstop information
+ 	{
+ 		propBuffer += "; tabstops:";
+ 		tmpBuffer = "";
+-                WPXPropertyListVector::Iter i(tabStops);
+-                for (i.rewind(); i.next();)
+-                {
++		librevenge::RVNGPropertyListVector::Iter i(*tabStops);
++		for (i.rewind(); i.next();)
++		{
+ 			propBuffer += tmpBuffer;
+ 			if (i()["style:position"])
+ 			{
+@@ -515,8 +617,8 @@ void IE_Imp_WordPerfect::openParagraph(c
+ 				propBuffer += "0";
+ 
+ 			tmpBuffer = ",";
+-                }
+-        }
++		}
++	}
+ 
+ 	
+ 
+@@ -543,7 +645,7 @@ void IE_Imp_WordPerfect::openParagraph(c
+ 	}
+ }
+ 
+-void IE_Imp_WordPerfect::openSpan(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openSpan(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	UT_DEBUGMSG(("AbiWordPerfect: Appending current text properties\n"));
+@@ -614,13 +716,14 @@ void IE_Imp_WordPerfect::openSpan(const 
+ 	X_CheckDocumentError(appendFmt(propsArray));
+ }
+ 
+-void IE_Imp_WordPerfect::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
++void IE_Imp_WordPerfect::openSection(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	UT_DEBUGMSG(("AbiWordPerfect: openSection\n"));
+ 
+ 	float marginLeft = 0.0f, marginRight = 0.0f;
+-	int columnsCount = ((columns.count() == 0) ? 1 : columns.count());
++	const librevenge::RVNGPropertyListVector *columns = propList.child("style:columns");
++	int columnsCount = ((!columns || !columns->count()) ? 1 : columns->count());
+ 
+ 	// TODO: support spaceAfter
+ 	if (propList["fo:start-indent"])
+@@ -647,7 +750,7 @@ void IE_Imp_WordPerfect::insertTab()
+ 	X_CheckDocumentError(appendSpan(&ucs,1));	
+ }
+ 
+-void IE_Imp_WordPerfect::insertText(const WPXString &text)
++void IE_Imp_WordPerfect::insertText(const librevenge::RVNGString &text)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	if (text.len())
+@@ -658,6 +761,15 @@ void IE_Imp_WordPerfect::insertText(cons
+ 	}
+ }
+ 
++void IE_Imp_WordPerfect::insertSpace()
++{
++	if (m_bHdrFtrOpenCount) return; // HACK
++	UT_DEBUGMSG(("AbiWordPerfect: insertSpace\n"));
++
++	UT_UCS4Char ucs = UCS_SPACE;
++	X_CheckDocumentError(appendSpan(&ucs,1));	
++}
++
+ void IE_Imp_WordPerfect::insertLineBreak()
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+@@ -668,24 +780,23 @@ void IE_Imp_WordPerfect::insertLineBreak
+ }
+ 
+ 
+-
+-void IE_Imp_WordPerfect::defineOrderedListLevel(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openOrderedListLevel(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+-	UT_DEBUGMSG(("AbiWordPerfect: defineOrderedListLevel\n"));
+-
++	UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
++	
+ 	int listID = 0, startingNumber = 0, level = 1;
+ 	char listType = '1';
+ 	UT_UTF8String textBeforeNumber, textAfterNumber;
+ 	float listLeftOffset = 0.0f;
+ 	float listMinLabelWidth = 0.0f;
+ 	
+-	if (propList["libwpd:id"])
+-		listID = propList["libwpd:id"]->getInt();
++	if (propList["librevenge:id"])
++		listID = propList["librevenge:id"]->getInt();
+ 	if (propList["text:start-value"])
+ 		startingNumber = propList["text:start-value"]->getInt();
+-	if (propList["libwpd:level"])
+-		level = propList["libwpd:level"]->getInt();
++	if (propList["librevenge:level"])
++		level = propList["librevenge:level"]->getInt();
+ 	if (propList["style:num-prefix"])
+ 		textBeforeNumber += propList["style:num-prefix"]->getStr().cstr();
+ 	if (propList["style:num-suffix"])
+@@ -716,22 +827,38 @@ void IE_Imp_WordPerfect::defineOrderedLi
+ 		m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
+ 		_updateDocumentOrderedListDefinition(m_pCurrentListDefinition, level, listType, textBeforeNumber, textAfterNumber, startingNumber);
+ 	}
++
++	m_iCurrentListLevel++;
+ }
+ 
+-void IE_Imp_WordPerfect::defineUnorderedListLevel(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::closeOrderedListLevel()
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+-	UT_DEBUGMSG(("AbiWordPerfect: defineUnorderedListLevel\n"));
++	UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
++	UT_ASSERT(m_iCurrentListLevel > 0); 
++	
++	// every time we close a list level, the level above it is normally renumbered to start at "1"
++	// again. this code takes care of that.
++	if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
++		m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
++	
++	m_iCurrentListLevel--;
++}
+ 
++void IE_Imp_WordPerfect::openUnorderedListLevel(const librevenge::RVNGPropertyList &propList)
++{
++	if (m_bHdrFtrOpenCount) return; // HACK
++	UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
++	
+ 	int listID = 0, level = 1;
+-	WPXString textBeforeNumber, textAfterNumber;
++	librevenge::RVNGString textBeforeNumber, textAfterNumber;
+ 	float listLeftOffset = 0.0f;
+ 	float listMinLabelWidth = 0.0f;
+ 	
+-	if (propList["libwpd:id"])
+-		listID = propList["libwpd:id"]->getInt();
+-	if (propList["libwpd:level"])
+-		level = propList["libwpd:level"]->getInt();
++	if (propList["librevenge:id"])
++		listID = propList["librevenge:id"]->getInt();
++	if (propList["librevenge:level"])
++		level = propList["librevenge:level"]->getInt();
+ 	if (propList["text:space-before"])
+ 		listLeftOffset = propList["text:space-before"]->getDouble();
+ 	if (propList["text:min-label-width"])
+@@ -752,36 +879,7 @@ void IE_Imp_WordPerfect::defineUnordered
+ 		m_pCurrentListDefinition->setListMinLabelWidth(level, listMinLabelWidth);
+ 		_updateDocumentUnorderedListDefinition(m_pCurrentListDefinition, level);
+ 	}
+-}
+ 
+-//void IE_Imp_WordPerfect::openOrderedListLevel(const int listID)
+-void IE_Imp_WordPerfect::openOrderedListLevel(const WPXPropertyList & /*propList*/)
+-{
+-	if (m_bHdrFtrOpenCount) return; // HACK
+-	UT_DEBUGMSG(("AbiWordPerfect: openOrderedListLevel\n"));
+-	
+-	m_iCurrentListLevel++;
+-}
+-
+-void IE_Imp_WordPerfect::closeOrderedListLevel()
+-{
+-	if (m_bHdrFtrOpenCount) return; // HACK
+-	UT_DEBUGMSG(("AbiWordPerfect: closeOrderedListLevel (level: %i)\n", m_iCurrentListLevel));
+-	UT_ASSERT(m_iCurrentListLevel > 0); 
+-	
+-	// every time we close a list level, the level above it is normally renumbered to start at "1"
+-	// again. this code takes care of that.
+-	if (m_iCurrentListLevel < (WP6_NUM_LIST_LEVELS-1))
+-		m_pCurrentListDefinition->setLevelNumber(m_iCurrentListLevel + 1, 0);
+-	
+-	m_iCurrentListLevel--;
+-}
+-
+-void IE_Imp_WordPerfect::openUnorderedListLevel(const WPXPropertyList & /*propList*/)
+-{
+-	if (m_bHdrFtrOpenCount) return; // HACK
+-	UT_DEBUGMSG(("AbiWordPerfect: openUNorderedListLevel\n"));
+-	
+ 	m_iCurrentListLevel++;
+ }
+ 
+@@ -796,7 +894,7 @@ void IE_Imp_WordPerfect::closeUnorderedL
+ 
+ // ASSUMPTION: We assume that unordered lists will always pass a number of "0". unpredictable behaviour
+ // may result otherwise
+-void IE_Imp_WordPerfect::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector & /*tabStops*/)
++void IE_Imp_WordPerfect::openListElement(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	UT_DEBUGMSG(("AbiWordPerfect: openListElement\n"));
+@@ -885,7 +983,7 @@ void IE_Imp_WordPerfect::openListElement
+ 	X_CheckDocumentError(appendSpan(&ucs,1));
+ }
+ 
+-void IE_Imp_WordPerfect::openFootnote(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openFootnote(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 
+@@ -934,7 +1032,7 @@ void IE_Imp_WordPerfect::closeFootnote()
+ 	X_CheckDocumentError(appendStrux(PTX_EndFootnote,NULL));
+ }
+ 
+-void IE_Imp_WordPerfect::openEndnote(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openEndnote(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	const gchar** propsArray = NULL;
+@@ -975,7 +1073,7 @@ void IE_Imp_WordPerfect::closeEndnote()
+ 	X_CheckDocumentError(appendStrux(PTX_EndEndnote,NULL));
+ }
+ 
+-void IE_Imp_WordPerfect::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
++void IE_Imp_WordPerfect::openTable(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	// TODO: handle 'marginLeftOffset' and 'marginRightOffset'
+@@ -1000,14 +1098,18 @@ void IE_Imp_WordPerfect::openTable(const
+ 		}
+ 	}
+ 	
+-	propBuffer += "table-column-props:";
+-	WPXPropertyListVector::Iter i(columns);
+-	for (i.rewind(); i.next();)
+-	{
+-		UT_String tmpBuffer;
+-		if (i()["style:column-width"])
+-			UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
+-		propBuffer += tmpBuffer;
++	const librevenge::RVNGPropertyListVector *columns = propList.child("librevenge:table-columns");
++	if (columns)
++	{
++		propBuffer += "table-column-props:";
++		librevenge::RVNGPropertyListVector::Iter i(*columns);
++		for (i.rewind(); i.next();)
++		{
++			UT_String tmpBuffer;
++			if (i()["style:column-width"])
++				UT_String_sprintf(tmpBuffer, "%s/", i()["style:column-width"]->getStr().cstr());
++			propBuffer += tmpBuffer;
++		}
+ 	}
+ 
+ 	const gchar* propsArray[3];
+@@ -1018,7 +1120,7 @@ void IE_Imp_WordPerfect::openTable(const
+ 	X_CheckDocumentError(appendStrux(PTX_SectionTable, propsArray));
+ }
+ 
+-void IE_Imp_WordPerfect::openTableRow(const WPXPropertyList & /*propList*/)
++void IE_Imp_WordPerfect::openTableRow(const librevenge::RVNGPropertyList & /*propList*/)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	UT_DEBUGMSG(("AbiWordPerfect: openRow\n"));
+@@ -1030,14 +1132,14 @@ void IE_Imp_WordPerfect::openTableRow(co
+ 	m_bInCell = false;
+ }
+ 
+-void IE_Imp_WordPerfect::openTableCell(const WPXPropertyList &propList)
++void IE_Imp_WordPerfect::openTableCell(const librevenge::RVNGPropertyList &propList)
+ {
+ 	if (m_bHdrFtrOpenCount) return; // HACK
+ 	int col =0,  row = 0, colSpan = 0, rowSpan = 0;
+-	if (propList["libwpd:column"])
+-		col = propList["libwpd:column"]->getInt();
+-	if (propList["libwpd:row"])
+-		row = propList["libwpd:row"]->getInt();
++	if (propList["librevenge:column"])
++		col = propList["librevenge:column"]->getInt();
++	if (propList["librevenge:row"])
++		row = propList["librevenge:row"]->getInt();
+ 	if (propList["table:number-columns-spanned"])
+ 		colSpan = propList["table:number-columns-spanned"]->getInt();
+ 	if (propList["table:number-rows-spanned"])
+@@ -1247,9 +1349,9 @@ protected:
+     virtual UT_Error _loadFile(GsfInput * input)
+ 	{
+ 		AbiWordperfectInputStream gsfInput(input);
+-		WPSResult error = WPSDocument::parse(&gsfInput, static_cast<WPXDocumentInterface *>(this));
++		libwps::WPSResult error = libwps::WPSDocument::parse(&gsfInput, static_cast<librevenge::RVNGTextInterface *>(this));
+ 
+-		if (error != WPS_OK)
++		if (error != libwps::WPS_OK)
+ 			{
+ 				UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error));
+ 				return UT_IE_IMPORTERROR;
+@@ -1286,13 +1388,17 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::
+ {
+ 	AbiWordperfectInputStream gsfInput(input);
+ 
+-	WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
++	libwps::WPSKind kind;
++	libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
++	
++	if (kind != libwps::WPS_TEXT)
++		confidence = libwps::WPS_CONFIDENCE_NONE;
+ 
+ 	switch (confidence)
+ 	{
+-		case WPS_CONFIDENCE_NONE:
++		case libwps::WPS_CONFIDENCE_NONE:
+ 			return UT_CONFIDENCE_ZILCH;
+-		case WPS_CONFIDENCE_EXCELLENT:
++		case libwps::WPS_CONFIDENCE_EXCELLENT:
+ 			return UT_CONFIDENCE_PERFECT;
+ 		default:
+ 			return UT_CONFIDENCE_ZILCH;
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
new file mode 100644
index 00000000000..9e9a48a6eb8
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
@@ -0,0 +1,165 @@
+$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h,v 1.1 2015/09/13 21:32:13 nros Exp $
+* adapt wordperfect plugins to dependecies available in pkgsrc 
+  from abiword svn date 2014-12-27
+--- plugins/wordperfect/xp/ie_imp_WordPerfect.h.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/wordperfect/xp/ie_imp_WordPerfect.h
+@@ -30,7 +30,7 @@
+ #define IE_IMP_WP_H
+ 
+ #include <stdio.h>
+-#include <libwpd/libwpd.h>
++#include <librevenge/librevenge.h>
+ #include "ie_imp.h"
+ #include "ut_string.h"
+ #include "ut_string_class.h"
+@@ -92,7 +92,7 @@ public:
+ 					IE_Imp ** ppie);
+ };
+ 
+-class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface
++class IE_Imp_WordPerfect : public IE_Imp, public librevenge::RVNGTextInterface
+ {
+ public:
+     IE_Imp_WordPerfect(PD_Document * pDocument);
+@@ -101,68 +101,82 @@ public:
+     virtual void pasteFromBuffer(PD_DocumentRange * pDocRange,
+ 				 UT_uint8 * pData, UT_uint32 lenData, const char * szEncoding = 0);
+ 
+-    virtual void setDocumentMetaData(const WPXPropertyList &propList);
++	virtual void setDocumentMetaData(const librevenge::RVNGPropertyList &propList);
+ 
+-    virtual void startDocument();
+-    virtual void endDocument();
++	virtual void startDocument(const librevenge::RVNGPropertyList &propList);
++	virtual void endDocument();
+ 
+-    virtual void openPageSpan(const WPXPropertyList &propList);
+-    virtual void closePageSpan() {}
+-    virtual void openHeader(const WPXPropertyList &propList);
+-    virtual void closeHeader();
+-    virtual void openFooter(const WPXPropertyList &propList);
+-    virtual void closeFooter();
+-
+-    virtual void openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
+-    virtual void closeParagraph() {}
+-
+-    virtual void openSpan(const WPXPropertyList &propList);
+-    virtual void closeSpan() {}
+-
+-    virtual void openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
+-    virtual void closeSection() {}
+-
+-    virtual void insertTab();
+-    virtual void insertText(const WPXString &text);
+-    virtual void insertLineBreak();
+-
+-    virtual void defineOrderedListLevel(const WPXPropertyList &propList);
+-    virtual void defineUnorderedListLevel(const WPXPropertyList &propList);
+-    virtual void openOrderedListLevel(const WPXPropertyList &propList);
+-    virtual void openUnorderedListLevel(const WPXPropertyList &propList);
+-    virtual void closeOrderedListLevel();
+-    virtual void closeUnorderedListLevel();
+-    virtual void openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops);
+-    virtual void closeListElement() {}
+-
+-    virtual void openFootnote(const WPXPropertyList &propList);
+-    virtual void closeFootnote();
+-    virtual void openEndnote(const WPXPropertyList &propList);
+-    virtual void closeEndnote();
+-
+-    virtual void openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns);
+-    virtual void openTableRow(const WPXPropertyList &propList);
+-    virtual void closeTableRow() {}
+-    virtual void openTableCell(const WPXPropertyList &propList);
+-    virtual void closeTableCell() {}
+-    virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {}
+-    virtual void closeTable();
+-
+-    virtual void definePageStyle(const WPXPropertyList&) {}
+-    virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
+-    virtual void defineCharacterStyle(const WPXPropertyList&) {}
+-    virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {}
+-    virtual void insertSpace() {}
+-    virtual void insertField(const WPXString&, const WPXPropertyList&) {}
+-    virtual void openComment(const WPXPropertyList&) {}
+-    virtual void closeComment() {}
+-    virtual void openTextBox(const WPXPropertyList&) {}
+-    virtual void closeTextBox() {}
+-    virtual void openFrame(const WPXPropertyList&) {}
+-    virtual void closeFrame() {}
+-    virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {}
+-    virtual void insertEquation(const WPXPropertyList&, const WPXString&) {}
++	virtual void defineEmbeddedFont(const librevenge::RVNGPropertyList & /* propList */) {}
+ 
++	virtual void definePageStyle(const librevenge::RVNGPropertyList &) {}
++	virtual void openPageSpan(const librevenge::RVNGPropertyList &propList);
++	virtual void closePageSpan() {}
++	virtual void openHeader(const librevenge::RVNGPropertyList &propList);
++	virtual void closeHeader();
++	virtual void openFooter(const librevenge::RVNGPropertyList &propList);
++	virtual void closeFooter();
++
++	virtual void defineSectionStyle(const librevenge::RVNGPropertyList &) {}
++	virtual void openSection(const librevenge::RVNGPropertyList &propList);
++	virtual void closeSection() {}
++
++	virtual void defineParagraphStyle(const librevenge::RVNGPropertyList &) {}
++	virtual void openParagraph(const librevenge::RVNGPropertyList &propList);
++	virtual void closeParagraph() {}
++
++	virtual void defineCharacterStyle(const librevenge::RVNGPropertyList &) {}
++	virtual void openSpan(const librevenge::RVNGPropertyList &propList);
++	virtual void closeSpan() {}
++
++	virtual void openLink(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void closeLink() {}
++
++	virtual void insertTab();
++	virtual void insertText(const librevenge::RVNGString &text);
++	virtual void insertSpace();
++	virtual void insertLineBreak();
++	virtual void insertField(const librevenge::RVNGPropertyList & /* propList */) {}
++
++	virtual void openOrderedListLevel(const librevenge::RVNGPropertyList &propList);
++	virtual void openUnorderedListLevel(const librevenge::RVNGPropertyList &propList);
++	virtual void closeOrderedListLevel();
++	virtual void closeUnorderedListLevel();
++	virtual void openListElement(const librevenge::RVNGPropertyList &propList);
++	virtual void closeListElement() {}
++
++	virtual void openFootnote(const librevenge::RVNGPropertyList &propList);
++	virtual void closeFootnote();
++	virtual void openEndnote(const librevenge::RVNGPropertyList &propList);
++	virtual void closeEndnote();
++	virtual void openComment(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void closeComment() {}
++	virtual void openTextBox(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void closeTextBox() {}
++
++	virtual void openTable(const librevenge::RVNGPropertyList &propList);
++	virtual void openTableRow(const librevenge::RVNGPropertyList &propList);
++	virtual void closeTableRow() {}
++	virtual void openTableCell(const librevenge::RVNGPropertyList &propList);
++	virtual void closeTableCell() {}
++	virtual void insertCoveredTableCell(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void closeTable();
++
++	virtual void openFrame(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void closeFrame() {}
++
++	virtual void openGroup(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void closeGroup() {}
++
++	virtual void defineGraphicStyle(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void drawRectangle(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void drawEllipse(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void drawPolygon(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void drawPolyline(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void drawPath(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void drawConnector(const librevenge::RVNGPropertyList & /* propList */) {}
++
++	virtual void insertBinaryObject(const librevenge::RVNGPropertyList & /* propList */) {}
++	virtual void insertEquation(const librevenge::RVNGPropertyList & /* propList */) {}
+ 
+ protected:
+ 	virtual UT_Error _loadFile(GsfInput * input);
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
new file mode 100644
index 00000000000..1e87a858f54
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
@@ -0,0 +1,55 @@
+$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+* adapt wordperfect plugins to dependecies available in pkgsrc 
+  from abiword svn date 2014-12-27
+--- plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp
+@@ -35,7 +35,6 @@
+ ABI_PLUGIN_DECLARE("WordPerfect")
+ 
+ static IE_Imp_WordPerfect_Sniffer * m_ImpSniffer = 0;
+-static IE_Exp_WordPerfect_Sniffer * m_ExpSniffer = 0;
+ 
+ #ifdef HAVE_LIBWPS
+ static IE_Imp_MSWorks_Sniffer * m_MSWorks_ImpSniffer = 0;
+@@ -49,13 +48,7 @@ int abi_plugin_register (XAP_ModuleInfo 
+ 		m_ImpSniffer = new IE_Imp_WordPerfect_Sniffer ();
+ 	}
+ 
+-	if (!m_ExpSniffer)
+-	{
+-		m_ExpSniffer = new IE_Exp_WordPerfect_Sniffer ();
+-	}
+-
+ 	UT_ASSERT (m_ImpSniffer);
+-	UT_ASSERT (m_ExpSniffer);
+ 
+ #ifdef HAVE_LIBWPS
+ 	if (!m_MSWorks_ImpSniffer)
+@@ -79,7 +72,7 @@ int abi_plugin_register (XAP_ModuleInfo 
+ 	mi->usage   = "No Usage";
+ 
+ 	IE_Imp::registerImporter (m_ImpSniffer);
+-	//IE_Exp::registerExporter (m_ExpSniffer);
++
+ 	return 1;
+ }
+ 
+@@ -93,18 +86,11 @@ int abi_plugin_unregister (XAP_ModuleInf
+ 	mi->usage   = 0;
+ 
+ 	UT_ASSERT (m_ImpSniffer);
+-	UT_ASSERT (m_ExpSniffer);
+ 
+ 	IE_Imp::unregisterImporter (m_ImpSniffer);
+ 	delete m_ImpSniffer;
+ 	m_ImpSniffer = 0;
+ 	
+-	/*
+-	IE_Exp::unregisterExporter (m_ExpSniffer);
+-	delete m_ExpSniffer;
+-	m_ExpSniffer = 0;
+-	*/
+-
+ #ifdef HAVE_LIBWPS
+ 	IE_Imp::unregisterImporter (m_MSWorks_ImpSniffer);
+ 	delete m_MSWorks_ImpSniffer;
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
new file mode 100644
index 00000000000..056bd3ae21c
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h,v 1.1 2015/09/13 21:32:13 nros Exp $
+* adapt wordperfect plugins to dependecies available in pkgsrc 
+  from abiword svn date 2014-12-27
+--- plugins/wordperfect/xp/ie_impexp_WordPerfect.h.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/wordperfect/xp/ie_impexp_WordPerfect.h
+@@ -24,7 +24,6 @@
+  */
+ 
+ #include "ie_imp_WordPerfect.h"
+-#include "ie_exp_WordPerfect.h"
+ #include "xap_Module.h"
+ 
+ #define IE_MIMETYPE_WP_51			"application/wordperfect5.1"
diff --git a/editors/abiword/patches/patch-plugins_wpg_Makefile.am b/editors/abiword/patches/patch-plugins_wpg_Makefile.am
new file mode 100644
index 00000000000..d623237390b
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wpg_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_wpg_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/wpg/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/wpg/Makefile.am
+@@ -11,7 +11,7 @@ wpg_la_LIBADD = \
+ wpg_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ wpg_la_SOURCES = 
+ nodist_EXTRA_wpg_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp b/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
new file mode 100644
index 00000000000..1a065d11e44
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
@@ -0,0 +1,252 @@
+$NetBSD: patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+* adapt wordperfect plugins to dependecies available in pkgsrc 
+  from abiword svn date 2014-12-27
+--- plugins/wpg/xp/ie_impGraphic_WPG.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ plugins/wpg/xp/ie_impGraphic_WPG.cpp
+@@ -31,37 +31,43 @@
+ #include <gsf/gsf-input-memory.h>
+ #include <gsf/gsf-input-stdio.h>
+ #include <gsf/gsf-infile-msole.h>
+-#include <libwpd-stream/libwpd-stream.h>
++#include <gsf/gsf-infile-zip.h>
++#include <librevenge-stream/librevenge-stream.h>
+ #include "xap_Module.h"
+ 
+ using libwpg::WPGraphics;
+ 
+ ABI_PLUGIN_DECLARE("WPG")
+ 
+-class AbiWordPerfectGraphicsInputStream : public WPXInputStream
++class AbiWordPerfectGraphicsInputStream : public librevenge::RVNGInputStream
+ {
+ public:
+ 	AbiWordPerfectGraphicsInputStream(GsfInput *input);
+ 	~AbiWordPerfectGraphicsInputStream();
+ 
+-	virtual bool isOLEStream();
+-	virtual WPXInputStream * getDocumentOLEStream();
+-	virtual WPXInputStream * getDocumentOLEStream(const char * name);
++	virtual bool isStructured();
++	virtual unsigned subStreamCount();
++	virtual const char* subStreamName(unsigned);
++	bool existsSubStream(const char*);
++	virtual librevenge::RVNGInputStream* getSubStreamByName(const char*);
++	virtual librevenge::RVNGInputStream* getSubStreamById(unsigned);
+ 	virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead);
+-	virtual int seek(long offset, WPX_SEEK_TYPE seekType);
++	virtual int seek(long offset, librevenge::RVNG_SEEK_TYPE seekType);
+ 	virtual long tell();
+-	virtual bool atEOS();
++	virtual bool isEnd();
+ 
+ private:
+ 
+ 	GsfInput *m_input;
+ 	GsfInfile *m_ole;
++	std::map<unsigned, std::string> m_substreams;
+ };
+ 
+ AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) :
+-	WPXInputStream(),
++	librevenge::RVNGInputStream(),
+ 	m_input(input),
+-	m_ole(NULL)
++	m_ole(NULL),
++	m_substreams()
+ {
+ 	g_object_ref(G_OBJECT(input));
+ }
+@@ -86,45 +92,115 @@ const unsigned char * AbiWordPerfectGrap
+ 	return buf;
+ }
+ 
+-int AbiWordPerfectGraphicsInputStream::seek(long offset, WPX_SEEK_TYPE seekType) 
++int AbiWordPerfectGraphicsInputStream::seek(long offset, librevenge::RVNG_SEEK_TYPE seekType) 
+ {
+ 	GSeekType gsfSeekType = G_SEEK_SET;
+ 	switch(seekType)
+ 	{
+-	case WPX_SEEK_CUR:
++	case librevenge::RVNG_SEEK_CUR:
+ 		gsfSeekType = G_SEEK_CUR;
+ 		break;
+-	case WPX_SEEK_SET:
++	case librevenge::RVNG_SEEK_SET:
+ 		gsfSeekType = G_SEEK_SET;
+ 		break;
++	case librevenge::RVNG_SEEK_END:
++		gsfSeekType = G_SEEK_END;
++		break;
+ 	}
+ 
+ 	return gsf_input_seek(m_input, offset, gsfSeekType);
+ }
+ 
+-bool AbiWordPerfectGraphicsInputStream::isOLEStream()
++bool AbiWordPerfectGraphicsInputStream::isStructured()
+ {
+ 	if (!m_ole)
+ 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
+ 
+-	if (m_ole != NULL)
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
+ 		return true;
+ 
+ 	return false;
+ }
+ 
+-WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream()
++unsigned AbiWordPerfectGraphicsInputStream::subStreamCount()
+ {
+-	return getDocumentOLEStream("PerfectOffice_MAIN");
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
++		{
++			int numChildren = gsf_infile_num_children(m_ole);
++			if (numChildren > 0)
++				return numChildren;
++			return 0;
++		}
++	
++	return 0;
+ }
+ 
+-WPXInputStream * AbiWordPerfectGraphicsInputStream::getDocumentOLEStream(const char * name)
++const char * AbiWordPerfectGraphicsInputStream::subStreamName(unsigned id)
+ {
+-	WPXInputStream *documentStream = NULL;
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
+ 	
++	if (m_ole)
++		{
++			if ((int)id >= gsf_infile_num_children(m_ole))
++			{
++				return 0;
++			}
++			std::map<unsigned, std::string>::iterator i = m_substreams.lower_bound(id);
++			if (i == m_substreams.end() || m_substreams.key_comp()(id, i->first))
++				{
++					std::string name = gsf_infile_name_by_index(m_ole, (int)id);
++					i = m_substreams.insert(i, std::map<unsigned, std::string>::value_type(id, name));
++				}
++			return i->second.c_str();
++		}
++	
++	return 0;
++}
++
++bool AbiWordPerfectGraphicsInputStream::existsSubStream(const char * name)
++{
+ 	if (!m_ole)
+ 		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
+ 	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
++		{
++			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
++			if (document) 
++				{
++					g_object_unref(G_OBJECT (document));
++					return true;
++				}
++		}
++	
++	return false;
++}
++
++librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamByName(const char * name)
++{
++	librevenge::RVNGInputStream *documentStream = NULL;
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
+ 	if (m_ole)
+ 		{
+ 			GsfInput *document = gsf_infile_child_by_name(m_ole, name);
+@@ -138,12 +214,35 @@ WPXInputStream * AbiWordPerfectGraphicsI
+ 	return documentStream;
+ }
+ 
++librevenge::RVNGInputStream * AbiWordPerfectGraphicsInputStream::getSubStreamById(unsigned id)
++{
++	librevenge::RVNGInputStream *documentStream = NULL;
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_msole_new (m_input, NULL)); 
++	
++	if (!m_ole)
++		m_ole = GSF_INFILE(gsf_infile_zip_new (m_input, NULL)); 
++	
++	if (m_ole)
++		{
++			GsfInput *document = gsf_infile_child_by_index(m_ole, (int)id);
++			if (document) 
++				{
++					documentStream = new AbiWordPerfectGraphicsInputStream(document);
++					g_object_unref(G_OBJECT (document)); // the only reference should be encapsulated within the new stream
++				}
++		}
++	
++	return documentStream;
++}
++
+ long AbiWordPerfectGraphicsInputStream::tell()
+ {
+ 	return gsf_input_tell(m_input);
+ }
+ 
+-bool AbiWordPerfectGraphicsInputStream::atEOS()
++bool AbiWordPerfectGraphicsInputStream::isEnd()
+ {
+ 	return gsf_input_eof(m_input);
+ }
+@@ -244,14 +343,24 @@ UT_Error IE_Imp_WordPerfectGraphics_Snif
+ UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg)
+ {
+ 	AbiWordPerfectGraphicsInputStream gsfInput(input);
+-	WPXString svgOutput;
+-	if (WPGraphics::generateSVG(&gsfInput, svgOutput))
++	librevenge::RVNGString svgOutput;
++	librevenge::RVNGStringVector vec;
++	librevenge::RVNGSVGDrawingGenerator generator(vec, "");
++
++	if (!libwpg::WPGraphics::parse(&gsfInput, &generator) || vec.empty() || vec[0].empty())
+ 	{
+-		GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
+-		UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
+-		g_object_unref(svgInput);
+-		return result;
++		return UT_ERROR;
+ 	}
+-	return UT_ERROR;
++
++	svgOutput.append("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n");
++	svgOutput.append("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\"");
++	svgOutput.append(" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
++	svgOutput.append(vec[0]);
++	svgOutput.append("\n");
++
++	GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false);
++	UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg);
++	g_object_unref(svgInput);
++	return result;
+ }
+ 
diff --git a/editors/abiword/patches/patch-plugins_xslfo_Makefile.am b/editors/abiword/patches/patch-plugins_xslfo_Makefile.am
new file mode 100644
index 00000000000..ef093bfe289
--- /dev/null
+++ b/editors/abiword/patches/patch-plugins_xslfo_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-plugins_xslfo_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- plugins/xslfo/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
++++ plugins/xslfo/Makefile.am
+@@ -18,7 +18,7 @@ xslfo_la_LIBADD = \
+ xslfo_la_LDFLAGS = \
+ 	-avoid-version \
+ 	-module \
+-	-no-undefined
++	-Wl,-no-undefined
+ 
+ xslfo_la_SOURCES = 
+ nodist_EXTRA_xslfo_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-src_Makefile.am b/editors/abiword/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..d74964d32b1
--- /dev/null
+++ b/editors/abiword/patches/patch-src_Makefile.am
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
+to the linker.  Prefix with "-Wl," to fix build.
+--- src/Makefile.am.orig	2013-02-20 00:39:42.000000000 +0000
++++ src/Makefile.am
+@@ -58,7 +58,7 @@ libabiword_@ABIWORD_SERIES@_la_CPPFLAGS 
+ libabiword_@ABIWORD_SERIES@_la_LDFLAGS = \
+ 	$(DEPS_LIBS) \
+ 	$(CHAMPLAIN_LIBS) \
+-	-no-undefined \
++	-Wl,-no-undefined \
+ 	-avoid-version \
+ 	-export-dynamic
+ 
diff --git a/editors/abiword/patches/patch-src_Makefile.in b/editors/abiword/patches/patch-src_Makefile.in
deleted file mode 100644
index 644ab789df2..00000000000
--- a/editors/abiword/patches/patch-src_Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2012/10/09 19:57:02 marino Exp $
-
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall to
-the linker.  Prefix with "-Wl," to fix build.
-
---- src/Makefile.in.orig	2012-10-09 18:55:25.000000000 +0000
-+++ src/Makefile.in
-@@ -503,7 +503,7 @@ libabiword_2_8_la_CPPFLAGS = \
- 	$(WP_CPPFLAGS) \
- 	-DABIWORD_DATADIR="\"$(ABIWORD_DATADIR)\""
- 
--libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) --no-undefined -avoid-version \
-+libabiword_2_8_la_LDFLAGS = $(DEPS_LIBS) -Wl,--no-undefined -avoid-version \
- 	-export-dynamic $(am__append_6)
- libabiword_2_8_la_LIBADD = $(opt_libs) plugins/libplugins.la \
- 	text/fmt/xp/libxp.la text/ptbl/xp/libxp.la \
-@@ -538,7 +538,7 @@ WINDRES_CPPFLAGS = -I$(top_srcdir)/src/a
- 
- @TOOLKIT_COCOA_TRUE@AbiWord_LDFLAGS = \
- @TOOLKIT_COCOA_TRUE@	$(DEPS_LIBS) \
--@TOOLKIT_COCOA_TRUE@	--no-undefined \
-+@TOOLKIT_COCOA_TRUE@	-Wl,--no-undefined \
- @TOOLKIT_COCOA_TRUE@	-avoid-version \
- @TOOLKIT_COCOA_TRUE@	-export-dynamic \
- @TOOLKIT_COCOA_TRUE@	-headerpad_max_install_names 
-@@ -554,7 +554,7 @@ WINDRES_CPPFLAGS = -I$(top_srcdir)/src/a
- 
- @TOOLKIT_COCOA_FALSE@abiword_LDFLAGS = \
- @TOOLKIT_COCOA_FALSE@	$(platform_ldflags) \
--@TOOLKIT_COCOA_FALSE@	--no-undefined      \
-+@TOOLKIT_COCOA_FALSE@	-Wl,--no-undefined \
- @TOOLKIT_COCOA_FALSE@	-avoid-version      \
- @TOOLKIT_COCOA_FALSE@	-export-dynamic
- 
diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h b/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h
new file mode 100644
index 00000000000..954f30e8148
--- /dev/null
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_af_util_xp_ut__endian.h,v 1.1 2015/09/13 21:32:13 nros Exp $
+
+--- src/af/util/xp/ut_endian.h.orig	2013-04-07 13:53:03.000000000 +0000
++++ src/af/util/xp/ut_endian.h
+@@ -49,6 +49,13 @@
+ 	#else
+ 		#define UT_BIG_ENDIAN
+ 	#endif
++#elif defined(__DragonFly__)
++	#include <sys/endian.h>
++	#if _BYTE_ORDER == _LITTLE_ENDIAN		
++		#define UT_LITTLE_ENDIAN
++	#else
++		#define UT_BIG_ENDIAN
++	#endif
+ #elif defined(__FreeBSD__)
+ 	#include <machine/endian.h>
+ 	#if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h b/editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h
deleted file mode 100644
index 1663572522d..00000000000
--- a/editors/abiword/patches/patch-src_af_util_xp_ut__go__file.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_af_util_xp_ut__go__file.h,v 1.1 2012/05/03 06:16:42 wiz Exp $
-
-Fix build with glib-2.32.
-
---- src/af/util/xp/ut_go_file.h.orig	2009-08-27 13:27:10.000000000 +0000
-+++ src/af/util/xp/ut_go_file.h
-@@ -31,7 +31,6 @@
- 
- #include <glib.h>
- #include <gsf/gsf.h>
--#include <glib/gerror.h>
- #include <time.h>
- 
- G_BEGIN_DECLS
diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
index 0f5ecb9891d..49a3f973a9e 100644
--- a/editors/abiword/patches/patch-ab
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.17 2010/11/26 14:49:50 adam Exp $
-
---- src/af/util/xp/ut_iconv.cpp.orig	2009-06-25 00:52:27.000000000 +0000
+$NetBSD: patch-src_af_util_xp_ut__iconv.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+* NetBSD uses citrus iconv that has UCS-4
+--- src/af/util/xp/ut_iconv.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ src/af/util/xp/ut_iconv.cpp
 @@ -267,9 +267,11 @@ const char * ucs4Internal ()
  #elif defined(_LIBICONV_H)
diff --git a/editors/abiword/patches/patch-ad b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.h
index ae5fe156f36..3e32598c8d2 100644
--- a/editors/abiword/patches/patch-ad
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.h
@@ -1,9 +1,13 @@
-$NetBSD: patch-ad,v 1.15 2010/11/26 14:49:50 adam Exp $
+$NetBSD: patch-src_af_util_xp_ut__iconv.h,v 1.1 2015/09/13 21:32:13 nros Exp $
 
---- src/af/util/xp/ut_iconv.h.orig	2009-06-25 00:52:27.000000000 +0000
+--- src/af/util/xp/ut_iconv.h.orig	2013-04-07 13:53:03.000000000 +0000
 +++ src/af/util/xp/ut_iconv.h
-@@ -32,8 +32,14 @@
+@@ -30,8 +30,14 @@
+ #include "ut_types.h"
+ #endif
  
++#include <sys/param.h>
++
  typedef void * UT_iconv_t;
  
 +#if defined(__NetBSD__) && __NetBSD_Version__ >= 200000000
@@ -12,8 +16,4 @@ $NetBSD: patch-ad,v 1.15 2010/11/26 14:49:50 adam Exp $
 +
  #define UT_ICONV_INVALID ((UT_iconv_t)(-1))
  
-+#include <sys/param.h>
-+
  #ifdef __cplusplus
- 
- 
diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp b/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
new file mode 100644
index 00000000000..5d884912871
--- /dev/null
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_af_util_xp_ut__mbtowc.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+* remove bom if it comes with the conversion
+  makes the rulers look correct on startup
+--- src/af/util/xp/ut_mbtowc.cpp.orig	2013-04-07 13:53:03.000000000 +0000
++++ src/af/util/xp/ut_mbtowc.cpp
+@@ -192,7 +192,24 @@ int UT_UCS4_mbtowc::mbtowc (UT_UCS4Char 
+ 	gsize bytes_read = 0;
+ 	gsize bytes_written = 0;
+ 	GError* error = NULL;
+-	gchar* out = g_convert_with_iconv(inptr, inlen, (GIConv)cd, &bytes_read, &bytes_written, &error);
++	gchar* out = NULL;
++        unsigned char bom_le[4] = {0xFF,0xFE,0,0};
++	unsigned char bom_be[4] = {0,0,0xFE,0xFF};
++	
++	out = g_convert_with_iconv(inptr, inlen, (GIConv)cd, &bytes_read, &bytes_written, &error);
++	// if we get a bom with the conversion redo it to get one without a bom
++	if (out && bytes_written == 8)
++	{
++                if (memcmp(out, bom_be, 4) == 0 || memcmp(out, bom_le, 4) == 0)
++                {
++                        bytes_read = 0;
++                        bytes_written = 0;
++                        error = NULL;
++                        FREEP(out);
++			out = g_convert_with_iconv(inptr, inlen, (GIConv)cd, &bytes_read, &bytes_written, &error);
++                }
++        }
++	
+ 	if (out && bytes_written == 4)
+ 	{
+ 		memcpy(&wc, out, 4);
diff --git a/editors/abiword/patches/patch-sa b/editors/abiword/patches/patch-src_af_util_xp_ut__misc.cpp
index 4440c95b854..7ebdb5b480d 100644
--- a/editors/abiword/patches/patch-sa
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__misc.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-sa,v 1.3 2010/11/26 14:49:50 adam Exp $
+$NetBSD: patch-src_af_util_xp_ut__misc.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
 
---- src/af/util/xp/ut_misc.cpp.orig	2009-06-28 22:09:08.000000000 +0000
+--- src/af/util/xp/ut_misc.cpp.orig	2013-04-07 13:53:03.000000000 +0000
 +++ src/af/util/xp/ut_misc.cpp
-@@ -625,7 +625,7 @@ const gchar ** UT_splitPropsToArray(gcha
+@@ -589,7 +589,7 @@ const gchar ** UT_splitPropsToArray(gcha
  		}
  
  		char * semi = NULL;
@@ -11,7 +11,7 @@ $NetBSD: patch-sa,v 1.3 2010/11/26 14:49:50 adam Exp $
   		while((semi = (char *) strchr(p, ';')))
  		{
  			*semi = 0;
-@@ -639,7 +639,7 @@ const gchar ** UT_splitPropsToArray(gcha
+@@ -603,7 +603,7 @@ const gchar ** UT_splitPropsToArray(gcha
  		const gchar ** pPropsArray = new const gchar *[2 * iPropCount + 1];
  		UT_return_val_if_fail( pPropsArray, NULL );
  	
diff --git a/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp b/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
new file mode 100644
index 00000000000..e6d263547b4
--- /dev/null
+++ b/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.cpp
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $
+
+* fixes build on FreeBSD 10 with clang. From FreeBSD ports mailing list.
+  Applied upstream.
+  https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html
+
+--- src/text/ptbl/xp/pd_DocumentRDF.cpp.orig	2015-04-04 22:33:15.000000000 +0000
++++ src/text/ptbl/xp/pd_DocumentRDF.cpp
+@@ -570,6 +570,11 @@ bool PD_URI::operator==(const std::strin
+     return m_value == b;
+ }
+ 
++bool PD_URI::operator<(const PD_URI& b) const
++{
++return m_value < b.m_value;
++}
++
+ PD_URI
+ PD_URI::prefixedToURI( PD_RDFModelHandle model ) const
+ {
+@@ -611,11 +616,6 @@ bool PD_URI::write( std::ostream& ss ) c
+     return true;
+ }
+ 
+-bool operator<( PD_URI a, PD_URI b)
+-{
+-    return a.toString() < b.toString();
+-}
+-
+ bool operator<( std::pair< PD_URI, PD_URI > a, PD_URI b)
+ {
+     return a.first.toString() < b.toString();
diff --git a/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h b/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h
new file mode 100644
index 00000000000..3b12d543664
--- /dev/null
+++ b/editors/abiword/patches/patch-src_text_ptbl_xp_pd__DocumentRDF.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_text_ptbl_xp_pd__DocumentRDF.h,v 1.1 2015/09/13 21:32:13 nros Exp $
+* Fixes build on FreeBSD 10 with clang. From freebsd-ports mailing list.
+  Applied upstream.
+  https://lists.freebsd.org/pipermail/freebsd-ports/2015-March/098621.html
+
+--- src/text/ptbl/xp/pd_DocumentRDF.h.orig	2015-04-04 22:38:01.000000000 +0000
++++ src/text/ptbl/xp/pd_DocumentRDF.h
+@@ -68,6 +68,7 @@ class ABI_EXPORT PD_URI
+     bool isValid() const;
+     bool operator==(const PD_URI& b) const;
+     bool operator==(const std::string& b) const;
++    bool operator<(const PD_URI& b) const;
+ 
+     virtual bool read( std::istream& ss );
+     virtual bool write( std::ostream& ss ) const;