Update to 0.2.4:

	Bump version for possible release
	Update doxygen.cfg file
	Ignore the unprintable characters which can appear in the text.
	Ignore some more files
	Add -Weffc++ option for GCC to avoid producing crappy code :)
	Fix build inside a new LibreOffice
	Add Laurent to main authors (my apology for this forgetful attitude)
	Fix distcheck in build/win32
	Fixing MSVC build
	Bump version for a possible release + remove autopackage that nobody uses anyway
	Update of src/conv/ by using libwpd/src/conv as model.
	Small changes: - in WPS4.cpp: correction of an uninitialized variable, - in WPS8.cpp: small improvement of the footnote/endnote display, - in WPSContentListener.cpp: check that the lists are closed before closing a section.
	Plant some .gitignore files all around the place
	Generate ChangeLog on make dist
	Fix callgraph when footnotes are present
	check that the property remains in the FOD zone (patch Laurent Alonso)
	Fix different errors (patch Laurent Alonso)
	Fix some debug build warnings/errors
	Cleanup and rewrite of build system (patch Tomas Chvatal)
	Fix windows gcc build of libwps inside LibreOffice tree (patch Jan Holesovsky <kendy@suse.cz>)
	It seems that cfod 0x54 is legitimate (patch Urmas D. <davian818@gmail.com>)
	Update configure.ac to new syntax. Patch of Tomas Chvatal <tchvatal@suse.cz>
	Rename configure.in to configure.ac Patch of Tomas Chvatal <tchvatal@suse.cz>
	Fix makefile.am's to new syntax. Patch of Tomas Chvatal <tchvatal@suse.cz>
	Fix gcc-4.6 build

5 files changed, 12 insertions, 230 deletions

diff --git a/converters/libwps/Makefile b/converters/libwps/Makefile
index cf357687432..ce5571c5e12 100644
--- a/converters/libwps/Makefile
+++ b/converters/libwps/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2011/05/18 14:53:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2012/04/07 15:08:02 wiz Exp $
 
-DISTNAME=	libwps-0.2.2
+DISTNAME=	libwps-0.2.4
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libwps/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/converters/libwps/distinfo b/converters/libwps/distinfo
index 82b715a7e11..de22a9fe640 100644
--- a/converters/libwps/distinfo
+++ b/converters/libwps/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/03/28 15:17:19 wiz Exp $
+$NetBSD: distinfo,v 1.7 2012/04/07 15:08:02 wiz Exp $
 
-SHA1 (libwps-0.2.2.tar.bz2) = d8c126cb5601afaaaf14507fc09990f8ca41b301
-RMD160 (libwps-0.2.2.tar.bz2) = 72aff204a2a386ade5b7d5a6cede4c75f1929eb5
-Size (libwps-0.2.2.tar.bz2) = 295486 bytes
-SHA1 (patch-aa) = 5dd49b6bcb8c147409aa7192f365e9ab0a459ffb
-SHA1 (patch-src_lib_WPS4.cpp) = e39061f971199f4efe3e80793ac16aec98ba547c
-SHA1 (patch-src_lib_WPS8.cpp) = c3326fb46884fe5b5ba28f4fe75861b0e3ef35a4
+SHA1 (libwps-0.2.4.tar.bz2) = 9fff59d92d9f34259ea5b1d9eca5c30313453a64
+RMD160 (libwps-0.2.4.tar.bz2) = de70ce0d5769692a482573a573e6bdfcfaba4196
+Size (libwps-0.2.4.tar.bz2) = 314984 bytes
+SHA1 (patch-src_lib_WPS8.cpp) = aa4a14aeb9858dbe2ef09d4334eac04f7dbf85c1
diff --git a/converters/libwps/patches/patch-aa b/converters/libwps/patches/patch-aa
deleted file mode 100644
index 1cae58c6aac..00000000000
--- a/converters/libwps/patches/patch-aa
+++ /dev/null
@@ -1,172 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/11/25 10:52:19 wiz Exp $
-
-_U is defined in a NetBSD internal header.
-
---- src/conv/raw/RawListener.cpp.orig	2010-11-09 08:36:50.000000000 +0000
-+++ src/conv/raw/RawListener.cpp
-@@ -28,7 +28,7 @@
- #include <stdarg.h>
- #include "RawListener.h"
- 
--#define _U(M, L) \
-+#define _RLU(M, L) \
- 	if (!m_printCallgraphScore) \
- 			__iuprintf M; \
- 	else \
-@@ -148,7 +148,7 @@ void RawListenerImpl::setDocumentMetaDat
- 
- void RawListenerImpl::startDocument()
- {
--	_U(("startDocument()\n"), LC_START_DOCUMENT);
-+	_RLU(("startDocument()\n"), LC_START_DOCUMENT);
- }
- 
- void RawListenerImpl::endDocument()
-@@ -163,7 +163,7 @@ void RawListenerImpl::definePageStyle(co
- 
- void RawListenerImpl::openPageSpan(const WPXPropertyList &propList)
- {
--	_U(("openPageSpan(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openPageSpan(%s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_PAGE_SPAN);
- }
- 
-@@ -175,7 +175,7 @@ void RawListenerImpl::closePageSpan()
- 
- void RawListenerImpl::openHeader(const WPXPropertyList &propList)
- {
--	_U(("openHeader(%s)\n",
-+	_RLU(("openHeader(%s)\n",
- 	    getPropString(propList).cstr()),
- 	   LC_OPEN_HEADER_FOOTER);
- }
-@@ -188,7 +188,7 @@ void RawListenerImpl::closeHeader()
- 
- void RawListenerImpl::openFooter(const WPXPropertyList &propList)
- {
--	_U(("openFooter(%s)\n",
-+	_RLU(("openFooter(%s)\n",
- 	    getPropString(propList).cstr()),
- 	   LC_OPEN_HEADER_FOOTER);
- }
-@@ -206,7 +206,7 @@ void RawListenerImpl::defineParagraphSty
- 
- void RawListenerImpl::openParagraph(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
- {
--	_U(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()),
-+	_RLU(("openParagraph(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()),
- 	   LC_OPEN_PARAGRAPH);
- }
- 
-@@ -222,7 +222,7 @@ void RawListenerImpl::defineCharacterSty
- 
- void RawListenerImpl::openSpan(const WPXPropertyList &propList)
- {
--	_U(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN);
-+	_RLU(("openSpan(%s)\n", getPropString(propList).cstr()), LC_OPEN_SPAN);
- }
- 
- void RawListenerImpl::closeSpan()
-@@ -237,7 +237,7 @@ void RawListenerImpl::defineSectionStyle
- 
- void RawListenerImpl::openSection(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
- {
--	_U(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION);
-+	_RLU(("openSection(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_SECTION);
- }
- 
- void RawListenerImpl::closeSection()
-@@ -283,13 +283,13 @@ void RawListenerImpl::defineUnorderedLis
- 
- void RawListenerImpl::openOrderedListLevel(const WPXPropertyList &propList)
- {
--	_U(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openOrderedListLevel(%s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_ORDERED_LIST_LEVEL);
- }
- 
- void RawListenerImpl::openUnorderedListLevel(const WPXPropertyList &propList)
- {
--	_U(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openUnorderedListLevel(%s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_UNORDERED_LIST_LEVEL);
- }
- 
-@@ -306,7 +306,7 @@ void RawListenerImpl::closeUnorderedList
- 
- void RawListenerImpl::openListElement(const WPXPropertyList &propList, const WPXPropertyListVector &tabStops)
- {
--	_U(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), 
-+	_RLU(("openListElement(%s, tab-stops: %s)\n", getPropString(propList).cstr(), getPropString(tabStops).cstr()), 
- 	   LC_OPEN_LIST_ELEMENT);
- }
- 
-@@ -317,7 +317,7 @@ void RawListenerImpl::closeListElement()
- 
- void RawListenerImpl::openFootnote(const WPXPropertyList &propList)
- {
--	_U(("openFootnote(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openFootnote(%s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_FOOTNOTE);
- }
- 
-@@ -328,7 +328,7 @@ void RawListenerImpl::closeFootnote()
- 
- void RawListenerImpl::openEndnote(const WPXPropertyList &propList)
- {
--	_U(("openEndnote(number: %s)\n", getPropString(propList).cstr()),
-+	_RLU(("openEndnote(number: %s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_ENDNOTE);
- }
- 
-@@ -339,7 +339,7 @@ void RawListenerImpl::closeEndnote()
- 
- void RawListenerImpl::openComment(const WPXPropertyList &propList)
- {
--	_U(("openComment(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openComment(%s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_COMMENT);
- }
- 
-@@ -350,7 +350,7 @@ void RawListenerImpl::closeComment()
- 
- void RawListenerImpl::openTextBox(const WPXPropertyList &propList)
- {
--	_U(("openTextBox(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openTextBox(%s)\n", getPropString(propList).cstr()),
- 	  LC_OPEN_TEXT_BOX);
- }
- 
-@@ -361,12 +361,12 @@ void RawListenerImpl::closeTextBox()
- 	
- void RawListenerImpl::openTable(const WPXPropertyList &propList, const WPXPropertyListVector &columns)
- {
--	_U(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE);
-+	_RLU(("openTable(%s, columns: %s)\n", getPropString(propList).cstr(), getPropString(columns).cstr()), LC_OPEN_TABLE);
- }
- 
- void RawListenerImpl::openTableRow(const WPXPropertyList &propList)
- {
--	_U(("openTableRow(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openTableRow(%s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_TABLE_ROW);
- }
- 
-@@ -377,7 +377,7 @@ void RawListenerImpl::closeTableRow()
- 
- void RawListenerImpl::openTableCell(const WPXPropertyList &propList)
- {
--	_U(("openTableCell(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openTableCell(%s)\n", getPropString(propList).cstr()),
- 	   LC_OPEN_TABLE_CELL);
- }
- 
-@@ -398,7 +398,7 @@ void RawListenerImpl::closeTable()
- 
- void RawListenerImpl::openFrame(const WPXPropertyList &propList)
- {
--	_U(("openFrame(%s)\n", getPropString(propList).cstr()),
-+	_RLU(("openFrame(%s)\n", getPropString(propList).cstr()),
- 	  LC_OPEN_FRAME);
- }
- 
diff --git a/converters/libwps/patches/patch-src_lib_WPS4.cpp b/converters/libwps/patches/patch-src_lib_WPS4.cpp
deleted file mode 100644
index 89bd0aae16d..00000000000
--- a/converters/libwps/patches/patch-src_lib_WPS4.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_lib_WPS4.cpp,v 1.1 2012/02/16 18:04:08 hans Exp $
-
---- src/lib/WPS4.cpp.orig	2011-04-04 21:34:27.000000000 +0200
-+++ src/lib/WPS4.cpp	2012-01-27 12:03:55.579804437 +0100
-@@ -198,10 +198,10 @@ bool WPS4Parser::readFODPage(WPXInputStr
- 	}
- 	input->seek(page_offset, WPX_SEEK_SET);	
- 	
--	uint32_t fcFirst; /* Byte number of first character covered by this page 
--			     of formatting information */	
-+	/* Byte number of first character covered by this page 
-+	   of formatting information */	
- 			    
--	fcFirst = readU32(input);
-+	(void) readU32(input);
- 	
- 	int first_fod = FODs->size();
- 
diff --git a/converters/libwps/patches/patch-src_lib_WPS8.cpp b/converters/libwps/patches/patch-src_lib_WPS8.cpp
index 6e363266625..4b386f1462d 100644
--- a/converters/libwps/patches/patch-src_lib_WPS8.cpp
+++ b/converters/libwps/patches/patch-src_lib_WPS8.cpp
@@ -1,28 +1,11 @@
-$NetBSD: patch-src_lib_WPS8.cpp,v 1.3 2012/03/28 15:17:19 wiz Exp $
+$NetBSD: patch-src_lib_WPS8.cpp,v 1.4 2012/04/07 15:08:02 wiz Exp $
 
-3rd chunk: fix clang error: expression result unused [-Werror,-Wunused-value]
+Fix clang error: expression result unused [-Werror,-Wunused-value]
+https://sourceforge.net/tracker/?func=detail&aid=3512534&group_id=176121&atid=875977
 
---- src/lib/WPS8.cpp.orig	2011-05-03 13:00:13.000000000 +0000
+--- src/lib/WPS8.cpp.orig	2011-11-10 16:05:28.000000000 +0000
 +++ src/lib/WPS8.cpp
-@@ -159,7 +159,7 @@ void WPS8Parser::readStreams(WPXInputStr
- 
- 	for (unsigned i=0; i < n_streams; i++) {
- 		uint16_t len;
--		uint32_t unknown, type = 0;
-+		uint32_t type = 0;
- 
- 		len = readU16(input);
- 		if (len > 10) {
-@@ -168,7 +168,7 @@ void WPS8Parser::readStreams(WPXInputStr
- 		}
- 
- 		if (len > 4) {
--			unknown = readU32(input); // assume == 0x22000000
-+			(void) readU32(input); // assume == 0x22000000
- 			type = readU32(input);
- 		} else input->seek(len-2,WPX_SEEK_CUR);
- 
-@@ -196,8 +196,6 @@ void WPS8Parser::readNotes(std::vector<W
+@@ -205,8 +205,6 @@ void WPS8Parser::readNotes(std::vector<W
  	if (headerIndexTable.end() == pos)
  		return;
  
@@ -31,12 +14,3 @@ $NetBSD: patch-src_lib_WPS8.cpp,v 1.3 2012/03/28 15:17:19 wiz Exp $
  	uint32_t unk1;
  	uint32_t count;
  	uint32_t boff;
-@@ -251,7 +249,7 @@ void WPS8Parser::appendUTF16LE(WPXInputS
- 	uint16_t high_surrogate = 0;
- 	bool fail = false;
- 	uint16_t readVal;
--	uint32_t ucs4Character;
-+	uint32_t ucs4Character = 0;
- 	while (true) {
- 		if (input->atEOS()) {
- 			fail = true;