diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 | 56 | ||||
| -rw-r--r-- | external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 | 24 | ||||
| -rw-r--r-- | external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 | 26 | ||||
| -rw-r--r-- | external/libstaroffice/UnpackedTarball_libstaroffice.mk | 10 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
7 files changed, 6 insertions, 122 deletions
diff --git a/configure.ac b/configure.ac index c3ef52dc65c1..9fd64a41bcb9 100644 --- a/configure.ac +++ b/configure.ac @@ -8574,7 +8574,7 @@ libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0]) libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0]) libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0]) -libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.6]) +libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7]) dnl =================================================================== dnl Check for system lcms2 diff --git a/download.lst b/download.lst index fce6e1195fd2..d64ecd0493bc 100644 --- a/download.lst +++ b/download.lst @@ -236,8 +236,8 @@ export SERF_SHA256SUM := 6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1e export SERF_TARBALL := serf-1.2.1.tar.bz2 export SKIA_SHA256SUM := d724dd60d4375359aa4751ea39950ad833592f01774914873f6d033f14e1c63f export SKIA_TARBALL := skia-m83-8ce842d38d0b32149e874d6855c91e8c68ba65a7.tar.xz -export STAROFFICE_SHA256SUM := 6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4 -export STAROFFICE_VERSION_MICRO := 6 +export STAROFFICE_SHA256SUM := f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db +export STAROFFICE_VERSION_MICRO := 7 export STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz export SWING_SHA256SUM := 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip diff --git a/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 b/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 deleted file mode 100644 index 27fd97727e25..000000000000 --- a/external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 +++ /dev/null @@ -1,56 +0,0 @@ -From 9c0ff663659a28720c4ee3f5752bb8ce8121648f Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Mon, 21 Oct 2019 17:17:48 +0200 -Subject: [PATCH] Fix equality operator arguments - -...which avoids overload resolution ambiguities in C++20, when a synthesized -candidate of operator == for a reversed-argument rewrite conflicts with the -actual operator ==, as one is a template specialization for int and the other -for float. (As observed with recent Clang 10 trunk with -std=c++2a when -building libstaroffice as part of LibreOffice: - -> STOFFChart.cxx:230:63: error: use of overloaded operator '==' is ambiguous (with operand types 'STOFFVec2f' (aka 'STOFFVec2<float>') and 'STOFFVec2i' (aka 'STOFFVec2<int>')) -> bool autoPlace=m_legendPosition==STOFFBox2f()||m_dimension==STOFFVec2i(); -> ~~~~~~~~~~~^ ~~~~~~~~~~~~ -> ./libstaroffice_internal.hxx:687:8: note: candidate function -> bool operator==(STOFFVec2<T> const &p) const -> ^ -> ./libstaroffice_internal.hxx:687:8: note: candidate function (with reversed parameter order) -> STOFFChart.cxx:270:63: error: use of overloaded operator '==' is ambiguous (with operand types 'STOFFVec2f' (aka 'STOFFVec2<float>') and 'STOFFVec2i' (aka 'STOFFVec2<int>')) -> bool autoPlace=m_plotAreaPosition==STOFFBox2f()||m_dimension==STOFFVec2i(); -> ~~~~~~~~~~~^ ~~~~~~~~~~~~ -> ./libstaroffice_internal.hxx:687:8: note: candidate function -> bool operator==(STOFFVec2<T> const &p) const -> ^ -> ./libstaroffice_internal.hxx:687:8: note: candidate function (with reversed parameter order) - -) ---- - src/lib/STOFFChart.cxx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lib/STOFFChart.cxx b/src/lib/STOFFChart.cxx -index 3e7310c..b861762 100644 ---- a/src/lib/STOFFChart.cxx -+++ b/src/lib/STOFFChart.cxx -@@ -227,7 +227,7 @@ void STOFFChart::sendChart(STOFFSpreadsheetListenerPtr &listener, librevenge::RV - - // legend - if (m_legend.m_show) { -- bool autoPlace=m_legendPosition==STOFFBox2f()||m_dimension==STOFFVec2i(); -+ bool autoPlace=m_legendPosition==STOFFBox2f()||m_dimension==STOFFVec2f(); - style=librevenge::RVNGPropertyList(); - m_legend.addStyleTo(style); - style.insert("librevenge:chart-id", styleId); -@@ -267,7 +267,7 @@ void STOFFChart::sendChart(STOFFSpreadsheetListenerPtr &listener, librevenge::RV - } - // plot area - style=librevenge::RVNGPropertyList(); -- bool autoPlace=m_plotAreaPosition==STOFFBox2f()||m_dimension==STOFFVec2i(); -+ bool autoPlace=m_plotAreaPosition==STOFFBox2f()||m_dimension==STOFFVec2f(); - m_plotAreaStyle.addTo(style); - style.insert("librevenge:chart-id", styleId); - style.insert("chart:include-hidden-cells","false"); --- -2.21.0 - diff --git a/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 b/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 deleted file mode 100644 index 2445d2a4a8e3..000000000000 --- a/external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 +++ /dev/null @@ -1,24 +0,0 @@ -From d6c34e98a6adb060ad42b9f1c60a1e8036bc27ff Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Thu, 26 Apr 2018 14:21:06 +0200 -Subject: [PATCH] add missing include for std::max - ---- - src/lib/STOFFChart.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/STOFFChart.cxx b/src/lib/STOFFChart.cxx -index cd1566f..3e7310c 100644 ---- a/src/lib/STOFFChart.cxx -+++ b/src/lib/STOFFChart.cxx -@@ -37,6 +37,7 @@ - * - */ - -+#include <algorithm> - #include <iomanip> - #include <iostream> - #include <map> --- -2.14.3 - diff --git a/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 b/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 deleted file mode 100644 index 8bb967201f40..000000000000 --- a/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 +++ /dev/null @@ -1,26 +0,0 @@ -From ae4dc7ea2a45a7ae560a0c399c7d8a720f670996 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> -Date: Mon, 13 Jan 2020 20:04:38 +0000 -Subject: [PATCH] text:send-lastname should be text:sender-lastname - -as detected by LibreOffice crashtesting ---- - src/lib/SWFieldManager.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/SWFieldManager.cxx b/src/lib/SWFieldManager.cxx -index 81f423b..071e20c 100644 ---- a/src/lib/SWFieldManager.cxx -+++ b/src/lib/SWFieldManager.cxx -@@ -293,7 +293,7 @@ bool Field::send(STOFFListenerPtr &listener, StarState &state) const - else if (m_type==30) { - if (m_subType>=0 && m_subType<=16) { - char const *wh[]= { -- "text:sender-company", "text:sender-firstname", "text:send-lastname", "text:sender-initials", "text:sender-street", -+ "text:sender-company", "text:sender-firstname", "text:sender-lastname", "text:sender-initials", "text:sender-street", - "text:sender-country", "text:sender-postal-code", "text:sender-city", "text:sender-title", "text:sender-position", - "text:sender-phone-private", "text:sender-phone-work", "text:sender-fax", "text:sender-email", "text:sender-state-or-province", - "text:sender-lastname" /*father name*/, "text:sender-street" /* appartement*/ --- -2.24.1 - diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index db499cba64d2..b7d8f4ee744d 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -29,14 +29,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ )) endif -# * external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 is upstream at -# <https://github.com/fosnola/libstaroffice/pull/6> "Fix equality operator arguments": -# * external/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 is upstream at -# <https://github.com/fosnola/libstaroffice/pull/7> "text:send-lastname should be text:sender-lastname": -$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice,\ - external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 \ - external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 \ - external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 628c12c50d46..6511d62c5130 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -291,10 +291,10 @@ "dest-filename": "external/tarballs/librevenge-0.0.4.tar.bz2" }, { - "url": "https://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz", - "sha256": "6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4", + "url": "https://dev-www.libreoffice.org/src/libstaroffice-0.0.7.tar.xz", + "sha256": "f94fb0ad8216f97127bedef163a45886b43c62deac5e5b0f5e628e234220c8db", "type": "file", - "dest-filename": "external/tarballs/libstaroffice-0.0.6.tar.xz" + "dest-filename": "external/tarballs/libstaroffice-0.0.7.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/ltm-1.0.zip", |