[Libreoffice-commits] .: 10 commits - libwps/libwps-0.2.1.patch libwps/libwps-0.2.1-warnings.patch np_sdk/mozsrc
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue May 31 02:03:16 PDT 2011
libwps/libwps-0.2.1-warnings.patch | 60 +++++++++++++++++++++++++++++++++++++
libwps/libwps-0.2.1.patch | 28 +++++++++++++++++
np_sdk/mozsrc/npapi.h | 3 +
3 files changed, 90 insertions(+), 1 deletion(-)
New commits:
commit 10ec7f8a2f31d61a4511f44dd9a6e190dd1b977f
Merge: f66e793... 361d02b...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Tue May 31 10:45:52 2011 +0200
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
libwps/makefile.mk
diff --cc np_sdk/mozsrc/npapi.h
index e0863b1,4a14df5..c87d531
--- a/np_sdk/mozsrc/npapi.h
+++ b/np_sdk/mozsrc/npapi.h
@@@ -42,11 -42,22 +42,12 @@@
* Netscape client plug-in API spec
*/
- #ifndef _NPAPI_H_
+ #if !defined(_NPAPI_H_) && !defined(npapi_h_)
#define _NPAPI_H_
+ #define npapi_h_
-#ifdef __OS2__
-#pragma pack(1)
-#endif
-
#include "jri.h" /* Java Runtime Interface */
-#if defined (__OS2__ ) || defined (OS2)
-# ifndef XP_OS2
-# define XP_OS2 1
-# endif /* XP_OS2 */
-#endif /* __OS2__ */
-
#ifdef _WINDOWS
# ifndef XP_WIN
# define XP_WIN 1
commit 361d02b1792afb84bc9641a6eb683f6956d405db
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 24 19:29:13 2011 +0200
Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2)
commit 043877517991bea510c7144cf579866898cc8c92
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 20:49:48 2011 +0200
Branch libreoffice-3-4-0
This is 'libreoffice-3-4-0' - the stable branch for the 3.4.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.4.x release,
please use the 'libreoffice-3-4' branch.
If you want to build something cool, unstable, and risky, use master.
commit cfcc2de810dbe670536548def9a63f3dc311d0a6
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 17 19:55:35 2011 +0200
Version 3.4.0.1, tag libreoffice-3.4.0.1 (3.4.0-rc1)
commit 2e8a8ef6b0e9cbe351bc48cb8225119c281c5f63
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 10 20:01:43 2011 +0200
Version 3.3.99.5, tag libreoffice-3.3.99.5 (3.4.0-beta5)
commit f139b77d6363e97dbf0b5bf1a7706eac37983765
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue May 3 20:01:37 2011 +0200
Version 3.3.99.4, tag libreoffice-3.3.99.4 (3.4.0-beta4)
commit d40f065feadd8637a1261a5dfd4e08dc1b38c965
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue May 3 15:04:24 2011 +0200
Fix Windows build and silence some warnings
diff --git a/libwps/libwps-0.2.1-warnings.patch b/libwps/libwps-0.2.1-warnings.patch
new file mode 100644
index 0000000..fffffd5
--- /dev/null
+++ b/libwps/libwps-0.2.1-warnings.patch
@@ -0,0 +1,60 @@
+--- misc/libwps-0.2.1/src/lib/WPS8.cpp 2011-04-05 11:25:15.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/WPS8.cpp 2011-05-03 15:02:21.107349347 +0200
+@@ -136,7 +136,7 @@
+ input->seek(pos->second.offset, WPX_SEEK_SET);
+ n_streams = readU32(input);
+
+- if (n_streams > 100) WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams));
++ if (n_streams > 100) { WPS_DEBUG_MSG(("Probably garbled STRS: count = %u\n",n_streams)); }
+
+ /* skip mysterious header*/
+ input->seek(8, WPX_SEEK_CUR);
+@@ -155,7 +155,7 @@
+ last_pos += offset;
+ }
+ offset = readU32(input);
+- if (offset) WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n"));
++ if (offset) { WPS_DEBUG_MSG(("Offset table is not 0-terminated!\n")); }
+
+ for (unsigned i=0; i < n_streams; i++) {
+ uint16_t len;
+@@ -325,7 +325,7 @@
+ *
+ */
+
+-void WPS8Parser::readText(WPXInputStream * input, WPS8ContentListener *listener)
++void WPS8Parser::readText(WPXInputStream * /* input */, WPS8ContentListener * /* listener */)
+ {
+ #if (0)
+ WPS_DEBUG_MSG(("WPS8Parser::readText()\n"));
+@@ -1356,7 +1356,7 @@
+ id += 4;
+ t_rem -= 4;
+
+- if (t_count < 0 && t_count > 20) break; /* obviously wrong */
++ if (t_count > 20) break; /* obviously wrong */
+ } else break; /* wrong format */
+ }
+
+--- misc/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-04-04 21:56:29.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.cpp 2011-05-03 15:02:21.837414573 +0200
+@@ -621,7 +621,7 @@
+ _closeParagraph();
+ }
+
+-const uint16_t WPSContentListener::getSpec() const
++uint16_t WPSContentListener::getSpec() const
+ {
+ return m_ps->m_spec;
+ }
+--- misc/libwps-0.2.1/src/lib/WPSContentListener.h 2011-04-04 21:30:56.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/WPSContentListener.h 2011-05-03 15:02:23.334548336 +0200
+@@ -154,7 +154,7 @@
+
+ void insertEOL();
+
+- const uint16_t getSpec() const;
++ uint16_t getSpec() const;
+ protected:
+ WPSContentListener(std::list<WPSPageSpan> &pageList, WPXDocumentInterface *documentInterface);
+ virtual ~WPSContentListener();
diff --git a/libwps/libwps-0.2.1.patch b/libwps/libwps-0.2.1.patch
new file mode 100644
index 0000000..a70812d
--- /dev/null
+++ b/libwps/libwps-0.2.1.patch
@@ -0,0 +1,28 @@
+--- misc/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-04-04 21:53:42.000000000 +0200
++++ misc/build/libwps-0.2.1/src/lib/libwps_internal.cpp 2011-05-03 14:50:56.146147538 +0200
+@@ -79,18 +79,15 @@
+ {0x419,"ru-RU"}
+ };
+
+-static int _ltcomp(const void *k1, const void *k2)
+-{
+- int r = (int)((ssize_t)k1) - ((_lange*)k2)->id;
+- return r;
+-}
+-
+ std::string getLangFromLCID(uint32_t lcid)
+ {
+- _lange *c = (_lange*) bsearch((const void*)lcid,s_lang_table,
+- sizeof(s_lang_table)/sizeof(_lange),
+- sizeof(_lange),_ltcomp);
+- if (c) return c->name;
++ unsigned i = 0;
++
++ for (i=0; i < sizeof(s_lang_table)/sizeof(s_lang_table[0]); i++)
++ {
++ if (s_lang_table[i].id == lcid)
++ return s_lang_table[i].name;
++ }
+ return "-none-";
+ }
+
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 7d0ec2d..edb36cd 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -54,6 +54,8 @@ TARFILE_MD5=83d4029aebf290c0a9a8fee9c99638d3
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
+PATCH_FILES=libwps-0.2.1.patch libwps-0.2.1-warnings.patch
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
commit 6ad3b38d2515da1c02d10b66e3c3b4a97e7c79d2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue May 3 11:06:36 2011 +0200
Uploading updated versions of libwpd and libwps
libwps: some conversion improvements and fixing of leaks
libwpd: improve loading of corrupted WP6+ documents, conversion of Mac 2-byte script characters + miscellaneous improvement of WP charsets to unicode conversion
diff --git a/libwpd/libwpd.corruptedprefix.patch b/libwpd/libwpd.corruptedprefix.patch
deleted file mode 100644
index 9d5288d..0000000
--- a/libwpd/libwpd.corruptedprefix.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- misc/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp 2010-08-26 13:35:21.000000000 +0200
-+++ misc/build/libwpd-0.9.1/src/lib/WP6PrefixDataPacket.cpp 2011-04-01 18:25:41.328379372 +0200
-@@ -46,45 +46,67 @@
- }
-
- WP6PrefixDataPacket * WP6PrefixDataPacket::constructPrefixDataPacket(WPXInputStream * input, WPXEncryption *encryption, WP6PrefixIndice *prefixIndice)
--{
-- switch (prefixIndice->getType())
-+{
-+ WP6PrefixDataPacket *tmpPacket = 0;
-+ try
-+ {
-+ switch (prefixIndice->getType())
-+ {
-+ case WP6_INDEX_HEADER_INITIAL_FONT:
-+ tmpPacket = new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_GENERAL_WORDPERFECT_TEXT:
-+ tmpPacket = new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_DESIRED_FONT_DESCRIPTOR_POOL:
-+ tmpPacket = new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_FILL_STYLE:
-+ tmpPacket = new WP6FillStylePacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY:
-+ tmpPacket = new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_OUTLINE_STYLE:
-+ tmpPacket = new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_GRAPHICS_FILENAME:
-+ tmpPacket = new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_GRAPHICS_CACHED_FILE_DATA:
-+ tmpPacket = new WP6GraphicsCachedFileDataPacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_GRAPHICS_BOX_STYLE:
-+ tmpPacket = new WP6GraphicsBoxStylePacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_TABLE_STYLE:
-+ tmpPacket = new WP6TableStylePacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ case WP6_INDEX_HEADER_COMMENT_ANNOTATION:
-+ tmpPacket = new WP6CommentAnnotationPacket(input, encryption, prefixIndice->getID(),
-+ prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-+ break;
-+ default:
-+ break;;
-+ }
-+ }
-+ catch (FileException)
- {
-- case WP6_INDEX_HEADER_INITIAL_FONT:
-- return new WP6DefaultInitialFontPacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_GENERAL_WORDPERFECT_TEXT:
-- return new WP6GeneralTextPacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_DESIRED_FONT_DESCRIPTOR_POOL:
-- return new WP6FontDescriptorPacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_FILL_STYLE:
-- return new WP6FillStylePacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_EXTENDED_DOCUMENT_SUMMARY:
-- return new WP6ExtendedDocumentSummaryPacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_OUTLINE_STYLE:
-- return new WP6OutlineStylePacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_GRAPHICS_FILENAME:
-- return new WP6GraphicsFilenamePacket(input, encryption, prefixIndice->getID(), prefixIndice->getFlags(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_GRAPHICS_CACHED_FILE_DATA:
-- return new WP6GraphicsCachedFileDataPacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_GRAPHICS_BOX_STYLE:
-- return new WP6GraphicsBoxStylePacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_TABLE_STYLE:
-- return new WP6TableStylePacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- case WP6_INDEX_HEADER_COMMENT_ANNOTATION:
-- return new WP6CommentAnnotationPacket(input, encryption, prefixIndice->getID(),
-- prefixIndice->getDataOffset(), prefixIndice->getDataSize());
-- default:
-- return 0;
-+ if (tmpPacket)
-+ delete tmpPacket;
-+ tmpPacket = 0;
- }
-+ return tmpPacket;
- }
-
- void WP6PrefixDataPacket::_read(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataOffset, uint32_t dataSize)
diff --git a/libwpd/libwpd.gcc460.patch b/libwpd/libwpd.gcc460.patch
deleted file mode 100644
index e5e41a0..0000000
--- a/libwpd/libwpd.gcc460.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 09:50:48.131106590 +0000
-+++ misc/build/libwpd-0.9.1/src/lib/WP5GraphicsInformationPacket.h 2011-01-24 09:51:17.676174074 +0000
-@@ -37,7 +37,7 @@
- ~WP5GraphicsInformationPacket();
- void _readContents(WPXInputStream *input, WPXEncryption *encryption, uint32_t dataSize);
- const std::vector<WPXBinaryData *> &getImages() const { return m_images; }
-- const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return NULL; }
-+ const WPXBinaryData *getImage( unsigned long imageIndex ) const { if (imageIndex < m_images.size()) return m_images[imageIndex]; return 0; }
-
- private:
- std::vector<WPXBinaryData *> m_images;
diff --git a/libwpd/libwpd.warnings.patch b/libwpd/libwpd.warnings.patch
deleted file mode 100644
index ebc86dc..0000000
--- a/libwpd/libwpd.warnings.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- misc/libwpd-0.9.1/src/lib/libwpd_internal.cpp
-+++ misc/build/libwpd-0.9.1/src/lib/libwpd_internal.cpp
-@@ -998,21 +998,25 @@ _WPXColumnProperties::_WPXColumnProperties()
- // HACK: this function is really cheesey
- int _extractNumericValueFromRoman(const char romanChar)
- {
-+ int retValue = 0;
- switch (romanChar)
- {
- case 'I':
- case 'i':
-- return 1;
-+ retValue = 1;
-+ break;
- case 'V':
- case 'v':
-- return 5;
-+ retValue = 5;
-+ break;
- case 'X':
- case 'x':
-- return 10;
-+ retValue = 10;
-+ break;
- default:
- throw ParseException();
- }
-- return 1;
-+ return retValue;
- }
-
- // _extractDisplayReferenceNumberFromBuf: given a nuWP6_DEFAULT_FONT_SIZEmber string in UCS2 represented
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 6ecbbfa..a8b17ff 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -41,11 +41,8 @@ TARGET=wpd
@echo "Using system libwpd..."
.ENDIF
-TARFILE_NAME=libwpd-0.9.1
-TARFILE_MD5=5ff846847dab351604ad859e2fd4ed3c
-PATCH_FILES=libwpd.gcc460.patch \
- libwpd.corruptedprefix.patch \
- libwpd.warnings.patch
+TARFILE_NAME=libwpd-0.9.2
+TARFILE_MD5=8d265a592619166f29c4672ea54812b7
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
diff --git a/libwps/libwps-0.1.1.diff b/libwps/libwps-0.1.1.diff
deleted file mode 100644
index 6977cf3..0000000
--- a/libwps/libwps-0.1.1.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-*** misc/libwps-0.1.1/src/lib/WPSListener.h Thu Nov 29 20:58:57 2007
---- misc/build/libwps-0.1.1/src/lib/WPSListener.h Sun Dec 2 20:54:35 2007
-***************
-*** 39,45 ****
- virtual ~WPSListener();
-
- bool isUndoOn() { return m_isUndoOn; }
-! void setUndoOn(bool isUndoOn) { m_isUndoOn = isUndoOn; }
-
- std::list<WPSPageSpan> &m_pageList;
-
---- 39,45 ----
- virtual ~WPSListener();
-
- bool isUndoOn() { return m_isUndoOn; }
-! void setUndoOn(bool undoOn) { m_isUndoOn = undoOn; }
-
- std::list<WPSPageSpan> &m_pageList;
-
-*** misc/libwps-0.1.1/src/lib/WPSContentListener.cpp Thu Nov 29 20:58:57 2007
---- misc/build/libwps-0.1.1/src/lib/WPSContentListener.cpp Sun Dec 2 21:09:11 2007
-***************
-*** 36,62 ****
- #define LIBWPS_MAX std::max
- #endif
-
-- namespace {
--
-- WPXString doubleToString(const double value)
-- {
-- WPXString tempString;
-- tempString.sprintf("%.4f", value);
-- std::string decimalPoint(localeconv()->decimal_point);
-- if ((decimalPoint.size() == 0) || (decimalPoint == "."))
-- return tempString;
-- std::string stringValue(tempString.cstr());
-- if (!stringValue.empty())
-- {
-- std::string::size_type pos;
-- while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
-- stringValue.replace(pos,decimalPoint.size(),".");
-- }
-- return WPXString(stringValue.c_str());
-- }
--
-- } // namespace
--
- _WPSContentParsingState::_WPSContentParsingState() :
- m_textAttributeBits(0),
- m_fontSize(12.0f/*WP6_DEFAULT_FONT_SIZE*/), // FIXME ME!!!!!!!!!!!!!!!!!!! HELP WP6_DEFAULT_FONT_SIZE
---- 36,41 ----
-***************
-*** 578,585 ****
- _closePageSpan();
- }
-
-- const float WPS_DEFAULT_SUPER_SUB_SCRIPT = 58.0f;
--
- void WPSContentListener::_openSpan()
- {
- if (!m_ps->m_isParagraphOpened && !m_ps->m_isListElementOpened)
---- 557,562 ----
-***************
-*** 622,639 ****
- }
-
- WPXPropertyList propList;
-! if (attributeBits & WPS_SUPERSCRIPT_BIT) {
-! WPXString sSuperScript("super ");
-! sSuperScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT));
-! sSuperScript.append("%");
-! propList.insert("style:text-position", sSuperScript);
-! }
-! else if (attributeBits & WPS_SUBSCRIPT_BIT) {
-! WPXString sSubScript("sub ");
-! sSubScript.append(doubleToString(WPS_DEFAULT_SUPER_SUB_SCRIPT));
-! sSubScript.append("%");
-! propList.insert("style:text-position", sSubScript);
-! }
- if (attributeBits & WPS_ITALICS_BIT)
- propList.insert("fo:font-style", "italic");
- if (attributeBits & WPS_BOLD_BIT)
---- 599,608 ----
- }
-
- WPXPropertyList propList;
-! if (m_ps->m_textAttributeBits & WPS_SUPERSCRIPT_BIT)
-! propList.insert("style:text-position", "super 58%");
-! else if (m_ps->m_textAttributeBits & WPS_SUBSCRIPT_BIT)
-! propList.insert("style:text-position", "sub 58%");
- if (attributeBits & WPS_ITALICS_BIT)
- propList.insert("fo:font-style", "italic");
- if (attributeBits & WPS_BOLD_BIT)
diff --git a/libwps/libwps-0.2.0.patch b/libwps/libwps-0.2.0.patch
deleted file mode 100644
index 6af2989..0000000
--- a/libwps/libwps-0.2.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old misc/build/libwps-0.2.0/src/lib/libwps_internal.h
---- misc/build/libwps-0.2.0/src/lib/libwps_internal.h.old 2010-11-17 20:47:23.288507198 +0100
-+++ misc/build/libwps-0.2.0/src/lib/libwps_internal.h 2010-11-17 20:47:26.596839807 +0100
-@@ -23,6 +23,7 @@
- #define LIBWPS_INTERNAL_H
- #ifdef DEBUG
- #include <bitset>
-+#include <stdio.h>
- #endif
- #include <libwpd-stream/libwpd-stream.h>
- #include <libwpd/libwpd.h>
diff --git a/libwps/makefile.mk b/libwps/makefile.mk
index 3f9667b..7d0ec2d 100644
--- a/libwps/makefile.mk
+++ b/libwps/makefile.mk
@@ -49,13 +49,11 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd
INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
.ENDIF
-TARFILE_NAME=libwps-0.2.0
-TARFILE_MD5=9e436bff44c60dc8b97cba0c7fc11a5c
+TARFILE_NAME=libwps-0.2.1
+TARFILE_MD5=83d4029aebf290c0a9a8fee9c99638d3
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src/lib
-PATCH_FILES=libwps-0.2.0.patch
-
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
commit 8fe49db033035c83669fb826e14e22eb1282bc6b
Author: Chris Cheney <ccheney at ubuntu.com>
Date: Wed Apr 27 19:43:14 2011 +0200
xulrunner-1.9.1.diff: fix build with xulrunner-1.9.1
diff --git a/np_sdk/mozsrc/npapi.h b/np_sdk/mozsrc/npapi.h
index af64042..4a14df5 100644
--- a/np_sdk/mozsrc/npapi.h
+++ b/np_sdk/mozsrc/npapi.h
@@ -42,8 +42,9 @@
* Netscape client plug-in API spec
*/
-#ifndef _NPAPI_H_
+#if !defined(_NPAPI_H_) && !defined(npapi_h_)
#define _NPAPI_H_
+#define npapi_h_
#ifdef __OS2__
#pragma pack(1)
commit e3c250a6553cbf6ea795ab9ff36a9c8eed2b9267
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 26 17:09:15 2011 +0200
Version 3.3.99.3, tag libreoffice-3.3.99.3 (3.4.0-beta3)
More information about the Libreoffice-commits
mailing list