download.lst | 6 +++--- libcdr/ExternalPackage_libcdr.mk | 8 ++++---- libcdr/ExternalProject_libcdr.mk | 1 + libcdr/UnpackedTarball_libcdr.mk | 6 ------ libcdr/libcdr-0.0.13.patch | 20 -------------------- 5 files changed, 8 insertions(+), 33 deletions(-)
New commits: commit 4c3ad94c70f98f5062bf96a6f1339992b7ec2bd1 Author: Fridrich Å trba <[email protected]> Date: Fri May 17 14:29:43 2013 +0200 Make libcdr build a little bit less verbose Change-Id: I8e70cd72e8c7934b2a04fbe6b9ed5f662c494960 diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 7a4a246..1a22490 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -34,6 +34,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --without-docs \ --disable-debug \ --disable-werror \ + --disable-weffc \ CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ commit 0f28a2a5e29499b62074dad4442fafa57858677d Author: Fridrich Å trba <[email protected]> Date: Fri May 17 14:29:27 2013 +0200 Uploading new libcdr 0.0.14 Change-Id: Ifb3f8a7b0e40ee8b33fab4dded3f75f040e75f72 diff --git a/download.lst b/download.lst index c20f83b..4e0fa28 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 MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5 @@ -68,8 +68,8 @@ export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector- export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz -export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export ODFGEN_TARBALL := d77fa4a6e3e485553e30ced8d9bb3b50-libodfgen-0.0.1.tar.bz2 +export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index 9fd6d9a..d612a77 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 e5cd135..a91bc8e 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 806437b..0000000 --- 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;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
