diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-17 14:29:27 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-24 11:25:59 +0200 |
| commit | 6d5f3411ed66d9a447c9fb234b8422b9e38c4bc6 (patch) | |
| tree | 3014353b0889cfa36dd87ec67a90fbead4bc3f69 /libcdr | |
| parent | 91651be74026e11f4ffa188fd2e04dde7c5779c0 (diff) | |
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
Reviewed-on: https://gerrit.libreoffice.org/3942
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalPackage_libcdr.mk | 8 | ||||
| -rw-r--r-- | libcdr/UnpackedTarball_cdr.mk | 6 | ||||
| -rw-r--r-- | libcdr/libcdr-0.0.13.patch | 12 |
3 files changed, 4 insertions, 22 deletions
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index d032e8fa1b34..b163eed91a9d 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 a4a427d4ca21..be1e7d762a87 100644 --- a/libcdr/UnpackedTarball_cdr.mk +++ b/libcdr/UnpackedTarball_cdr.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,cdr)) $(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 29b2b2828177..000000000000 --- 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> |