download.lst | 6 - external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 | 58 ---------- external/libodfgen/ExternalProject_libodfgen.mk | 4 external/libodfgen/Library_odfgen.mk | 3 external/libodfgen/UnpackedTarball_libodfgen.mk | 4 external/libodfgen/libodfgen-bundled-soname.patch.0 | 5 solenv/flatpak-manifest.in | 6 - 7 files changed, 13 insertions(+), 73 deletions(-)
New commits: commit 6db70032300c58ce510342852eb9b8013ace4565 Author: David Tardon <dtar...@redhat.com> AuthorDate: Sun Jan 17 16:27:55 2021 +0100 Commit: Michael Stahl <michael.st...@allotropia.de> CommitDate: Tue Nov 9 11:34:26 2021 +0100 upload libodfgen 0.1.8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109840 Tested-by: Jenkins Reviewed-by: David Tardon <dtar...@redhat.com> (cherry picked from commit f341a9da2eb63ea40ccc5a17d7c9dc557682469f) Change-Id: Ibc59469b74d54a2b307ea708ea5c4a752532f0b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124882 Tested-by: Michael Stahl <michael.st...@allotropia.de> Reviewed-by: Michael Stahl <michael.st...@allotropia.de> diff --git a/download.lst b/download.lst index 0dcb91c97f77..70e9db0f6772 100644 --- a/download.lst +++ b/download.lst @@ -183,9 +183,9 @@ export NEON_SHA256SUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d export NEON_TARBALL := neon-0.30.2.tar.gz export NSS_SHA256SUM := ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45 export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz -export ODFGEN_SHA256SUM := 2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2 -export ODFGEN_VERSION_MICRO := 6 -export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 +export ODFGEN_SHA256SUM := 55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625 +export ODFGEN_VERSION_MICRO := 8 +export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz export ODFVALIDATOR_SHA256SUM := 702413413a5d8076c17fe79c0808dfba145a7260020f6c8627ea529a0cf83769 export ODFVALIDATOR_JAR := odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-475.jar export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770 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 <dtar...@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 c02b4f532d65..a173cdd47535 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 \ )) @@ -33,10 +34,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 952c3ce9b002..c6264618546a 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 10eb24fd77a7..52d916f57b9c 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -37,8 +37,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ endif endif -$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ - external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1 \ -)) - # vim: set noet sw=4 ts=4: 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 diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index fca238659291..4d9c1c813a78 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -303,10 +303,10 @@ "dest-filename": "external/tarballs/libmwaw-0.3.16.tar.xz" }, { - "url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2", - "sha256": "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2", + "url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz", + "sha256": "55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625", "type": "file", - "dest-filename": "external/tarballs/libodfgen-0.1.6.tar.bz2" + "dest-filename": "external/tarballs/libodfgen-0.1.8.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz",