diff --git a/0001-Missing-includes-for-libstdc-12.patch b/0001-Missing-includes-for-libstdc-12.patch new file mode 100644 index 0000000..aba7d8a --- /dev/null +++ b/0001-Missing-includes-for-libstdc-12.patch @@ -0,0 +1,354 @@ +From 83af781196f819f15c519c5e0c60758323e0e633 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) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128447 +Reviewed-by: Michael Stahl +--- + 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.35.1 + diff --git a/libreoffice.changes b/libreoffice.changes index 88cd50b..1bf09cd 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 5 15:29:22 UTC 2022 - Michael Gorse + +- Add 0001-Missing-includes-for-libstdc-12.patch: fix the build + with gcc 12. + ------------------------------------------------------------------- Fri Jan 14 13:09:06 UTC 2022 - Andras Timar diff --git a/libreoffice.spec b/libreoffice.spec index fbb34c8..3bfbc9d 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -111,6 +111,7 @@ Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch # LO-L3: bsc#1183308 Simple, seven page slide deck of 3.7MB takes looong to open, start presentation mode, or move back to slide 1 Patch11: bsc1183308.patch +Patch12: 0001-Missing-includes-for-libstdc-12.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -1016,6 +1017,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %if 0%{?suse_version} < 1500 %patch10 -p1 %patch11 -p1 +%endif +%patch12 -p1 +%if 0%{?suse_version} < 1500 %patch101 -p1 %endif %patch990 -p1