[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst

2014-09-23 Thread Kohei Yoshida 
 download.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6645cd6fdf4aceb212db02676069506638e0946e
Author: Kohei Yoshida 
Date:   Thu Sep 18 14:22:27 2014 -0400

Update mdds to 0.11.0.

(cherry picked from commit 3f3b404b643f907f9feff893324174c00c3c4e4a)

Conflicts:
download.lst

Change-Id: Ia4c413d313aafc1ba46d3d856145c0eb51a7d6ec
Reviewed-on: https://gerrit.libreoffice.org/11521
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 1bc9341..54904cc 100644
--- a/download.lst
+++ b/download.lst
@@ -84,7 +84,7 @@ export LIBXML_TARBALL := 
9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export MARIADB_TARBALL := 
05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2
+export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
 export MYSQLCPPCONN_TARBALL := 
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
 export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
 export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libetonyek

2014-04-15 Thread David Tardon 
 download.lst   |4 -
 external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 |   26 
--
 external/libetonyek/UnpackedTarball_libetonyek.mk  |4 -
 3 files changed, 2 insertions(+), 32 deletions(-)

New commits:
commit ccb606beb5b516dc1308b4a8343f941f22acb1e6
Author: David Tardon 
Date:   Tue Apr 15 12:24:09 2014 +0200

upload libetonyek 0.0.4

(cherry picked from commit d24634a6d4046db208428eb999012c03bd9a5c48)

Conflicts:
external/libetonyek/UnpackedTarball_libetonyek.mk

Change-Id: I64a35ca0902ba40a4fba3080181147b4facac2ee
Reviewed-on: https://gerrit.libreoffice.org/9009
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 6ce3dfc..34df117 100644
--- a/download.lst
+++ b/download.lst
@@ -4,8 +4,8 @@ CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998
 export CDR_TARBALL := libcdr-0.0.15.tar.bz2
 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
 export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
-ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
-export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
+ETONYEK_MD5SUM := 3c50bc60394d1f2675fbf9bd22581363
+export ETONYEK_TARBALL := libetonyek-0.0.4.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
 export FREEHAND_TARBALL := libfreehand-0.0.0.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
diff --git a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 
b/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1
deleted file mode 100644
index 816039b..000
--- a/external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1
+++ /dev/null
@@ -1,26 +0,0 @@
-From c2065764ae0826409f1dd683e52b7ca65f092972 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fridrich=20=C5=A0trba?= 
-Date: Fri, 6 Dec 2013 18:35:28 +0100
-Subject: [PATCH] Comma at the end of emum list
-
-Change-Id: I1370488e5bf682e23a923f37c09e76081aee7493

- src/lib/KEYEnum.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/KEYEnum.h b/src/lib/KEYEnum.h
-index f0e027f..9e5e61f 100644
 a/src/lib/KEYEnum.h
-+++ b/src/lib/KEYEnum.h
-@@ -33,7 +33,7 @@ enum KEYCapitalization
-   KEY_CAPITALIZATION_NONE,
-   KEY_CAPITALIZATION_ALL_CAPS,
-   KEY_CAPITALIZATION_SMALL_CAPS,
--  KEY_CAPITALIZATION_TITLE,
-+  KEY_CAPITALIZATION_TITLE
- };
- 
- }
--- 
-1.8.4.2
-
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index d452574..52e6a95 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
-   external/libetonyek/0001-Comma-at-the-end-of-emum-list.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libcdr

2014-04-04 Thread Fridrich Štrba 
 download.lst|4 ++--
 external/libcdr/UnpackedTarball_libcdr.mk   |4 
 external/libcdr/libcdr-wpx_seek_end.patch.1 |   14 --
 3 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit c1a756df130082ba25ba40c67293eab5fe15bd5b
Author: Fridrich Å trba 
Date:   Fri Apr 4 15:45:36 2014 +0200

Uploading libcdr-0.0.15: Support for CorelDraw x7

(cherry picked from commit 32f301f5a64d8ff7815cf88858fc8a87cb9ad76a)

Conflicts:
download.lst

Change-Id: I1cc6c6ab39ec27dbf08c2019c7dd7f8f29537520
Reviewed-on: https://gerrit.libreoffice.org/8845
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 080d2ab..24639dc 100644
--- a/download.lst
+++ b/download.lst
@@ -1,7 +1,7 @@
 ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d
 export ABW_TARBALL := libabw-0.0.2.tar.bz2
-CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
-export CDR_TARBALL := libcdr-0.0.14.tar.bz2
+CDR_MD5SUM := fbcd8619fc6646f41d527c1329102998
+export CDR_TARBALL := libcdr-0.0.15.tar.bz2
 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
 export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
 ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk 
b/external/libcdr/UnpackedTarball_libcdr.mk
index dff6a57..a91bc8e 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -11,8 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
-   external/libcdr/libcdr-wpx_seek_end.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libcdr/libcdr-wpx_seek_end.patch.1 
b/external/libcdr/libcdr-wpx_seek_end.patch.1
deleted file mode 100644
index 67b8587..000
--- a/external/libcdr/libcdr-wpx_seek_end.patch.1
+++ /dev/null
@@ -1,14 +0,0 @@
 a/src/lib/CDRZipStream.cpp
-+++ b/src/lib/CDRZipStream.cpp
-@@ -160,11 +160,7 @@ WPXInputStream 
*libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
- 
- bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd()
- {
--#if defined(LIBWPD_STREAM_VERSION_MAJOR) && 
defined(LIBWPD_STREAM_VERSION_MINOR) && defined(LIBWPD_STREAM_VERSION_REVISION) 
\
--  && (LIBWPD_STREAM_VERSION_MAJOR > 0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 && 
(LIBWPD_STREAM_VERSION_MINOR > 9 \
--  || (LIBWPD_STREAM_VERSION_MINOR == 9 && LIBWPD_STREAM_VERSION_REVISION >= 
5
-   if (m_cdir_offset || m_input->seek(-1024, WPX_SEEK_END))
--#endif
- m_input->seek(m_cdir_offset, WPX_SEEK_SET);
-   try
-   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libebook

2014-02-10 Thread David Tardon 
 download.lst|4 -
 external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch |   30 
--
 external/libebook/UnpackedTarball_libebook.mk   |4 -
 3 files changed, 2 insertions(+), 36 deletions(-)

New commits:
commit 3b662ee2da7f308189307dd17d3a86aaa5f60d46
Author: David Tardon 
Date:   Mon Feb 10 14:13:00 2014 +0100

upload new libe-book

Change-Id: I69e87ad57513c7349aa0abf38b6054583d367963
(cherry picked from commit 95c54daf9cc3054de1bdc52dd327908716fc4a8c)
Reviewed-on: https://gerrit.libreoffice.org/7971
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/download.lst b/download.lst
index f59a190..70671bc 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
 export ABW_TARBALL := libabw-0.0.1.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
-EBOOK_MD5SUM := 3a62e10c57270718cabfdfc4b7b4e095
-export EBOOK_TARBALL := libe-book-0.0.2.tar.bz2
+EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
+export EBOOK_TARBALL := libe-book-0.0.3.tar.bz2
 ETONYEK_MD5SUM := 9dad826726da4d4ad60084968691f5f4
 export ETONYEK_TARBALL := libetonyek-0.0.3.tar.bz2
 FREEHAND_MD5SUM := 496dd00028afcc19f896b01394769043
diff --git a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch 
b/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
deleted file mode 100644
index 21ab72b..000
--- a/external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 30021c75542a008ccf8814fa70d519f00bc69776 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
-Date: Thu, 28 Nov 2013 09:50:00 +
-Subject: [PATCH] Fix crash on abi2010-1.doc example
-

- src/lib/FB2Parser.cpp | 7 +--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
-index d258c09..3cd3e3c 100644
 a/src/lib/FB2Parser.cpp
-+++ b/src/lib/FB2Parser.cpp
-@@ -357,8 +357,11 @@ FB2XMLParserContext *processNode(FB2XMLParserContext 
*const context, const xmlTe
-   {
-   case XML_READER_TYPE_ELEMENT :
-   {
--const EBOOKToken *name = getFB2Token(xmlTextReaderConstLocalName(reader));
--const EBOOKToken *ns = 
getFB2Token(xmlTextReaderConstNamespaceUri(reader));
-+const xmlChar *name_str = xmlTextReaderConstLocalName(reader);
-+const xmlChar *ns_str = xmlTextReaderConstNamespaceUri(reader);
-+
-+const EBOOKToken *name = name_str ? getFB2Token(name_str) : 0;
-+const EBOOKToken *ns = ns_str ? getFB2Token(ns_str) : 0;
- 
- if (!name || !ns)
-   // TODO: unknown elements should not be skipped entirely, but
--- 
-1.8.3.1
-
diff --git a/external/libebook/UnpackedTarball_libebook.mk 
b/external/libebook/UnpackedTarball_libebook.mk
index 3cf21e6..7dfee2c 100644
--- a/external/libebook/UnpackedTarball_libebook.mk
+++ b/external/libebook/UnpackedTarball_libebook.mk
@@ -13,8 +13,4 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libebook,$(EBOOK_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libebook,1))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libebook,\
-external/libebook/0001-Fix-crash-on-abi2010-1.doc-example.patch \
-))
-
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/libabw

2014-02-10 Thread David Tardon 
 download.lst   |4 
 external/libabw/UnpackedTarball_libabw.mk  |6 -
 external/libabw/libabw-0.0.1-badtable.patch.1  |  100 -
 external/libabw/libabw-0.0.1-inttypes.patch.1  |   36 --
 external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 |   11 -
 5 files changed, 2 insertions(+), 155 deletions(-)

New commits:
commit d0f2627feb1a406d423af45dea8b1773aeaa0a82
Author: David Tardon 
Date:   Mon Feb 10 16:05:56 2014 +0100

upload libabw 0.0.2

Change-Id: I2b73c5546e767030344f787efb9a9cafa9635ad3
(cherry picked from commit baa84c47a1637898560162ef5d24530eef81b10d)
Reviewed-on: https://gerrit.libreoffice.org/7973
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/download.lst b/download.lst
index 70671bc..1b14652 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-ABW_MD5SUM := af3ccc1f1884e68389088d490d596409
-export ABW_TARBALL := libabw-0.0.1.tar.bz2
+ABW_MD5SUM := 40fa48e03b1e28ae0325cc34b35bc46d
+export ABW_TARBALL := libabw-0.0.2.tar.bz2
 CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 EBOOK_MD5SUM := 2f1ceaf2ac8752ed278e175447d9b978
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 8e28755..6288b0e 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libabw))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libabw,\
-   external/libabw/libabw-0.0.1-inttypes.patch.1 \
-   external/libabw/libabw-0.0.1-stdstringfromnull.patch.1 \
-   external/libabw/libabw-0.0.1-badtable.patch.1 \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libabw/libabw-0.0.1-badtable.patch.1 
b/external/libabw/libabw-0.0.1-badtable.patch.1
deleted file mode 100644
index ddb0c8f..000
--- a/external/libabw/libabw-0.0.1-badtable.patch.1
+++ /dev/null
@@ -1,100 +0,0 @@
 a/src/lib/ABWContentCollector.cpp
-+++ b/src/lib/ABWContentCollector.cpp
-@@ -1492,26 +1492,32 @@ void libabw::ABWContentCollector::closeTable()
- 
- void libabw::ABWContentCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty("top-attach"), currentRow))
--currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
-+  if (!m_ps->m_tableStates.empty())
-   {
--if (m_ps->m_tableStates.top().m_currentTableRow >= 0)
--  _closeTableRow();
--_openTableRow();
--  }
-+if (props)
-+  parsePropString(props, 
m_ps->m_tableStates.top().m_currentCellProperties);
-+int currentRow(0);
-+if (!findInt(_findCellProperty("top-attach"), currentRow))
-+  currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
-+while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
-+{
-+  if (m_ps->m_tableStates.top().m_currentTableRow >= 0)
-+_closeTableRow();
-+  _openTableRow();
-+}
- 
--  if (!findInt(_findCellProperty("left-attach"), 
m_ps->m_tableStates.top().m_currentTableCol))
--m_ps->m_tableStates.top().m_currentTableCol++;
-+if (!findInt(_findCellProperty("left-attach"), 
m_ps->m_tableStates.top().m_currentTableCol))
-+  m_ps->m_tableStates.top().m_currentTableCol++;
-+  }
- }
- 
- void libabw::ABWContentCollector::closeCell()
- {
--  _closeTableCell();
--  m_ps->m_tableStates.top().m_currentCellProperties.clear();
-+  if (!m_ps->m_tableStates.empty())
-+  {
-+_closeTableCell();
-+m_ps->m_tableStates.top().m_currentCellProperties.clear();
-+  }
- }
- 
- void libabw::ABWContentCollector::collectData(const char *, const char *, 
const WPXBinaryData &)
 a/src/lib/ABWStylesCollector.cpp
-+++ b/src/lib/ABWStylesCollector.cpp
-@@ -167,28 +167,32 @@ void libabw::ABWStylesCollector::closeTable()
- 
- void libabw::ABWStylesCollector::openCell(const char *props)
- {
--  if (props)
--parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
--  int currentRow(0);
--  if (!findInt(_findCellProperty("top-attach"), currentRow))
--currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
--  while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
--m_ps->m_tableStates.top().m_currentTableRow++;
--
--  if (!m_ps->m_tableStates.empty() && 0 == 
m_ps->m_tableStates.top().m_currentTableRow)
-+  if (!m_ps->m_tableStates.empty())
-   {
--int leftAttach(0);
--int rightAttach(0);
--if (findInt(_findCellProperty("left-attach"), leftAttach) && 
findInt(_findCellProperty("right-attach"), rightAttach))
--  m_ps->m_tableStates.top().m_currentTableWidth += rightAttach - 
leftAttach;
--else
-

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - download.lst external/liblangtag Makefile.fetch

2014-04-11 Thread Eike Rathke 
 Makefile.fetch |1 +
 download.lst   |2 ++
 external/liblangtag/ExternalProject_langtag.mk |2 +-
 external/liblangtag/UnpackedTarball_langtag.mk |4 
 4 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit a33662bb67dc14f0283f7b11e0846858fa07fb10
Author: Eike Rathke 
Date:   Thu Apr 10 14:16:25 2014 +0200

build liblangtag with updated IANA language-subtag-registry

... as downloaded from

https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry

Reviewed-on: https://gerrit.libreoffice.org/8919
Tested-by: LibreOffice gerrit bot 
Reviewed-by: Eike Rathke 
(cherry picked from commit 39d29be28b92328149430045f1e10e1ebeb6a0eb)

Conflicts:
download.lst

Change-Id: I7aee9c6e42aabc9e023ab9a2ec3880dbde940396
Reviewed-on: https://gerrit.libreoffice.org/8920
Tested-by: David Tardon 
Reviewed-by: David Tardon 

diff --git a/Makefile.fetch b/Makefile.fetch
index 530ee0f..ce6d71b 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -83,6 +83,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk 
$(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \
$(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \
$(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \
+   $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call fetch_Optional,ODFGEN,ODFGEN_TARBALL) \
diff --git a/download.lst b/download.lst
index 24639dc..6ce3dfc 100644
--- a/download.lst
+++ b/download.lst
@@ -26,6 +26,8 @@ LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf
 export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip
 LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548
 export LIBEOT_TARBALL := libeot-0.01.tar.bz2
+LANGTAGREG_MD5SUM := 504af523f5d1a5590bbeb6a4b55e8a97
+export LANGTAGREG_TARBALL := language-subtag-registry-2014-03-27.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
diff --git a/external/liblangtag/ExternalProject_langtag.mk 
b/external/liblangtag/ExternalProject_langtag.mk
index b4f17ce..b87b37d 100644
--- a/external/liblangtag/ExternalProject_langtag.mk
+++ b/external/liblangtag/ExternalProject_langtag.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_ExternalProject_register_targets,langtag,\
 $(call gb_ExternalProject_get_state_target,langtag,build):
$(call gb_ExternalProject_run,build,\
./configure --disable-modules --disable-test 
--disable-introspection --disable-shared --enable-static --with-pic \
-   $(if $(filter WNTMSC,$(OS)$(COM)),--disable-rebuild-data) \
$(if $(filter 
TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \
$(if $(filter NO,$(SYSTEM_LIBXML)),\
@@ -36,6 +35,7 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(if $(filter-out 
WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
&& $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath 
-w $(lastword $(CC)))") \
   $(if $(VERBOSE)$(verbose),V=1) \
+  $(gb_Helper_set_ld_path) \
   $(MAKE) \
)
 # vim: set noet sw=4 ts=4:
diff --git a/external/liblangtag/UnpackedTarball_langtag.mk 
b/external/liblangtag/UnpackedTarball_langtag.mk
index 88f7f16..7637ee9 100644
--- a/external/liblangtag/UnpackedTarball_langtag.mk
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag))
 
 $(eval $(call 
gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag))
 
+$(eval $(call gb_UnpackedTarball_set_pre_action,langtag,\
+   $(GNUTAR) -x -j -f 
$(gb_UnpackedTarget_TARFILE_LOCATION)/$(LANGTAGREG_TARBALL) \
+))
+
 $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \
external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits