zepto-forks/meta-office
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libreoffice: upgrade 6.4.6.2 -> 7.0.2.2

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-10-03 19:05:29 +02:00
parent e1f4db9e05
commit 12385b9367
8 changed files with 25 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
recipes-libreoffice/libreoffice/files/0002-replace-boost-bimap-in-sdext-pdfimport.patch
View File

@@ -1,121 +0,0 @@
From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 29 Jan 2020 12:44:52 +0000
Subject: [PATCH] replace boost::bimap in sdext pdfimport
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
the error message with boost 1.69 and gcc 10 is so ungodly its easier to throw
bimap out and use something simpler
Change-Id: Ie324a0b81931bbd427483878a87beeca455ada18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87683
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Upstream-Status: Applied
---
sdext/source/pdfimport/inc/pdfiprocessor.hxx | 12 ++++-------
sdext/source/pdfimport/tree/pdfiprocessor.cxx | 21 +++++++++++--------
2 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/sdext/source/pdfimport/inc/pdfiprocessor.hxx b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
index 89f9d601b7b0..9e08d6a6a765 100644
--- a/sdext/source/pdfimport/inc/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/inc/pdfiprocessor.hxx
@@ -37,9 +37,6 @@
#include "treevisitorfactory.hxx"
#include "genericelements.hxx"
-#include <boost/bimap/bimap.hpp>
-#include <boost/bimap/unordered_set_of.hpp>
-
namespace pdfi
{
@@ -160,10 +157,8 @@ namespace pdfi
typedef std::unordered_map<sal_Int32,FontAttributes> IdToFontMap;
typedef std::unordered_map<FontAttributes,sal_Int32,FontAttrHash> FontToIdMap;
- typedef boost::bimaps::bimap<
- boost::bimaps::unordered_set_of<GraphicsContext, GraphicsContextHash>,
- boost::bimaps::unordered_set_of<sal_Int32>
- > GCToIdBiMap;
+ typedef std::unordered_map<sal_Int32,GraphicsContext> IdToGCMap;
+ typedef std::unordered_map<GraphicsContext, sal_Int32, GraphicsContextHash> GCToIdMap;
typedef std::vector<GraphicsContext> GraphicsContextStack;
@@ -178,7 +173,8 @@ namespace pdfi
GraphicsContextStack m_aGCStack;
sal_Int32 m_nNextGCId;
- GCToIdBiMap m_aGCToId;
+ IdToGCMap m_aIdToGC;
+ GCToIdMap m_aGCToId;
ImageContainer m_aImages;
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index c6baa7fee8b2..ed2eaf6510b9 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -54,6 +54,7 @@ namespace pdfi
m_aFontToId(),
m_aGCStack(),
m_nNextGCId( 1 ),
+ m_aIdToGC(),
m_aGCToId(),
m_aImages(),
m_nPages(0),
@@ -65,12 +66,13 @@ namespace pdfi
aDefFont.isBold = false;
aDefFont.isItalic = false;
aDefFont.size = 10*PDFI_OUTDEV_RESOLUTION/72;
- m_aIdToFont[ 0 ] = aDefFont;
- m_aFontToId[ aDefFont ] = 0;
+ m_aIdToFont.insert({0, aDefFont});
+ m_aFontToId.insert({aDefFont, 0});
GraphicsContext aDefGC;
m_aGCStack.push_back( aDefGC );
- m_aGCToId.insert(GCToIdBiMap::relation(aDefGC, 0));
+ m_aGCToId.insert({aDefGC, 0});
+ m_aIdToGC.insert({0, aDefGC});
}
void PDFIProcessor::setPageNum( sal_Int32 nPages )
@@ -468,12 +470,13 @@ const FontAttributes& PDFIProcessor::getFont( sal_Int32 nFontId ) const
sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
{
sal_Int32 nGCId = 0;
- auto it = m_aGCToId.left.find( rGC );
- if( it != m_aGCToId.left.end() )
+ auto it = m_aGCToId.find( rGC );
+ if( it != m_aGCToId.end() )
nGCId = it->second;
else
{
- m_aGCToId.insert(GCToIdBiMap::relation(rGC, m_nNextGCId));
+ m_aGCToId.insert({rGC, m_nNextGCId});
+ m_aIdToGC.insert({m_nNextGCId, rGC});
nGCId = m_nNextGCId;
m_nNextGCId++;
}
@@ -483,9 +486,9 @@ sal_Int32 PDFIProcessor::getGCId( const GraphicsContext& rGC )
const GraphicsContext& PDFIProcessor::getGraphicsContext( sal_Int32 nGCId ) const
{
- auto it = m_aGCToId.right.find( nGCId );
- if( it == m_aGCToId.right.end() )
- it = m_aGCToId.right.find( 0 );
+ auto it = m_aIdToGC.find( nGCId );
+ if( it == m_aIdToGC.end() )
+ it = m_aIdToGC.find( 0 );
return it->second;
}
--
2.21.3

6
recipes-libreoffice/libreoffice/libreoffice-version.inc
View File

@@ -1,8 +1,8 @@
PV = "6.4.6.2"
DIRV = "6.4.6"
PV = "7.0.2.2"
DIRV = "7.0.2"
SRC_URI += " \
http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
"
SRC_URI[sha256sum] = "ab8281c5290e23eb46c4d4aee4abb16d2dcc5ff6daf46991c0370bee6ec0aa4c"
SRC_URI[sha256sum] = "09fa559f2ef239151cb37bcca17a6f074a846693b88893c3e1fb612ecde74d97"

2
recipes-libreoffice/libreoffice/libreoffice.bb
View File

@@ -18,7 +18,7 @@ SRC_URI += " \
file://0010-Support-install-to-find-bash-completion.in.patch \
"
SRC_URI[translations.sha256sum] = "a3a95168ed9845d28f5e10f1a729383dae9e706f63e5a898de72b4843fe5352a"
SRC_URI[translations.sha256sum] = "878f85188d48ec469eb82f0b50e33cf421d0c1efd8a64287cb097df6f355e826"
DEPENDS += " \
${BPN}-native \

2
recipes-libreoffice/libreoffice/libreoffice.inc
View File

@@ -11,7 +11,6 @@ require libreoffice-version.inc
SRC_URI += " \
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
file://0001-Workaround-boost-library-detection-failures.patch \
file://0002-replace-boost-bimap-in-sdext-pdfimport.patch \
"
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
@@ -30,6 +29,7 @@ EXTRA_OECONF = " \
--without-doxygen \
--enable-release-build \
--enable-python=system \
--disable-skia \
${@oe.utils.parallel_make_argument(d, '--with-parallelism=%d')} \
\
--with-system-boost \

2
recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch
View File

@@ -19,7 +19,7 @@ index 393e94f..5cdb930 100644
+++ b/Makefile.in
@@ -280,7 +280,7 @@ bootstrap: check-if-root compilerplugins
# Note: this will pipe through all gbuild targets to ... gbuild
# with some translations like "build"->"all" for historic reasons
# with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons
#
-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \
+build: bootstrap fetch \

21
recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch
View File

@@ -1,43 +1,40 @@
From 900b79ed77cd5c126cc4ac9beef488a94ef57b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 20 Nov 2015 22:03:58 +0100
Date: Sat, 3 Oct 2020 14:05:48 +0200
Subject: [PATCH] ensure that native gendict build by libreoffice is used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is neccessary since last commit using all helpers from native sysroot
Upstream-Status: Inappropriate [oe specific]
Change-Id: I0afbd760bc8810396e04a5e276a68a810042b057
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
i18npool/CustomTarget_breakiterator.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 4aaf2e5..5837bc8 100644
index dee46a3..fab7ddf 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -22,7 +22,7 @@ $(i18npool_BIDIR)/dict_%.data : \
| $(i18npool_BIDIR)/.dir
@@ -23,7 +23,7 @@ $(i18npool_BIDIR)/dict_%.data : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC)
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
+ $(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC)
else
$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
@@ -34,7 +34,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
| $(i18npool_BIDIR)/.dir
@@ -37,7 +37,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC)
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
+ $(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC)
endif
--
2.1.0
2.26.2

2
recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch
View File

@@ -27,7 +27,7 @@ index c03bbbc..40b5865 100644
+ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build_native,saxparser))) && \
sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \
rm $$@.tmp)
$$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),SAX)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 2611d94..d6a1997 100644
--- a/solenv/gbuild/TargetLocations.mk

15
recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch
View File

@@ -12,23 +12,26 @@ Upstream-Status: Inappropriate [oe specific]
Sun, 2 Feb 2020:
Adjusted for 6.4.0.3
Sat, 3 Oct 2020
Adjusted for 7.0.2.2
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
solenv/gbuild/Package.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 45a56ff..4fa26fe 100644
index 90e2280..0920cf2 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -79,7 +79,6 @@ $(call gb_Package_get_preparation_target,%) :
# Package_foo makefiles.
@@ -80,7 +80,6 @@ $(call gb_Package_get_preparation_target,%) :
$(call gb_Package_get_target,%) :
$(call gb_Output_announce,$*,$(true),PKG,2)
$(call gb_Trace_StartRange,$*,PKG)
- $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
rm -f $@ && \
mv $(call var2file,$@.tmp,100,$(sort $(call gb_Package_get_files,$*))) $@
mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
$(call gb_Trace_EndRange,$*,PKG)
--
2.21.0
2.26.2