diff --git a/.gitignore b/.gitignore index 40736b1..1db0fc0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,9 +6,9 @@ /f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf /libreoffice-multiliblauncher.sh /dtoa-20180411.tgz -/libreoffice-7.2.5.2.tar.xz -/libreoffice-7.2.5.2.tar.xz.asc -/libreoffice-help-7.2.5.2.tar.xz -/libreoffice-help-7.2.5.2.tar.xz.asc -/libreoffice-translations-7.2.5.2.tar.xz -/libreoffice-translations-7.2.5.2.tar.xz.asc +/libreoffice-7.3.0.3.tar.xz +/libreoffice-7.3.0.3.tar.xz.asc +/libreoffice-help-7.3.0.3.tar.xz +/libreoffice-help-7.3.0.3.tar.xz.asc +/libreoffice-translations-7.3.0.3.tar.xz +/libreoffice-translations-7.3.0.3.tar.xz.asc diff --git a/0001-Missing-include.patch b/0001-Missing-include.patch deleted file mode 100644 index b6bcd28..0000000 --- a/0001-Missing-include.patch +++ /dev/null @@ -1,352 +0,0 @@ -From 85da04887089580fa7551b57f740c6a62507dae1 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 9 Aug 2021 23:07:12 +0200 -Subject: [PATCH] Missing includes for libstdc++ 12 - -(for std::unique_ptr, with recent libstdc++ 12 trunk) - -Change-Id: I61b7823dd740ea7cdfe0d7403a50ac73b24d1c4e -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120229 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann -(cherry picked from commit 43542cc07ee110abe25a1e176238fd6d921d593b) ---- - chart2/source/view/inc/PlottingPositionHelper.hxx | 4 ++++ - compilerplugins/clang/test/unusedfields.cxx | 1 + - connectivity/source/inc/java/tools.hxx | 4 ++++ - extensions/source/propctrlr/handlerhelper.hxx | 1 + - filter/source/xsltdialog/xmlfilterjar.hxx | 1 + - forms/source/component/EventThread.hxx | 1 + - forms/source/xforms/propertysetbase.hxx | 1 + - fpicker/source/office/contentenumeration.hxx | 4 ++++ - framework/inc/uielement/toolbarwrapper.hxx | 2 ++ - include/oox/crypto/StrongEncryptionDataSpace.hxx | 4 ++++ - include/sfx2/sidebar/SidebarPanelBase.hxx | 4 ++++ - include/svtools/imageresourceaccess.hxx | 4 ++++ - include/vcl/BitmapBuffer.hxx | 4 ++++ - include/vcl/filter/PngImageReader.hxx | 4 ++++ - shell/source/backends/kf5be/kf5backend.cxx | 2 ++ - sot/source/unoolestorage/xolesimplestorage.hxx | 2 ++ - starmath/inc/token.hxx | 1 + - .../textconversiondlgs/chinese_translation_unodialog.hxx | 4 ++++ - sw/source/uibase/docvw/OverlayRanges.hxx | 1 + - sw/source/uibase/docvw/ShadowOverlayObject.hxx | 4 ++++ - xmlsecurity/source/gpg/SecurityEnvironment.hxx | 3 +++ - xmlsecurity/source/helper/ooxmlsecparser.hxx | 1 + - xmlsecurity/source/helper/xsecparser.hxx | 1 + - 23 files changed, 58 insertions(+) - -diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx -index 0962868b0f31..d687cb902453 100644 ---- a/chart2/source/view/inc/PlottingPositionHelper.hxx -+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx -@@ -18,6 +18,10 @@ - */ - #pragma once - -+#include -+ -+#include -+ - #include - - #include -diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx -index 5305b4aec964..6ff9189eab27 100644 ---- a/compilerplugins/clang/test/unusedfields.cxx -+++ b/compilerplugins/clang/test/unusedfields.cxx -@@ -14,6 +14,7 @@ - // expected-no-diagnostics - #else - -+#include - #include - #include - #include -diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx -index bc9759fa9a88..44a35ecee3f9 100644 ---- a/connectivity/source/inc/java/tools.hxx -+++ b/connectivity/source/inc/java/tools.hxx -@@ -19,6 +19,10 @@ - - #pragma once - -+#include -+ -+#include -+ - #include - #include - -diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx -index a53a24a9256f..1d32db9c0573 100644 ---- a/extensions/source/propctrlr/handlerhelper.hxx -+++ b/extensions/source/propctrlr/handlerhelper.hxx -@@ -26,6 +26,7 @@ - #include - #include - -+#include - #include - - namespace weld { class Builder; class Widget; class Window; } -diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx -index 6f02e5f99de0..1d8e52fc3e18 100644 ---- a/filter/source/xsltdialog/xmlfilterjar.hxx -+++ b/filter/source/xsltdialog/xmlfilterjar.hxx -@@ -22,6 +22,7 @@ - #include - #include - -+#include - #include - - class filter_info_impl; -diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx -index be9e9696734e..20aff73113db 100644 ---- a/forms/source/component/EventThread.hxx -+++ b/forms/source/component/EventThread.hxx -@@ -21,6 +21,7 @@ - - #include - -+#include - #include - - #include -diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx -index bb27f8460fea..969253a04d62 100644 ---- a/forms/source/xforms/propertysetbase.hxx -+++ b/forms/source/xforms/propertysetbase.hxx -@@ -26,6 +26,7 @@ - #include - - #include -+#include - - namespace com::sun::star::uno { - class Any; -diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx -index 9dcfae687883..bc2180c53c47 100644 ---- a/fpicker/source/office/contentenumeration.hxx -+++ b/fpicker/source/office/contentenumeration.hxx -@@ -19,6 +19,10 @@ - - #pragma once - -+#include -+ -+#include -+ - #include - #include - #include -diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx -index 55142f98d500..da90455b21da 100644 ---- a/framework/inc/uielement/toolbarwrapper.hxx -+++ b/framework/inc/uielement/toolbarwrapper.hxx -@@ -25,6 +25,8 @@ - #include - #include - -+#include -+ - namespace weld - { - class Builder; -diff --git a/include/oox/crypto/StrongEncryptionDataSpace.hxx b/include/oox/crypto/StrongEncryptionDataSpace.hxx -index 59be5c9832a0..cd7156515ab3 100644 ---- a/include/oox/crypto/StrongEncryptionDataSpace.hxx -+++ b/include/oox/crypto/StrongEncryptionDataSpace.hxx -@@ -11,6 +11,10 @@ - #ifndef INCLUDED_OOX_CRYPTO_STRONGENCRYPTINDATASPACE_HXX - #define INCLUDED_OOX_CRYPTO_STRONGENCRYPTINDATASPACE_HXX - -+#include -+ -+#include -+ - #include - #include - #include -diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx -index 971e286ca74f..8164244e796a 100644 ---- a/include/sfx2/sidebar/SidebarPanelBase.hxx -+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx -@@ -18,6 +18,10 @@ - */ - #pragma once - -+#include -+ -+#include -+ - #include - - #include -diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx -index d7e8a5629b11..ccb5b6b69bce 100644 ---- a/include/svtools/imageresourceaccess.hxx -+++ b/include/svtools/imageresourceaccess.hxx -@@ -19,6 +19,10 @@ - - #pragma once - -+#include -+ -+#include -+ - #include - #include - -diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx -index 79f202cdfa2d..7468cb987f95 100644 ---- a/include/vcl/BitmapBuffer.hxx -+++ b/include/vcl/BitmapBuffer.hxx -@@ -20,6 +20,10 @@ - #ifndef INCLUDED_VCL_BITMAPBUFFER_HXX - #define INCLUDED_VCL_BITMAPBUFFER_HXX - -+#include -+ -+#include -+ - #include - #include - #include -diff --git a/include/vcl/filter/PngImageReader.hxx b/include/vcl/filter/PngImageReader.hxx -index 2615fd961bd4..bbb5b7c8d672 100644 ---- a/include/vcl/filter/PngImageReader.hxx -+++ b/include/vcl/filter/PngImageReader.hxx -@@ -11,6 +11,10 @@ - #ifndef INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX - #define INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX - -+#include -+ -+#include -+ - #include - - #include -diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx -index 47c829dc5f9b..e448c124d88a 100644 ---- a/shell/source/backends/kf5be/kf5backend.cxx -+++ b/shell/source/backends/kf5be/kf5backend.cxx -@@ -19,6 +19,8 @@ - - #include - -+#include -+ - #include - - #include -diff --git a/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx -index ef0214ba61c3..2ec9f715d873 100644 ---- a/sot/source/unoolestorage/xolesimplestorage.hxx -+++ b/sot/source/unoolestorage/xolesimplestorage.hxx -@@ -22,6 +22,8 @@ - - #include - -+#include -+ - #include - #include - #include -diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx -index e38b3e5afb5a..808195dca9d3 100644 ---- a/starmath/inc/token.hxx -+++ b/starmath/inc/token.hxx -@@ -35,6 +35,7 @@ - - // std imports - #include -+#include - #include - #include - #include -diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx -index 8d2e29f1317a..dbfae4d74697 100644 ---- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx -+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx -@@ -19,6 +19,10 @@ - - #pragma once - -+#include -+ -+#include -+ - #include - #include - #include -diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx -index e086b8462ea2..829f0c4001dc 100644 ---- a/sw/source/uibase/docvw/OverlayRanges.hxx -+++ b/sw/source/uibase/docvw/OverlayRanges.hxx -@@ -22,6 +22,7 @@ - #include - #include - -+#include - #include - - class SwView; -diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx -index df8e27009f5e..cd612f7ce50e 100644 ---- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx -+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx -@@ -19,6 +19,10 @@ - - #pragma once - -+#include -+ -+#include -+ - #include - - class SwView; -diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx -index 83b4f38b41c8..262578682274 100644 ---- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx -+++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx -@@ -10,6 +10,9 @@ - #pragma once - - #include -+ -+#include -+ - #include - #include - -diff --git a/xmlsecurity/source/helper/ooxmlsecparser.hxx b/xmlsecurity/source/helper/ooxmlsecparser.hxx -index 4f11302ff765..9193d7b7e180 100644 ---- a/xmlsecurity/source/helper/ooxmlsecparser.hxx -+++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx -@@ -16,6 +16,7 @@ - - #include - -+#include - #include - - class XSecController; -diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx -index 86f6154ddc93..0e0ee8291f65 100644 ---- a/xmlsecurity/source/helper/xsecparser.hxx -+++ b/xmlsecurity/source/helper/xsecparser.hxx -@@ -26,6 +26,7 @@ - - #include - -+#include - #include - - class XMLSignatureHelper; --- -2.33.1 - diff --git a/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch b/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch index 5f07a44..6e8c641 100644 --- a/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch +++ b/0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch @@ -1,4 +1,4 @@ -From 4da5b5658dff57b7540bfc97133629d2a8ccf53d Mon Sep 17 00:00:00 2001 +From 2bf7bb98f7ed854ea382ab8340baad797787d984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sat, 14 Aug 2021 21:43:19 +0100 Subject: [PATCH] Revert "tdf#101630 - gdrive support w/oAuth and Drive API v3" @@ -12,9 +12,9 @@ This reverts commit b8b66a26f8f519a30b8e6b860a9247a8ffbb71cc. .../data/org/openoffice/Office/Common.xcu | 2 +- ucb/source/ucp/cmis/auth_provider.cxx | 130 +--- ucb/source/ucp/cmis/auth_provider.hxx | 8 +- - ucb/source/ucp/cmis/cmis_content.cxx | 21 +- + ucb/source/ucp/cmis/cmis_content.cxx | 23 +- ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 +- - 9 files changed, 55 insertions(+), 1007 deletions(-) + 9 files changed, 55 insertions(+), 1009 deletions(-) delete mode 100644 external/libcmis/libcmis_gdrive.patch.1 delete mode 100644 external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 @@ -41,7 +41,7 @@ index 9945dda3dda5..a95015b41f3e 100644 /* Alfresco Cloud */ diff --git a/external/libcmis/UnpackedTarball_libcmis.mk b/external/libcmis/UnpackedTarball_libcmis.mk -index 8398853e4511..a5be3078c95a 100644 +index f48201d319d0..64d4af395f44 100644 --- a/external/libcmis/UnpackedTarball_libcmis.mk +++ b/external/libcmis/UnpackedTarball_libcmis.mk @@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libcmis, \ @@ -50,9 +50,9 @@ index 8398853e4511..a5be3078c95a 100644 external/libcmis/libcmis_onedrive.patch \ - external/libcmis/libcmis_oauth_pw_as_refreshtoken.patch.1 \ - external/libcmis/libcmis_gdrive.patch.1 \ + external/libcmis/libcmis-boost-string.patch \ )) - # vim: set noet sw=4 ts=4: diff --git a/external/libcmis/libcmis_gdrive.patch.1 b/external/libcmis/libcmis_gdrive.patch.1 deleted file mode 100644 index 24ff65d1ef15..000000000000 @@ -953,10 +953,10 @@ index a8cb06509421..000000000000 - - #endif /* _ONEDRIVE_SESSION_HXX_ */ diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu -index d9c2d5df34e3..2277b42bdf74 100644 +index f543b6ebb3c9..24be0a7f2830 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu -@@ -431,7 +431,7 @@ +@@ -434,7 +434,7 @@ @@ -966,7 +966,7 @@ index d9c2d5df34e3..2277b42bdf74 100644 https://api.alfresco.com/cmis/versions/1.0/atom/ diff --git a/ucb/source/ucp/cmis/auth_provider.cxx b/ucb/source/ucp/cmis/auth_provider.cxx -index 05a8846a11a7..5c2ded12986e 100644 +index c3f99f5f3de5..0f5f45596adc 100644 --- a/ucb/source/ucp/cmis/auth_provider.cxx +++ b/ucb/source/ucp/cmis/auth_provider.cxx @@ -11,10 +11,7 @@ @@ -980,13 +980,13 @@ index 05a8846a11a7..5c2ded12986e 100644 #include #include -@@ -67,91 +64,6 @@ namespace cmis +@@ -66,91 +63,6 @@ namespace cmis return false; } -- string AuthProvider::getRefreshToken(string& rUsername) +- std::string AuthProvider::getRefreshToken(std::string& rUsername) - { -- string refreshToken; +- std::string refreshToken; - const css::uno::Reference xEnv = getXEnv(); - if (xEnv.is()) - { @@ -1040,8 +1040,8 @@ index 05a8846a11a7..5c2ded12986e 100644 - return refreshToken; - } - -- bool AuthProvider::storeRefreshToken(const string& username, const string& password, -- const string& refreshToken) +- bool AuthProvider::storeRefreshToken(const std::string& username, const std::string& password, +- const std::string& refreshToken) - { - if (refreshToken.empty()) - return false; @@ -1072,7 +1072,7 @@ index 05a8846a11a7..5c2ded12986e 100644 css::uno::WeakReference< css::ucb::XCommandEnvironment> AuthProvider::sm_xEnv; void AuthProvider::setXEnv(const css::uno::Reference< css::ucb::XCommandEnvironment>& xEnv ) -@@ -164,7 +76,7 @@ namespace cmis +@@ -163,7 +75,7 @@ namespace cmis return sm_xEnv; } @@ -1081,7 +1081,7 @@ index 05a8846a11a7..5c2ded12986e 100644 const char* /*username*/, const char* /*password*/ ) { -@@ -208,6 +120,46 @@ namespace cmis +@@ -207,6 +119,46 @@ namespace cmis return strdup( "" ); } @@ -1149,11 +1149,11 @@ index 9092f3c6bd25..d9864c45b230 100644 const char* /*password*/ ); diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx -index b5fb4ac3bda3..aa7628199a8c 100644 +index 7980a1821bba..93f43f4540a6 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx -@@ -347,15 +347,12 @@ namespace cmis - string rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) ); +@@ -343,15 +343,12 @@ namespace cmis + auto rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) ); bool bSkipInitialPWAuth = false; - if (m_aURL.getBindingUrl() == ONEDRIVE_BASE_URL @@ -1169,7 +1169,7 @@ index b5fb4ac3bda3..aa7628199a8c 100644 } bool bIsDone = false; -@@ -368,9 +365,7 @@ namespace cmis +@@ -364,9 +361,7 @@ namespace cmis libcmis::OAuth2DataPtr oauth2Data; if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL ) { @@ -1177,19 +1177,21 @@ index b5fb4ac3bda3..aa7628199a8c 100644 - bSkipInitialPWAuth = false; - libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback); + libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::gdriveAuthCodeFallback); - oauth2Data.reset( new libcmis::OAuth2Data( + oauth2Data = boost::make_shared( GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL, GDRIVE_SCOPE, GDRIVE_REDIRECT_URI, -@@ -385,7 +380,7 @@ namespace cmis +@@ -379,9 +374,7 @@ namespace cmis + ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ); + if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL ) { - // reset the skip, so user gets a chance to cancel - bSkipInitialPWAuth = false; +- // reset the skip, so user gets a chance to cancel +- bSkipInitialPWAuth = false; - libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::copyWebAuthCodeFallback); + libcmis::SessionFactory::setOAuth2AuthCodeProvider(AuthProvider::onedriveAuthCodeFallback); - oauth2Data.reset( new libcmis::OAuth2Data( + oauth2Data = boost::make_shared( ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL, ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI, -@@ -417,12 +412,6 @@ namespace cmis +@@ -413,12 +406,6 @@ namespace cmis else { m_pProvider->registerSession(sSessionId, m_aURL.getUsername( ), m_pSession); @@ -1202,7 +1204,7 @@ index b5fb4ac3bda3..aa7628199a8c 100644 } bIsDone = true; -@@ -430,10 +419,7 @@ namespace cmis +@@ -426,10 +413,7 @@ namespace cmis catch( const libcmis::Exception & e ) { if ( e.getType() != "permissionDenied" ) @@ -1213,7 +1215,7 @@ index b5fb4ac3bda3..aa7628199a8c 100644 } } else -@@ -525,7 +511,6 @@ namespace cmis +@@ -521,7 +505,6 @@ namespace cmis } catch ( const libcmis::Exception& ) { @@ -1222,27 +1224,27 @@ index b5fb4ac3bda3..aa7628199a8c 100644 } } diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx -index 87a3f38dc792..507cade426ad 100644 +index c55b670526b8..d2945ddeb8f5 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx -@@ -165,7 +165,7 @@ namespace cmis +@@ -168,7 +168,7 @@ namespace cmis libcmis::OAuth2DataPtr oauth2Data; if ( m_aURL.getBindingUrl( ) == GDRIVE_BASE_URL ) { - libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::copyWebAuthCodeFallback ); + libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::gdriveAuthCodeFallback ); - oauth2Data.reset( new libcmis::OAuth2Data( + oauth2Data = boost::make_shared( GDRIVE_AUTH_URL, GDRIVE_TOKEN_URL, GDRIVE_SCOPE, GDRIVE_REDIRECT_URI, -@@ -178,7 +178,7 @@ namespace cmis - ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) ); +@@ -181,7 +181,7 @@ namespace cmis + ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ); if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL ) { - libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::copyWebAuthCodeFallback ); + libcmis::SessionFactory::setOAuth2AuthCodeProvider( AuthProvider::onedriveAuthCodeFallback ); - oauth2Data.reset( new libcmis::OAuth2Data( + oauth2Data = boost::make_shared( ONEDRIVE_AUTH_URL, ONEDRIVE_TOKEN_URL, ONEDRIVE_SCOPE, ONEDRIVE_REDIRECT_URI, -- -2.31.1 +2.33.1 diff --git a/0001-annocheck-warning-about-missing-.note.gnu.property-s.patch b/0001-annocheck-warning-about-missing-.note.gnu.property-s.patch deleted file mode 100644 index 26a070d..0000000 --- a/0001-annocheck-warning-about-missing-.note.gnu.property-s.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 5db8b1c97bcbc80d2ed904ab40cafe1267a9848c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 15 Dec 2021 12:46:24 +0000 -Subject: [PATCH] annocheck warning about missing .note.gnu.property section - -copy and paste recommendation from: -https://sourceware.org/annobin/annobin.html/Test-cf-protection.html - -and adapt like: -https://github.com/openssl/openssl/commit/51994e505dbb1cd0dd76869ec962e2948b77b585 -where https://bugs.ruby-lang.org/attachments/8962 is similar - -Intel docs have "The ENDBR32 and ENDBR64 (collectively ENDBRANCH) are -two new instructions that are used to mark valid indirect CALL/JMP -target locations in the program." - -Change-Id: Ie867c263a888763db4478720ba189c9ec6cc974d ---- - .../source/cpp_uno/gcc3_linux_intel/call.s | 16 ++++++++++++++++ - .../source/cpp_uno/gcc3_linux_x86-64/call.s | 19 +++++++++++++++++++ - config_host.mk.in | 1 + - configure.ac | 14 ++++++++++++++ - solenv/gbuild/platform/com_GCC_class.mk | 1 + - 5 files changed, 51 insertions(+) - -diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/call.s b/bridges/source/cpp_uno/gcc3_linux_intel/call.s -index 6be583247733..0a5870defcf3 100644 ---- a/bridges/source/cpp_uno/gcc3_linux_intel/call.s -+++ b/bridges/source/cpp_uno/gcc3_linux_intel/call.s -@@ -290,3 +290,19 @@ privateSnippetExecutorClass: - .align 4 - .LEFDEc: - .section .note.GNU-stack,"",@progbits -+ .section .note.gnu.property,"a" -+ .p2align 2 -+ .long 1f - 0f -+ .long 4f - 1f -+ .long 5 -+0: -+ .string "GNU" -+1: -+ .p2align 2 -+ .long 0xc0000002 -+ .long 3f - 2f -+2: -+ .long 0x3 -+3: -+ .p2align 2 -+4: -diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s -index 447ac0cecfdd..2e9346dff8a0 100644 ---- a/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s -+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/call.s -@@ -22,6 +22,9 @@ - .type privateSnippetExecutor, @function - privateSnippetExecutor: - .LFB3: -+#if defined(END_BRANCH_INS_SUPPORT) -+ endbr64 -+#endif - pushq %rbp - .LCFI0: - movq %rsp, %rbp -@@ -115,3 +118,19 @@ privateSnippetExecutor: - .align 8 - .LEFDE1: - .section .note.GNU-stack,"",@progbits -+ .section .note.gnu.property,"a" -+ .p2align 3 -+ .long 1f - 0f -+ .long 4f - 1f -+ .long 5 -+0: -+ .string "GNU" -+1: -+ .p2align 3 -+ .long 0xc0000002 -+ .long 3f - 2f -+2: -+ .long 0x3 -+3: -+ .p2align 3 -+4: -diff --git a/config_host.mk.in b/config_host.mk.in -index 0fe4fd84cd41..c78eabd54d09 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -262,6 +262,7 @@ export GTK4_CFLAGS=$(gb_SPACE)@GTK4_CFLAGS@ - export GTK4_LIBS=$(gb_SPACE)@GTK4_LIBS@ - export USING_X11=@USING_X11@ - export HAMCREST_JAR=@HAMCREST_JAR@ -+export HAVE_ASM_END_BRANCH_INS_SUPPORT=@HAVE_ASM_END_BRANCH_INS_SUPPORT@ - export HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED=@HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED@ - export HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW=@HAVE_BROKEN_GCC_WSTRINGOP_OVERFLOW@ - export HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR=@HAVE_CLANG_DEBUG_INFO_KIND_CONSTRUCTOR@ -diff --git a/configure.ac b/configure.ac -index 06d7901c7c79..0400bd390e8c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7927,6 +7927,20 @@ _ACEOF - - CPPFLAGS="$save_CPPFLAGS" - -+ AC_MSG_CHECKING([if CET endbranch is recognized]) -+cat > endbr.s <<_ACEOF -+endbr32 -+_ACEOF -+ HAVE_ASM_END_BRANCH_INS_SUPPORT= -+ if $CXX -c endbr.s -o endbr.o >/dev/null 2>&5; then -+ AC_MSG_RESULT([yes]) -+ HAVE_ASM_END_BRANCH_INS_SUPPORT=TRUE -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ rm -f endbr.s endbr.o -+ AC_SUBST(HAVE_ASM_END_BRANCH_INS_SUPPORT) -+ - AC_LANG_POP([C++]) - fi - -diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk -index c29e2a979fd9..e2056abf9682 100644 ---- a/solenv/gbuild/platform/com_GCC_class.mk -+++ b/solenv/gbuild/platform/com_GCC_class.mk -@@ -44,6 +44,7 @@ $(call gb_Helper_abbreviate_dirs,\ - -x assembler-with-cpp \ - $(gb_LTOFLAGS) \ - $(gb_AFLAGS) \ -+ $(if $(HAVE_ASM_END_BRANCH_INS_SUPPORT),-DEND_BRANCH_INS_SUPPORT) \ - -c $(3) \ - -o $(1)) \ - $(INCLUDE) && \ --- -2.33.1 - diff --git a/0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch b/0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch deleted file mode 100644 index 9d4ed5c..0000000 --- a/0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 748a9fd3a8e90e52a126190dbe0d97da6e0941ff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 11 Aug 2021 20:55:14 +0100 -Subject: [PATCH] make --with-idlc-cpp=cpp work for gcc cpp as a ucpp - replacement - -e.g. the example of -https://bugs.launchpad.net/ubuntu/+source/libreoffice/+bug/1524638 -has the same output .urd using cpp with these flags as ucpp created - -Change-Id: Iadfd2deba7d365c66c3260fd6736c031987e107c ---- - config_host.mk.in | 1 + - configure.ac | 14 ++++++++++++++ - idlc/Executable_idlc.mk | 8 ++++++++ - idlc/source/idlccompile.cxx | 8 ++++++++ - 4 files changed, 31 insertions(+) - -diff --git a/config_host.mk.in b/config_host.mk.in -index 58ca1d1c14fb..6810660067b0 100644 ---- a/config_host.mk.in -+++ b/config_host.mk.in -@@ -635,6 +635,7 @@ export SYSTEM_RHINO=@SYSTEM_RHINO@ - export SYSTEM_SERF=@SYSTEM_SERF@ - export SYSTEM_STAROFFICE=@SYSTEM_STAROFFICE@ - export SYSTEM_UCPP=@SYSTEM_UCPP@ -+export SYSTEM_UCPP_IS_GCC=@SYSTEM_UCPP_IS_GCC@ - export SYSTEM_VISIO=@SYSTEM_VISIO@ - export SYSTEM_WPD=@SYSTEM_WPD@ - export SYSTEM_WPG=@SYSTEM_WPG@ -diff --git a/configure.ac b/configure.ac -index 3d2bf7e24555..ac226fd46ace 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8807,9 +8807,22 @@ dnl =================================================================== - dnl Check for C preprocessor to use - dnl =================================================================== - AC_MSG_CHECKING([which C preprocessor to use in idlc]) -+SYSTEM_UCPP_IS_GCC= - if test -n "$with_idlc_cpp"; then - AC_MSG_RESULT([$with_idlc_cpp]) - AC_PATH_PROG(SYSTEM_UCPP, $with_idlc_cpp) -+ AC_MSG_CHECKING([if $with_idlc_cpp is GCC CPP]) -+ # ucpp will accept -v (to output version), warn about the others as unknown -+ # and return 1 (due to -v) -+ # gcc will accept -v (as verbose), --version (to output version) and -nostdinc -+ # and return 0 (due to --version ) if all options are supported -+ $SYSTEM_UCPP -v --version -nostdinc >/dev/null 2>/dev/null -+ if test $? -eq 0; then -+ SYSTEM_UCPP_IS_GCC=TRUE -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi - else - AC_MSG_RESULT([ucpp]) - AC_MSG_CHECKING([which ucpp tp use]) -@@ -8822,6 +8835,7 @@ else - fi - fi - AC_SUBST(SYSTEM_UCPP) -+AC_SUBST(SYSTEM_UCPP_IS_GCC) - - dnl =================================================================== - dnl Check for epm (not needed for Windows) -diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk -index e194e9049c77..f2f79dcb8911 100644 ---- a/idlc/Executable_idlc.mk -+++ b/idlc/Executable_idlc.mk -@@ -35,10 +35,18 @@ $(eval $(call gb_Executable_add_scanners,idlc,\ - )) - - ifneq (,$(SYSTEM_UCPP)) -+ - $(eval $(call gb_Executable_add_defs,idlc,\ - -DSYSTEM_UCPP \ - -DUCPP=\"file://$(SYSTEM_UCPP)\" \ - )) -+ -+ifneq ($(SYSTEM_UCPP_IS_GCC),) -+$(eval $(call gb_Executable_add_defs,idlc,\ -+ -DSYSTEM_UCPP_IS_GCC \ -+)) -+endif -+ - endif - - $(eval $(call gb_Executable_add_exception_objects,idlc,\ -diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx -index bf3325d6821a..1902d63e0cad 100644 ---- a/idlc/source/idlccompile.cxx -+++ b/idlc/source/idlccompile.cxx -@@ -237,7 +237,15 @@ sal_Int32 compileFile(const OString * pathname) - ::std::vector< OUString> lCppArgs; - lCppArgs.emplace_back("-DIDL"); - lCppArgs.emplace_back("-C"); -+#ifdef SYSTEM_UCPP_IS_GCC -+ // -nostdinc Do not search the standard system directories for header files -+ lCppArgs.emplace_back("-nostdinc"); -+ // with gcc cpp, even when not explicitly including anything, /usr/include/stdc-predef.h -+ // gets inserted without -nostdinc -+#else -+ // -zI Do not use the standard (compile-time) include path. - lCppArgs.emplace_back("-zI"); -+#endif - - Options* pOptions = idlc()->getOptions(); - --- -2.31.1 - diff --git a/libreoffice.spec b/libreoffice.spec index a15a799..b8082cd 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,5 +1,5 @@ # download path contains version without the last (fourth) digit -%global libo_version 7.2.5 +%global libo_version 7.3.0 # Should contain .alphaX / .betaX, if this is pre-release (actually # pre-RC) version. The pre-release string is part of tarball file names, # so we need a way to define it easily at one place. @@ -56,8 +56,8 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 -Version: %{libo_version}.2 -Release: 5%{?libo_prerelease}%{?dist} +Version: %{libo_version}.3 +Release: 1%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -255,10 +255,7 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch # rhbz#1736810 disable opencl by default again Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported -Patch3: 0001-make-with-idlc-cpp-cpp-work-for-gcc-cpp-as-a-ucpp-re.patch -Patch4: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch -Patch5: 0001-annocheck-warning-about-missing-.note.gnu.property-s.patch -Patch6: 0001-Missing-include.patch +Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2263,6 +2260,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Wed Feb 02 2022 Caolán McNamara - 1:7.3.0.3-1 +- 7.3.0 release + * Tue Feb 01 2022 Caolán McNamara - 1:7.2.5.2-5 - Related: rhbz#2029810 set NoDisplay=true for .desktop on s390x/aarch64 - Related: rhbz#2029810 don't Require any vclplug for s390x/aarch64 diff --git a/sources b/sources index 8466c58..b047a76 100644 --- a/sources +++ b/sources @@ -6,9 +6,9 @@ SHA512 (a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip) = 2d3835f7ac356805025 SHA512 (f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf) = 6a6d131dad5191614950a49323ae6d9385afe331983c1c85fde82ce6ee816051d95dde9ef90658b8f0a8a0a21754e72ff724bf41f6b96c046b7b4c2660f7095b SHA512 (libreoffice-multiliblauncher.sh) = db532afdf5000bc66f9e02c7d0ab586468466f63f8f0bdb204832581e8277c5c59f688fa096548d642411cb8c46e8de4a744676b4e624c075262cfd6945138cd SHA512 (dtoa-20180411.tgz) = 722aa814c33a34bfffe6c0201b0035cc3b65854a0ba9ae2f51620a89d68019353e2c306651b35bca337186b22b2e9865ef3c5e3df8e9328006f882e4577f8c85 -SHA512 (libreoffice-7.2.5.2.tar.xz) = a84682597e10fabb8c1605b785510fa5fe861f3056f61bd01513e1de6ebdb8a343d254af063cd977e4379348ad28d8a457989b3d42014f1c18d5d85626f6dfe8 -SHA512 (libreoffice-7.2.5.2.tar.xz.asc) = 22a2e1b5c459dd848c1287eb3ae7bcf727f50ddf7c5baf59096628ca0c3a5881a4eb1e62a45c7dc97460da8c3d0e634a2e6f81742bdde75a491fec276cf38cc7 -SHA512 (libreoffice-help-7.2.5.2.tar.xz) = 70ffcb1a96637dabd9a658151d2b88a92dd8a89cd396609339ec5470b93fbc2ae589a434b4f09d22fc8ad515369a646dd8040c33e6a91977dd7158f57cd48e00 -SHA512 (libreoffice-help-7.2.5.2.tar.xz.asc) = 47625fa54daf039a485c1416f1db5972f8c5c4c416122794d869508d1590e2b1740350ac04e1c4e4e67edba24eed765dec86bd8665c3ca744c0dd284b2376b88 -SHA512 (libreoffice-translations-7.2.5.2.tar.xz) = d0d2eddef7873b41c86e4c219416f5ceabf4d171b1bc8383b01025623710df86fcb6d30904b06d94c4c2d64306b79a96b4ca3a949c8e59d6c2c24cddc1ae1301 -SHA512 (libreoffice-translations-7.2.5.2.tar.xz.asc) = b50c5b95b61c6c0d159b006846e9b86e35b261c523cbb45d05f72b693506d548f2fab8a021973b30aa9307e92be4f20de92cdf3caad7f495c2c04ba6a726c6ff +SHA512 (libreoffice-7.3.0.3.tar.xz) = 408b98184afc0721f922768f60e877fd756b656b4fd30cf6ad629bd32ba323fb1f4b052c8427b11395253b4ed67f9a1fd20ef3f7fd5945abc0f8cfb1f40c5d47 +SHA512 (libreoffice-7.3.0.3.tar.xz.asc) = 894ed8f6153fd70194f6f299b5f8406ea1245a54930ec154c6e04763eb2aec7fa41bfd23b0d378df68391659b436f1225fc00ddfcc3719c456d47516fffe2716 +SHA512 (libreoffice-help-7.3.0.3.tar.xz) = 6d6fb4968ce7b40291c9426183d2d031761e5d3421d66adda0b0e1cf57c1aeb68252cec561119935c68b6239add8ba7ee686ce6365ce84cc2ce4f85346fe2aec +SHA512 (libreoffice-help-7.3.0.3.tar.xz.asc) = a4b0d295cacde6eb57dffd35ffbbb462c4e0e9ef4459f59f8585cfd7a1d8b56a3cadbc40f1709351e0d1a7143e03ad908c8a6ef7c26a8c768584a04e0efa86be +SHA512 (libreoffice-translations-7.3.0.3.tar.xz) = 0a7b28ec242159dc6d4fc9c58a966b005dc7b29b6e43e6debf79bd3ab124931f1f9ab203a57f62cfbde6f0a4be43efa62d8b32eb43f317b2b743129f8deaecfb +SHA512 (libreoffice-translations-7.3.0.3.tar.xz.asc) = 7743eb40163dd561c3dfee7b07fdebd710310a50832529122e8ba13afa310e787b5bac70533a4ad82a7c26c7e40244f82d690080b41cc444eb58020e9d747748