diff options
| author | David Tardon <dtardon@redhat.com> | 2015-12-24 22:04:58 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2016-01-03 19:39:18 +0000 |
| commit | d105910fb51346558a6909c447d579c8e548b00e (patch) | |
| tree | 3e8222fab3eadc1b89729085aa4f703fb64ecaac /external | |
| parent | 54fe17fabaa258a48e18c4a19c29da2d2cf634ca (diff) | |
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@ubuntu.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/librevenge/ExternalPackage_librevenge.mk | 2 | ||||
| -rw-r--r-- | external/librevenge/ExternalProject_librevenge.mk | 3 | ||||
| -rw-r--r-- | external/librevenge/librevenge-bundled-soname.patch.0 | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/external/librevenge/ExternalPackage_librevenge.mk b/external/librevenge/ExternalPackage_librevenge.mk index 58ae6ee68895..4ed404c63e27 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 9a7efe135c0f..3c2efc0df9d2 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 f959def4191c..d98630f0c637 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) |