[PATCH libreoffice-4-0] Uploading new libcdr 0.0.14

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3942

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3942/1

Uploading new libcdr 0.0.14

(cherry picked from commit 0f28a2a5e29499b62074dad4442fafa57858677d)

Conflicts:
        download.lst
        libcdr/UnpackedTarball_libcdr.mk
        libcdr/libcdr-0.0.13.patch

Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72
---
M download.lst
M libcdr/ExternalPackage_libcdr.mk
M libcdr/UnpackedTarball_cdr.mk
D libcdr/libcdr-0.0.13.patch
4 files changed, 6 insertions(+), 24 deletions(-)



diff --git a/download.lst b/download.lst
index 657a418..aa1f98c 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-CDR_MD5SUM := 75700c61b3a8e7d49a1f04c62048ff00
-export CDR_TARBALL := libcdr-0.0.13.tar.bz2
+CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
+export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
 VISIO_MD5SUM := 4e9a029d8390a1707eb49a1a918797ff
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index d032e8f..b163eed 100644
--- a/libcdr/ExternalPackage_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -10,10 +10,10 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,cdr))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\
-       src/lib/libcdr.h \
-       src/lib/CDRDocument.h \
-       src/lib/CDRStringVector.h \
-       src/lib/CMXDocument.h \
+       inc/libcdr/libcdr.h \
+       inc/libcdr/CDRDocument.h \
+       inc/libcdr/CDRStringVector.h \
+       inc/libcdr/CMXDocument.h \
 ))
 
 $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr))
diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index a4a427d..be1e7d7 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -11,10 +11,4 @@
 
 $(eval $(call gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,cdr,1))
-
-$(eval $(call gb_UnpackedTarball_add_patches,cdr,\
-       libcdr/libcdr-0.0.13.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-0.0.13.patch b/libcdr/libcdr-0.0.13.patch
deleted file mode 100644
index 29b2b28..0000000
--- a/libcdr/libcdr-0.0.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/lib/CDRParser.cpp
-+++ b/src/lib/CDRParser.cpp
-@@ -32,6 +32,9 @@
- #include <string.h>
- #include <sstream>
- #include <set>
-+#ifndef BOOST_ALL_NO_LIB
-+#define BOOST_ALL_NO_LIB 1
-+#endif
- #include <boost/property_tree/json_parser.hpp>
- #include <boost/property_tree/ptree.hpp>
- #include <boost/spirit/include/classic.hpp>

-- 
To view, visit https://gerrit.libreoffice.org/3942
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridrich@documentfoundation.org>