download.lst | 5 +++--
external/librevenge/ExternalPackage_librevenge.mk | 2 +-
external/librevenge/ExternalProject_librevenge.mk | 3 +--
external/librevenge/librevenge-bundled-soname.patch.0 | 2 +-
external/libvisio/ExternalProject_libvisio.mk | 3 +--
5 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit ff01ea8419db4b8ec81bd0d6edfc673d7140b4fd
Author: David Tardon <dtar...@redhat.com>
Date: Thu Dec 24 22:08:31 2015 +0100
this is not needed anymore
Change-Id: I77ca146b81953c9694497e360660c8161f5e56bf
diff --git a/external/libvisio/ExternalProject_libvisio.mk
b/external/libvisio/ExternalProject_libvisio.mk
index d66342b..5ce63fb 100644
--- a/external/libvisio/ExternalProject_libvisio.mk
+++ b/external/libvisio/ExternalProject_libvisio.mk
@@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-werror \
$(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)) \
&& $(MAKE) \
)
commit befb4af709c3d05719d2878968a36ece1cc87662
Author: David Tardon <dtar...@redhat.com>
Date: Thu Dec 24 22:04:58 2015 +0100
upload librevenge 0.0.3
Change-Id: I8f2c09b70679aabb5e5f56334e6ba9eedd2d78e1
diff --git a/download.lst b/download.lst
index b79837f..8de8f89 100644
--- a/download.lst
+++ b/download.lst
@@ -140,8 +140,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_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD =
@LIBREVENGE_WIN32_RESOURCE@
librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES =
@LIBREVENGE_WIN32_RESOURCE@
-librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS =
$(version_info) -export-dynamic $(no_undefined)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
