From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- .../files/libreoffice-6.4.3.2-boost-1.73.patch | 118 --------------------- .../files/libreoffice-6.4.6.2-llvm-10.patch | 102 ------------------ ....7.2-fix-wrong-setting-for-doc-properties.patch | 75 ------------- .../files/libreoffice-6.4.7.2-icu-68-1.patch | 46 -------- .../files/libreoffice-6.4.7.2-icu-68-2.patch | 28 ----- 5 files changed, 369 deletions(-) delete mode 100644 app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch delete mode 100644 app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch (limited to 'app-office/libreoffice/files') diff --git a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch b/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch deleted file mode 100644 index 0eb406999223..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.4.3.2-boost-1.73.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 55c724b93dfd4c9a1afb10d60fbc2d7a9a66cf61 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 29 Jan 2020 12:44:52 +0000 -Subject: 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 ---- - 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 --#include -- - namespace pdfi - { - -@@ -160,10 +157,8 @@ namespace pdfi - typedef std::unordered_map IdToFontMap; - typedef std::unordered_map FontToIdMap; - -- typedef boost::bimaps::bimap< -- boost::bimaps::unordered_set_of, -- boost::bimaps::unordered_set_of -- > GCToIdBiMap; -+ typedef std::unordered_map IdToGCMap; -+ typedef std::unordered_map GCToIdMap; - - typedef std::vector 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; - } - --- -cgit v1.2.1 diff --git a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch b/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch deleted file mode 100644 index 4a1ff5160297..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.4.6.2-llvm-10.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 986bd28388df745dd969e7be7c3bda36b2b2cb0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 6 Aug 2020 10:50:47 +0100 -Subject: [PATCH] ofz#24641 libc++abi __cxa_exception has grown another member -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https: //github.com/llvm/llvm-project/commit/f2a436058fcbc11291e73badb44e243f61046183 - -this is the same problem as - -commit f4b6f6a8ae60bdec53512728d00853b73fa18500 -Author: Stephan Bergmann -Date: Thu Feb 13 08:40:11 2020 +0100 - - Hack to dynamically adapt to __cxa_exceptiom in LLVM 11 libcxxabi - - (where the new change to __cxa_exception effectively reverts the change that - prompted 7a9dd3d482deeeb3ed1d50074e56adbd3f928296 "Hack to dynamically adapt to - __cxa_exceptiom in LLVM 5.0 libcxxabi") - - Change-Id: Iec4ef1dc188bea2223d99b1b7eb8adec636c98e7 - Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88583 - Tested-by: Jenkins - Reviewed-by: Stephan Bergmann - -so c-n-p that solution here - -Change-Id: I4475757a766e3ade7b9fcaf6149e535c9f9a4fa4 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100209 -Tested-by: Caolán McNamara -Reviewed-by: Caolán McNamara ---- - .../cpp_uno/gcc3_linux_x86-64/except.cxx | 28 +++++++++++++++++++ - .../cpp_uno/gcc3_linux_x86-64/share.hxx | 14 ++++++++++ - 2 files changed, 42 insertions(+) - -diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx -index e9e861f1c210..25931671f7dc 100644 ---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx -+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx -@@ -150,6 +150,34 @@ void fillUnoException(uno_Any * pUnoExc, uno_Mapping * pCpp2Uno) - return; - } - -+#if defined _LIBCPPABI_VERSION // detect libc++abi -+ // Very bad HACK to find out whether we run against a libcxxabi that has a new -+ // __cxa_exception::reserved member at the start, introduced with LLVM 11 -+ // -+ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The layout of the -+ // start of __cxa_exception is -+ // -+ // [8 byte void *reserve] -+ // 8 byte size_t referenceCount -+ // -+ // where the (bad, hacky) assumption is that reserve (if present) is null -+ // (__cxa_allocate_exception in at least LLVM 11 zero-fills the object, and nothing actively -+ // sets reserve) while referenceCount is non-null (__cxa_throw sets it to 1, and -+ // __cxa_decrement_exception_refcount destroys the exception as soon as it drops to 0; for a -+ // __cxa_dependent_exception, the referenceCount member is rather -+ // -+ // 8 byte void* primaryException -+ // -+ // but which also will always be set to a non-null value in __cxa_rethrow_primary_exception). -+ // As described in the definition of __cxa_exception -+ // (bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx), this hack (together with the "#if 0" -+ // there) can be dropped once we can be sure that we only run against new libcxxabi that has the -+ // reserve member: -+ if (*reinterpret_cast(header) == nullptr) { -+ header = reinterpret_cast<__cxxabiv1::__cxa_exception*>(reinterpret_cast(header) + 1); -+ } -+#endif -+ - std::type_info *exceptionType = __cxxabiv1::__cxa_current_exception_type(); - - typelib_TypeDescription * pExcTypeDescr = nullptr; -diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx -index e8afe35c4f59..53c8841fbbcb 100644 ---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx -+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx -@@ -108,6 +108,20 @@ namespace __cxxabiv1 { - struct __cxa_exception { - #if defined _LIBCPPABI_VERSION // detect libc++abi - #if defined __LP64__ || LIBCXXABI_ARM_EHABI -+#if 0 -+ // This is a new field added with LLVM 11 -+ // -+ // "[libcxxabi] Insert padding in __cxa_exception struct for compatibility". The HACK in -+ // fillUnoException (bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx) tries to find out at -+ // runtime whether a __cxa_exception has this member. Once we can be sure that we only run -+ // against new libcxxabi that has this member, we can drop the "#if 0" here and drop the hack -+ // in fillUnoException. -+ -+ // Now _Unwind_Exception is marked with __attribute__((aligned)), -+ // which implies __cxa_exception is also aligned. Insert padding -+ // in the beginning of the struct, rather than before unwindHeader. -+ void *reserve; -+#endif - std::size_t referenceCount; - #endif - #endif diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch deleted file mode 100644 index 9c9d417cde9f..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.4.7.2-fix-wrong-setting-for-doc-properties.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 188ddcd482150b5fdeb44d97e57831e3e27b3f5b Mon Sep 17 00:00:00 2001 -From: Justin Luth -Date: Mon, 28 Sep 2020 20:21:52 +0300 -Subject: tdf#136983 partial revert NFC ww8 cleanup: remove unused variables - -This is a partial revert of LO 6.2 -commit 2ec0cf500222aef55d02df80154b47fbb92970c9 - -I can't think of any excuse for how I possibly missed that -xDocProps was being defined/used outside of this clause. -Just plain stupid and blind. - -The good news is that the create and modified date still -seem to be getting saved somehow/somewhere. So it isn't -the disaster that it looks like it could have been. - -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565 -Tested-by: Jenkins -Reviewed-by: Justin Luth -(cherry picked from commit 1086654d6e8cc22f1f99195668db3f305437e570) -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104495 -Reviewed-by: Miklos Vajna -(cherry picked from commit 19b8ded3ae18dd4070a3e21d7b980782a27e5547) - -Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104497 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna ---- - sw/qa/extras/ww8export/ww8export3.cxx | 5 +++++ - sw/source/filter/ww8/wrtww8.cxx | 6 +++++- - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/sw/qa/extras/ww8export/ww8export3.cxx b/sw/qa/extras/ww8export/ww8export3.cxx -index 764ae66a20fa..9c83b6f62fa9 100644 ---- a/sw/qa/extras/ww8export/ww8export3.cxx -+++ b/sw/qa/extras/ww8export/ww8export3.cxx -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -49,6 +50,10 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection, "tdf37778_readonlySection.d - // tdf#127862: page fill color (in this case white) was lost - uno::Reference xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY); - CPPUNIT_ASSERT(drawing::FillStyle_NONE != getProperty(xStyle, "FillStyle")); -+ -+ // tdf#136983 -+ uno::Reference xDPS(mxComponent, uno::UNO_QUERY); -+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Last printed date", sal_Int16(2009), xDPS->getDocumentProperties()->getPrintDate().Year); - } - - DECLARE_WW8EXPORT_TEST(testTdf122429_header, "tdf122429_header.doc") -diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx -index e908cab35162..8d4add7b34bf 100644 ---- a/sw/source/filter/ww8/wrtww8.cxx -+++ b/sw/source/filter/ww8/wrtww8.cxx -@@ -501,7 +501,11 @@ static void WriteDop( WW8Export& rWrt ) - uno::Reference xProps; - if ( pDocShell ) - { -- xProps.set(pDocShell->GetModel(), uno::UNO_QUERY); -+ uno::Reference xModelComp(pDocShell->GetModel(), uno::UNO_QUERY); -+ xProps.set(xModelComp, uno::UNO_QUERY); -+ uno::Reference xDPS(xModelComp, uno::UNO_QUERY_THROW); -+ xDocProps = xDPS->getDocumentProperties(); -+ OSL_ENSURE(xDocProps.is(), "DocumentProperties is null"); - - rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash(); - } --- -cgit v1.2.1 diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch deleted file mode 100644 index fe20e3435d2a..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-1.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard -Date: Sun, 1 Nov 2020 18:30:49 +0100 -Subject: fix build with ICU 68 - -use standard true. - -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope - 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); - | ^~~~ - -/usr/include/unicode/umachine.h says: - -@deprecated ICU 68 Use standard "true" instead. - -Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 -Tested-by: Jenkins -Reviewed-by: Eike Rathke ---- - i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx -index b7ae49fbd96e..59ee46fa0e0f 100644 ---- a/i18npool/source/calendar/calendar_gregorian.cxx -+++ b/i18npool/source/calendar/calendar_gregorian.cxx -@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) - "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); - int32_t nZoneOffset, nDSTOffset; - UErrorCode status = U_ZERO_ERROR; -- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); -+ body->getTimeZone().getOffset( fR, -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ true, -+#else -+ TRUE, -+#endif -+ nZoneOffset, nDSTOffset, status ); -+ - if ( !U_SUCCESS(status) ) throw ERROR; - status = U_ZERO_ERROR; - body->setTime( fR - (nZoneOffset + nDSTOffset), status ); --- -cgit v1.2.1 diff --git a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch b/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch deleted file mode 100644 index bd7dc04cffe5..000000000000 --- a/app-office/libreoffice/files/libreoffice-6.4.7.2-icu-68-2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 523f8613c124b722b721c8055db2085a005e09dd Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Fri, 6 Nov 2020 02:43:07 +0100 -Subject: [PATCH] Fix build with ICU 68, use standard true. (part 2/2 missing - from 0b14b9ec) - -Change-Id: I776dd4e1fc92ef1ef09b88e239bf0d6942c28ca3 -Signed-off-by: Andreas Sturmlechner ---- - svx/source/dialog/fntctrl.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx -index d312d7ad5f49..10c84ca95222 100644 ---- a/svx/source/dialog/fntctrl.cxx -+++ b/svx/source/dialog/fntctrl.cxx -@@ -1014,7 +1014,7 @@ void SvxFontPrevWindow::SetFromItemSet(const SfxItemSet &rSet, bool bPreviewBack - rCTLFont.SetFillColor( rColor ); - } - else -- bTransparent = TRUE; -+ bTransparent = true; - - rFont.SetTransparent( bTransparent ); - rCJKFont.SetTransparent( bTransparent ); --- -2.29.2 - -- cgit v1.2.3