diff options
Diffstat (limited to 'external')
6 files changed, 7 insertions, 115 deletions
diff --git a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 b/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 deleted file mode 100644 index 1fc4e6b9d261..000000000000 --- a/external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 +++ /dev/null @@ -1,58 +0,0 @@ -From 68e0c8e4c834df57bc9a0e8da72151f69ff5e7a6 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Fri, 12 Aug 2016 12:50:39 +0200 -Subject: [PATCH] tdf#101077 make double->string conversion locale-agnostic - ---- - src/OdsGenerator.cxx | 19 +++++++++++++++++-- - 1 file changed, 17 insertions(+), 2 deletions(-) - -diff --git a/src/OdsGenerator.cxx b/src/OdsGenerator.cxx -index 52e135e..8cb7203 100644 ---- a/src/OdsGenerator.cxx -+++ b/src/OdsGenerator.cxx -@@ -26,6 +26,8 @@ - - #include <librevenge/librevenge.h> - -+#include <iomanip> -+#include <locale> - #include <map> - #include <stack> - #include <sstream> -@@ -46,6 +48,19 @@ - #include "OdcGenerator.hxx" - #include "OdfGenerator.hxx" - -+namespace -+{ -+ -+librevenge::RVNGString makePreciseStr(const double value) -+{ -+ std::ostringstream os; -+ os.imbue(std::locale::classic()); -+ os << std::fixed << std::setprecision(8) << value; -+ return os.str().c_str(); -+} -+ -+} -+ - class OdsGeneratorPrivate : public OdfGenerator - { - public: -@@ -968,10 +983,10 @@ void OdsGenerator::openSheetCell(const librevenge::RVNGPropertyList &propList) - // we need the maximum precision here, so we must avoid getStr() when possible - librevenge::RVNGString value; - if (propList["librevenge:value"]->getUnit()==librevenge::RVNG_GENERIC) -- value.sprintf("%.8f", propList["librevenge:value"]->getDouble()); -+ value = makePreciseStr(propList["librevenge:value"]->getDouble()); - else if (propList["librevenge:value"]->getUnit()==librevenge::RVNG_PERCENT) - { -- value.sprintf("%.8f", propList["librevenge:value"]->getDouble()*100.); -+ value = makePreciseStr(propList["librevenge:value"]->getDouble()*100.); - value.append('%'); - } - else --- -2.7.4 - diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index 679598542b30..a32e3786e7f6 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\ )) $(eval $(call gb_ExternalProject_use_externals,libodfgen,\ + libxml2 \ revenge \ )) @@ -34,10 +35,11 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-werror \ --disable-weffc \ --without-docs \ - --with-sharedptr=c++11 \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ + XML_CFLAGS="$(LIBXML_CFLAGS)" \ + XML_LIBS="$(LIBXML_LIBS)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk index 946fa9081452..b67f5ad89715 100644 --- a/external/libodfgen/Library_odfgen.mk +++ b/external/libodfgen/Library_odfgen.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Library_Library,odfgen)) $(eval $(call gb_Library_use_unpacked,odfgen,libodfgen)) $(eval $(call gb_Library_use_externals,odfgen,\ + libxml2 \ revenge \ )) @@ -26,7 +27,6 @@ $(eval $(call gb_Library_add_defs,odfgen,\ -DDLL_EXPORT \ -DLIBODFGEN_BUILD \ -DNDEBUG \ - -DSHAREDPTR_STD \ -DPACKAGE=\"libodfgen\" \ -DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \ )) @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,odfgen,\ UnpackedTarball/libodfgen/src/GraphicStyle \ UnpackedTarball/libodfgen/src/InternalHandler \ UnpackedTarball/libodfgen/src/ListStyle \ + UnpackedTarball/libodfgen/src/NumberingStyle \ UnpackedTarball/libodfgen/src/OdcGenerator \ UnpackedTarball/libodfgen/src/OdfGenerator \ UnpackedTarball/libodfgen/src/OdgGenerator \ diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index c4ea2939f4cb..d6c84e517970 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -29,12 +29,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ endif endif -# * external/libodfgen/c++11.patch: obsoleted upstream by -# <https://sourceforge.net/p/libwpd/libodfgen/ci/e11112e50562de4f3252227bfba175ededf82194/> -# "boost::shared_ptr -> std::shared_ptr" -$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ - external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 \ - external/libodfgen/c++11.patch \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libodfgen/c++11.patch b/external/libodfgen/c++11.patch deleted file mode 100644 index f41d1a166964..000000000000 --- a/external/libodfgen/c++11.patch +++ /dev/null @@ -1,44 +0,0 @@ -# Add -std=c++11 before existing CXXFLAGS, in case those already contain some -std= (which will thus -# override the preceding -std=c++11, which is likely what the caller passing in those CXXFLAGS -# intends): -# -#--- configure.ac -#+++ configure.ac -#@@ -217,7 +217,7 @@ -# AS_IF([test "x$with_sharedptr" = "xc++11"], [ -# AC_MSG_CHECKING([for c++11 shared ptr]) -# save_CXXFLAGS="$CXXFLAGS" -#- CXXFLAGS="$CXXFLAGS -std=c++11" -#+ CXXFLAGS="-std=c++11 $CXXFLAGS" -# AC_COMPILE_IFELSE([ -# AC_LANG_PROGRAM( -# [[#include <memory>]], -#@@ -241,7 +241,7 @@ -# AC_MSG_RESULT([no]) -# ], [ -# AC_MSG_RESULT([yes]) -#- CXXFLAGS="$CXXFLAGS -std=c++11" -#+ CXXFLAGS="-std=c++11 $CXXFLAGS" -# ]) -# ]) -# AS_IF([test "x$with_sharedptr" = "xtr1"], [ ---- configure -+++ configure -@@ -16723,7 +16723,7 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for c++11 shared ptr" >&5 - $as_echo_n "checking for c++11 shared ptr... " >&6; } - save_CXXFLAGS="$CXXFLAGS" -- CXXFLAGS="$CXXFLAGS -std=c++11" -+ CXXFLAGS="-std=c++11 $CXXFLAGS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -16780,7 +16780,7 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- CXXFLAGS="$CXXFLAGS -std=c++11" -+ CXXFLAGS="-std=c++11 $CXXFLAGS" - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext diff --git a/external/libodfgen/libodfgen-bundled-soname.patch.0 b/external/libodfgen/libodfgen-bundled-soname.patch.0 index 052ba795e40e..f5c0caf8d6d1 100644 --- a/external/libodfgen/libodfgen-bundled-soname.patch.0 +++ b/external/libodfgen/libodfgen-bundled-soname.patch.0 @@ -1,9 +1,8 @@ diff -urN src/Makefile.in.orig src/Makefile.in --- src/Makefile.in.orig 2016-03-02 17:17:02.812606210 +0100 +++ src/Makefile.in 2016-03-02 17:17:25.176670151 +0100 -@@ -355,7 +355,7 @@ - AM_CXXFLAGS = -I$(top_srcdir)/inc/ $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DLIBODFGEN_BUILD - libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS) +@@ -355,6 +355,6 @@ + libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LIBADD = @LIBODFGEN_WIN32_RESOURCE@ $(REVENGE_LIBS) $(XML_LIBS) libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_DEPENDENCIES = @LIBODFGEN_WIN32_RESOURCE@ -libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined +libodfgen_@LIBODFGEN_MAJOR_VERSION@_@LIBODFGEN_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo |