[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - download.lst external/librevenge

[David Tardon]

 download.lst                                          |    5 +++--
 external/librevenge/ExternalPackage_librevenge.mk     |    2 +-
 external/librevenge/ExternalProject_librevenge.mk     |    3 +--
 external/librevenge/librevenge-bundled-soname.patch.0 |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d105910fb51346558a6909c447d579c8e548b00e
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Dec 24 22:04:58 2015 +0100

    upload librevenge 0.0.3
    
    Change-Id: I8f2c09b70679aabb5e5f56334e6ba9eedd2d78e1
    (cherry picked from commit befb4af709c3d05719d2878968a36ece1cc87662)
    Reviewed-on: https://gerrit.libreoffice.org/20941
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/download.lst b/download.lst
index 1c6a5c8..e44040e 100755
--- a/download.lst
+++ b/download.lst
@@ -136,8 +136,9 @@ endif
 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz
 export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz
 export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz
-export REVENGE_MD5SUM := 2d4183bf17aea1a71842468a71a68c47
-export REVENGE_TARBALL := librevenge-0.0.2.tar.bz2
+export REVENGE_MD5SUM := 42d3fa020016196ec90012bcba4b8da2
+export REVENGE_VERSION_MICRO := 3
+export REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 export SERF_MD5SUM := 4f8e76c9c6567aee1d66aba49f76a58b
 export SERF_TARBALL := serf-1.2.1.tar.bz2
diff --git a/external/librevenge/ExternalPackage_librevenge.mk b/external/librevenge/ExternalPackage_librevenge.mk
index 58ae6ee..4ed404c 100644
--- a/external/librevenge/ExternalPackage_librevenge.mk
+++ b/external/librevenge/ExternalPackage_librevenge.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/libreven
 else ifeq ($(OS),WNT)
 $(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0.dll,src/lib/.libs/librevenge-0.0.dll))
 else ifeq ($(DISABLE_DYNLOADING),)
-$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0-lo.so.0,src/lib/.libs/librevenge-0.0-lo.so.0.0.2))
+$(eval $(call gb_ExternalPackage_add_file,librevenge,$(LIBO_LIB_FOLDER)/librevenge-0.0-lo.so.0,src/lib/.libs/librevenge-0.0-lo.so.0.0.$(REVENGE_VERSION_MICRO)))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/librevenge/ExternalProject_librevenge.mk b/external/librevenge/ExternalProject_librevenge.mk
index 9a7efe1..3c2efc0 100644
--- a/external/librevenge/ExternalProject_librevenge.mk
+++ b/external/librevenge/ExternalProject_librevenge.mk
@@ -34,8 +34,7 @@ $(call gb_ExternalProject_get_state_target,librevenge,build) :
 			--disable-generators \
 			--without-docs \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
-			CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \
-				-DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \
+			CXXFLAGS="$(CXXFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) \
diff --git a/external/librevenge/librevenge-bundled-soname.patch.0 b/external/librevenge/librevenge-bundled-soname.patch.0
index f959def..d98630f 100644
--- a/external/librevenge/librevenge-bundled-soname.patch.0
+++ b/external/librevenge/librevenge-bundled-soname.patch.0
@@ -1,7 +1,7 @@
 --- src/lib/Makefile.in.orig	2015-08-07 11:57:42.256742305 +0200
 +++ src/lib/Makefile.in	2015-08-07 11:58:11.818741799 +0200
 @@ -470,7 +470,7 @@
- 	-DLIBREVENGE_BUILD $(am__append_2)
+ 	$(am__append_2)
  librevenge_ at RVNG_MAJOR_VERSION@_ at RVNG_MINOR_VERSION@_la_LIBADD = @LIBREVENGE_WIN32_RESOURCE@
  librevenge_ at RVNG_MAJOR_VERSION@_ at RVNG_MINOR_VERSION@_la_DEPENDENCIES = @LIBREVENGE_WIN32_RESOURCE@
 -librevenge_ at RVNG_MAJOR_VERSION@_ at RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)