diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-17 14:29:27 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-05-17 14:30:44 +0200 |
| commit | 0f28a2a5e29499b62074dad4442fafa57858677d (patch) | |
| tree | f9387cf4e5e5d01a67dab56023fde3a2cdfded15 /libcdr | |
| parent | fc63700181ab0f42eab5f98328074fe1682344f8 (diff) | |
Uploading new libcdr 0.0.14
Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalPackage_libcdr.mk | 8 | ||||
| -rw-r--r-- | libcdr/UnpackedTarball_libcdr.mk | 6 | ||||
| -rw-r--r-- | libcdr/libcdr-0.0.13.patch | 20 |
3 files changed, 4 insertions, 30 deletions
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 9fd6d9ad713a..d612a7766a0d 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -10,10 +10,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,libcdr,libcdr)) $(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_libcdr.mk b/libcdr/UnpackedTarball_libcdr.mk index e5cd13595292..a91bc8e907ca 100644 --- a/libcdr/UnpackedTarball_libcdr.mk +++ b/libcdr/UnpackedTarball_libcdr.mk @@ -11,10 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr)) $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,1)) - -$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\ - 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 806437b94137..000000000000 --- a/libcdr/libcdr-0.0.13.patch +++ /dev/null @@ -1,20 +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> -@@ -3095,7 +3098,6 @@ - if (!fflag1) - input->seek(8, WPX_SEEK_CUR); - unsigned stlId = readU32(input); -- printf("Fridrich %x\n", stlId); - unsigned numSt = readU32(input); - unsigned i = 0; - std::map<unsigned, CDRCharacterStyle> charStyles; |