ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

upload libodfgen 0.1.8

Browse Source 
Change-Id: Ibc59469b74d54a2b307ea708ea5c4a752532f0b0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109840
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon
2021-01-24 20:51:21 +01:00
parent 6b6b6f011c
commit f341a9da2e
8 changed files with 13 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
download.lst
+3 -3
View File
@@ -195,9 +195,9 @@ export NEON_SHA256SUM := c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e
export NEON_TARBALL := neon-0.31.1.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 := d55495ab3a86544650587de2a72180ddf8bfc6376d14ddfa923992dbc86a06e0
export ODFVALIDATOR_JAR := odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar
export OFFICEOTRON_SHA256SUM := f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
Vendored
-58
View File
@@ -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
external/libodfgen/ExternalProject_libodfgen.mk
Vendored
+3 -1
View File
@@ -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')) \
external/libodfgen/Library_odfgen.mk
Vendored
+2 -1
View File
@@ -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 \
external/libodfgen/UnpackedTarball_libodfgen.mk
Vendored
-8
View File
@@ -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:
external/libodfgen/c++11.patch
Vendored
-44
View File
@@ -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
external/libodfgen/libodfgen-bundled-soname.patch.0
Vendored
+2 -3
View File
@@ -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
solenv/flatpak-manifest.in
+3 -3
View File
@@ -279,10 +279,10 @@
"dest-filename": "external/tarballs/libmwaw-0.3.17.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",