diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.recipe b/app-office/libreoffice/libreoffice-6.4.7.2.recipe index d7140b1cb..0b3afc835 100644 --- a/app-office/libreoffice/libreoffice-6.4.7.2.recipe +++ b/app-office/libreoffice/libreoffice-6.4.7.2.recipe @@ -17,7 +17,7 @@ and Open Source office suite on the market: HOMEPAGE="https://www.libreoffice.org/" COPYRIGHT="2000-2020 LibreOffice contributors" LICENSE="MPL v2.0" -REVISION="14" +REVISION="15" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_DIR="core-libreoffice-$portVersion" @@ -34,8 +34,7 @@ CHECKSUM_SHA256_3="5314962ca770369398599e175dc2c35c685d3fc968c9894390490c737036e SOURCE_DIR_3="LibreOfficeLauncher-$srcGitRevision3" SOURCE_FILENAME_3="LibreOfficeLauncher-$srcGitRevision3.tar.gz" -PATCHES="libreoffice-${portVersion}.patchset - MissingHeader.patch" +PATCHES="libreoffice-${portVersion}.patchset" ADDITIONAL_FILES=" libreoffice.iom @@ -84,8 +83,8 @@ REQUIRES=" lib:libharfbuzz$secondaryArchSuffix lib:libhunspell_1.7$secondaryArchSuffix lib:libhyphen$secondaryArchSuffix - lib:libicui18n$secondaryArchSuffix >= 66 - lib:libicuuc$secondaryArchSuffix >= 66 + lib:libicui18n$secondaryArchSuffix + lib:libicuuc$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:libKF5ConfigCore$secondaryArchSuffix @@ -114,7 +113,6 @@ REQUIRES=" lib:libplc4$secondaryArchSuffix lib:libplds4$secondaryArchSuffix lib:libpng16$secondaryArchSuffix - lib:libpoppler$secondaryArchSuffix lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Network$secondaryArchSuffix @@ -163,7 +161,7 @@ done BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - icu66${secondaryArchSuffix}_devel + icu74${secondaryArchSuffix}_devel unixodbc${secondaryArchSuffix}_devel devel:glm devel:libabw_0.1$secondaryArchSuffix @@ -191,7 +189,7 @@ BUILD_REQUIRES=" devel:libharfbuzz_icu$secondaryArchSuffix devel:libhunspell_1.7$secondaryArchSuffix devel:libhyphen$secondaryArchSuffix -# devel:libicuuc$secondaryArchSuffix >= 66 + devel:libicuuc$secondaryArchSuffix >= 74 devel:libjpeg$secondaryArchSuffix devel:libKF5ConfigCore$secondaryArchSuffix devel:libKF5CoreAddons$secondaryArchSuffix @@ -213,7 +211,6 @@ BUILD_REQUIRES=" devel:libnumbertext_1.0$secondaryArchSuffix devel:libodfgen_0.1$secondaryArchSuffix devel:libpagemaker_0.0$secondaryArchSuffix - devel:libpoppler$secondaryArchSuffix # devel:libqrcodegen$secondaryArchSuffix devel:libQt5Core$secondaryArchSuffix devel:libqxp_0.0$secondaryArchSuffix @@ -257,6 +254,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix cmd:ucpp cmd:which + cmd:xsltproc cmd:xz cmd:zip " @@ -294,6 +292,8 @@ BUILD() \ --disable-ccache \ --disable-firebird-sdbc \ + --disable-pdfimport \ + --disable-poppler \ --disable-postgresql-sdbc \ --disable-dependency-tracking \ --disable-qrcodegen \ diff --git a/app-office/libreoffice/patches/MissingHeader.patch b/app-office/libreoffice/patches/MissingHeader.patch deleted file mode 100644 index 66cab16d1..000000000 --- a/app-office/libreoffice/patches/MissingHeader.patch +++ /dev/null @@ -1,324 +0,0 @@ -From 43542cc07ee110abe25a1e176238fd6d921d593b Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Mon, 9 Aug 2021 23:07:12 +0200 -Subject: Missing include - -(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 ---- - chart2/source/view/inc/PlottingPositionHelper.hxx | 4 ++++ - compilerplugins/clang/test/unusedfields.cxx | 1 + - connectivity/source/inc/java/tools.hxx | 4 ++++ - filter/source/xsltdialog/xmlfilterjar.hxx | 1 + - forms/source/component/EventThread.hxx | 1 + - forms/source/xforms/propertysetbase.hxx | 1 + - fpicker/source/office/contentenumeration.hxx | 4 ++++ - 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 + - .../unodialogs/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 + - 21 files changed, 55 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/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/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 9d0c7efe470d..1ac72a46f0c4 100644 ---- a/xmlsecurity/source/helper/ooxmlsecparser.hxx -+++ b/xmlsecurity/source/helper/ooxmlsecparser.hxx -@@ -16,6 +16,7 @@ - - #include - -+#include - #include - #include - -diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx -index fa2d4a8bc4ab..6279d65439e1 100644 ---- a/xmlsecurity/source/helper/xsecparser.hxx -+++ b/xmlsecurity/source/helper/xsecparser.hxx -@@ -26,6 +26,7 @@ - - #include - -+#include - #include - #include - --- -cgit v1.2.1 - diff --git a/app-office/libreoffice/patches/libreoffice-6.4.7.2.patchset b/app-office/libreoffice/patches/libreoffice-6.4.7.2.patchset index 8048ad846..5efed1aad 100644 --- a/app-office/libreoffice/patches/libreoffice-6.4.7.2.patchset +++ b/app-office/libreoffice/patches/libreoffice-6.4.7.2.patchset @@ -1,4 +1,4 @@ -From 290e739334a9a991c8bb32f65088ee9e545fb81f Mon Sep 17 00:00:00 2001 +From 7587830c6b8a1cc44fa09b6899501e922c54eda2 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 14:52:59 +0300 Subject: Make Elementary the default on Haiku @@ -19,10 +19,10 @@ index 225414f..a971e11 100644 OUString r; if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") || -- -2.30.2 +2.45.2 -From 8c7b1f9baedcabe4fec2c3b03e2e7202988e9187 Mon Sep 17 00:00:00 2001 +From 2e2ef3ed1598099a4ccffa6e1a850b9aba5e5673 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:01:09 +0300 Subject: Show used vcl backend on Haiku @@ -42,10 +42,10 @@ index c4c3be9..119380d 100644 aDetails.append( GetToolkitName() ); aDetails.append( "; " ); -- -2.30.2 +2.45.2 -From a31f622207a766dffaeb0954c27dfc24492ca2e8 Mon Sep 17 00:00:00 2001 +From 00f5a9369564bf999b8a0d934812b7d414f2debe Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:01:34 +0300 Subject: Identify Haiku in about window @@ -65,10 +65,10 @@ index b661163..329265a 100644 return aKernelVer; } -- -2.30.2 +2.45.2 -From c850038f19ec7c73561a402a8ab7a75368cf9632 Mon Sep 17 00:00:00 2001 +From d50ee3c5fe39633f281fbd86a936e8cbbe61f6a5 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:02:04 +0300 Subject: Workaround a crash on quit. See Haiku #13159 @@ -102,10 +102,10 @@ index 643c42a..d4b47cb 100644 return ret; } -- -2.30.2 +2.45.2 -From 62d5daae50a3f32af7f206c8bd63b7c95e1aedb5 Mon Sep 17 00:00:00 2001 +From 8fd85a3d04f149fe68539d1e9f464015779f2a8f Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 15:04:53 +0300 Subject: Implement ShellExec on Haiku @@ -126,10 +126,10 @@ index 3daea4a..d114d79 100644 // Just use xdg-open on non-Mac aBuffer.append("/usr/bin/xdg-open"); -- -2.30.2 +2.45.2 -From 8984667516a29699a407c6afecab4b1f25434743 Mon Sep 17 00:00:00 2001 +From 21f60bf58279eb4c36d11ba75edf11a6e41e37f1 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 20 Jul 2019 01:18:50 +0300 Subject: Comment out linking with pthread @@ -153,10 +153,10 @@ index 8854aab..f0489a8 100644 gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -- -2.30.2 +2.45.2 -From f742f7ff8840d773ab9690659ce54f154323d32a Mon Sep 17 00:00:00 2001 +From 28f9a042e4941c2271ea538c619606d93f0aa724 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 11 Aug 2019 11:46:49 +1000 Subject: Workaround for ambiguous methods @@ -198,10 +198,10 @@ index 8636d6b..0defdfc 100644 pPatternAttr->GetItemSet().Put( aItem ); SetPatternArea( nTempStartRow, nTempEndRow, std::move(pPatternAttr), true ); -- -2.30.2 +2.45.2 -From e6db92c69eab52016cd0cffc1114f376ff37f11a Mon Sep 17 00:00:00 2001 +From 869692b2e03519c99448035b525057f47ef59aa6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 11 Aug 2019 11:47:40 +1000 Subject: Add XP_HAIKU defs for xmlsec @@ -242,10 +242,10 @@ index bd2cb6a..9d6a90c 100644 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\ $(call gb_UnpackedTarball_get_dir,xmlsec)/src/nss/.libs/libxmlsec1-nss.a \ -- -2.30.2 +2.45.2 -From ecfc80bc3d39aa2daf09e871004165258fc988fc Mon Sep 17 00:00:00 2001 +From 5af9fb5ec1b7cc152b19841ef8a1e033e68d0c9d Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 15:08:51 +0300 Subject: Cast to boolean @@ -344,10 +344,10 @@ index 8a57f55..4835901 100644 jcopy_markers_execute(&aSourceInfo, &aDestinationInfo, aCopyOption); jtransform_execute_transformation(&aSourceInfo, &aDestinationInfo, aSourceCoefArrays, &aTransformOption); -- -2.30.2 +2.45.2 -From 2d367578e0b0c75cf15d460c1985145111be4a64 Mon Sep 17 00:00:00 2001 +From 48559fdc60960ec3bba9ac8fce42a58d63587fee Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 15 Feb 2020 17:45:08 +0300 Subject: Revert fstack-protector check removal in @@ -429,10 +429,10 @@ index 712a61d..2c3d5f1 100644 ifneq ($(ENABLE_PCH),) ifeq ($(COM_IS_CLANG),TRUE) -- -2.30.2 +2.45.2 -From 0582c629242e83a5221f1563233ccf133decdc5e Mon Sep 17 00:00:00 2001 +From 5a1d9d852ac3e74b05459dee1c2480de63e2b629 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Tue, 9 Feb 2021 12:15:02 +0300 Subject: Add CSTDDEF include to O3TL @@ -451,10 +451,10 @@ index e822fde..33a1487 100644 namespace o3tl { -- -2.30.2 +2.45.2 -From 6920cd6bd3b4ae98c8206d4dd60b589a12366a65 Mon Sep 17 00:00:00 2001 +From 305047a957702dcfa5f98b1138d87546797c99db Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Tue, 9 Feb 2021 12:26:19 +0300 Subject: Fix Bison 3.8 issue with SQLbison.y @@ -482,10 +482,10 @@ index c9d423e..b444277 100644 extern connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER; -- -2.30.2 +2.45.2 -From fc7eebf5bee65cf4c90a7d8c5e5c5fb264d404bf Mon Sep 17 00:00:00 2001 +From 7cec1b191885ae68de63726c174f0005e8f3bd65 Mon Sep 17 00:00:00 2001 From: Ken Mays Date: Tue, 9 Feb 2021 13:15:24 +0300 Subject: Fix GCC11/12 issue with SAL_STREAM @@ -508,10 +508,10 @@ index 00d533a..f85c7d8 100644 (::std::ostringstream() << stream).str() #else -- -2.30.2 +2.45.2 -From 8cb4ca90192892f395846ab701373d1851074ee1 Mon Sep 17 00:00:00 2001 +From 8a13e40a716fa61785e03e0908b91b530d0a4c0a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 7 May 2022 18:05:47 +1000 Subject: Fix build for bison 3.8 @@ -531,10 +531,10 @@ index b444277..ff47cf3 100644 #define SQL_NEW_RULE newNode("", SQLNodeType::Rule, yyr1[yyn]) #define SQL_NEW_LISTRULE newNode("", SQLNodeType::ListRule, yyr1[yyn]) -- -2.30.2 +2.45.2 -From 54c29adb39c7d88d90cc56e72b2b225cb35ed7e0 Mon Sep 17 00:00:00 2001 +From dd7c27d7dea142c995def2869348a72813bbf832 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 7 May 2022 18:06:57 +1000 Subject: Add patches for liborcus @@ -603,10 +603,10 @@ index 0000000..9796457 + using namespace std; + -- -2.30.2 +2.45.2 -From 754d120d653f7e232db9ca805a22f9c74feb885b Mon Sep 17 00:00:00 2001 +From 8df64d6d42a1301288cd46dcef35a81872a6de7a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 00:06:38 +1000 Subject: Use system font @@ -658,10 +658,10 @@ index a621f6c..33faa52 100644 maHelpFont = aStdFont; maMenuFont = aStdFont; -- -2.30.2 +2.45.2 -From 92799c2eebf6257a54ac028f1c51242da430ba40 Mon Sep 17 00:00:00 2001 +From 6c30565c45e97c999101a5b91fb4307893c58cb1 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 00:07:18 +1000 Subject: Use Noto Sans as default font @@ -684,10 +684,10 @@ index bd7f7e2..72f16d5 100644 const OUString aLanguage( aLanguageTag.getLanguage()); -- -2.30.2 +2.45.2 -From a06b3d895eddbb7311b36b074b33a222da7c34a9 Mon Sep 17 00:00:00 2001 +From 22af1d214041265cf90ffa6db018d31a3510caa0 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 00:07:52 +1000 Subject: Style tune @@ -709,10 +709,10 @@ index ff85377..219fced 100644 boundingRect = contentRect; retVal = true; -- -2.30.2 +2.45.2 -From 2b239d32bb63c792daeae2456ef7d1bb1810b8ec Mon Sep 17 00:00:00 2001 +From 81ffee5069216e319efa2c7f65eab6bc7d8d81c2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 00:08:48 +1000 Subject: Use dpi=100 for qt5 backend @@ -735,10 +735,10 @@ index 2aa7094..19b9cc4 100644 return; -- -2.30.2 +2.45.2 -From deff685effb85b73519b5d2b1b78df9f8c41d8a9 Mon Sep 17 00:00:00 2001 +From 7da0265d6d2a76e08653a0c20abb6d9ae0100a07 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 8 May 2022 00:10:48 +1000 Subject: Fix KF5 detection @@ -758,5 +758,653 @@ index 352aa6a..bebb38d 100644 kf5_libdirs="$qt5_libdir $kf5_libdirs" -- -2.30.2 +2.45.2 + + +From a8cb65c55801690f6591ba5d75454a814ed9a501 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 28 Aug 2024 11:15:23 +1000 +Subject: Fix build + + +diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx +index 42980ee..61f10f9 100644 +--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx ++++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx +@@ -320,7 +320,7 @@ namespace XSLT + } + else + { +- xmlErrorPtr lastErr = xmlGetLastError(); ++ const xmlError* lastErr = xmlGetLastError(); + OUString msg; + if (lastErr) + msg = OStringToOUString(lastErr->message, RTL_TEXTENCODING_UTF8); +diff --git a/helpcompiler/source/HelpLinker.cxx b/helpcompiler/source/HelpLinker.cxx +index 4444490..c289339 100644 +--- a/helpcompiler/source/HelpLinker.cxx ++++ b/helpcompiler/source/HelpLinker.cxx +@@ -807,7 +807,11 @@ static const HelpProcessingException* GpXMLParsingException = nullptr; + + extern "C" { + ++#if LIBXML_VERSION >= 21200 ++static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, const xmlError* error) ++#else + static void StructuredXMLErrorFunction(SAL_UNUSED_PARAMETER void *, xmlErrorPtr error) ++#endif + { + std::string aErrorMsg = error->message; + std::string aXMLParsingFile; +diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt +index 9521c83..e0870bc 100644 +--- a/i18npool/source/breakiterator/data/line.txt ++++ b/i18npool/source/breakiterator/data/line.txt +@@ -14,7 +14,6 @@ + # + + !!chain; +-!!LBCMNoChain; + + + !!lookAheadHardBreak; +@@ -206,13 +205,13 @@ $CR $LF {100}; + # + $LB4NonBreaks? $LB4Breaks {100}; # LB 5 do not break before hard breaks. + $CAN_CM $CM* $LB4Breaks {100}; +-$CM+ $LB4Breaks {100}; ++^$CM+ $LB4Breaks {100}; + + # LB 7 x SP + # x ZW + $LB4NonBreaks [$SP $ZW]; + $CAN_CM $CM* [$SP $ZW]; +-$CM+ [$SP $ZW]; ++^$CM+ [$SP $ZW]; + + # + # LB 8 Break after zero width space +@@ -226,14 +225,14 @@ $LB8NonBreaks = [[$LB4NonBreaks] - [$ZW]]; + # See definition of $CAN_CM. + + $CAN_CM $CM+; # Stick together any combining sequences that don't match other rules. +-$CM+; ++^$CM+; + + # + # LB 11 Do not break before or after WORD JOINER & related characters. + # + $CAN_CM $CM* $WJcm; + $LB8NonBreaks $WJcm; +-$CM+ $WJcm; ++^$CM+ $WJcm; + + $WJcm [^$CAN_CM]; + $WJcm $CAN_CM $CM*; +@@ -243,7 +242,7 @@ $WJcm $CAN_CM $CM*; + # + # (!SP) x GL + [$LB8NonBreaks-$SP] $CM* $GLcm; +-$CM+ $GLcm; ++^$CM+ $GLcm; + + # GL x + $GLcm ($LB8Breaks | $SP); +@@ -260,19 +259,19 @@ $GLcm [$LB8NonBreaks-$SP] $CM*; # Don't let a combining mark go onto $CR, $B + # + $LB8NonBreaks $CL; + $CAN_CM $CM* $CL; +-$CM+ $CL; # by rule 10, stand-alone CM behaves as AL ++^$CM+ $CL; # by rule 10, stand-alone CM behaves as AL + + $LB8NonBreaks $EX; + $CAN_CM $CM* $EX; +-$CM+ $EX; # by rule 10, stand-alone CM behaves as AL ++^$CM+ $EX; # by rule 10, stand-alone CM behaves as AL + + $LB8NonBreaks $IS; + $CAN_CM $CM* $IS; +-$CM+ $IS; # by rule 10, stand-alone CM behaves as AL ++^$CM+ $IS; # by rule 10, stand-alone CM behaves as AL + + $LB8NonBreaks $SY; + $CAN_CM $CM* $SY; +-$CM+ $SY; # by rule 10, stand-alone CM behaves as AL ++^$CM+ $SY; # by rule 10, stand-alone CM behaves as AL + + + # +@@ -302,7 +301,7 @@ $LB18Breaks = [$LB8Breaks $SP]; + # LB 19 + # x QU + $LB18NonBreaks $CM* $QUcm; +-$CM+ $QUcm; ++^$CM+ $QUcm; + + # QU x + $QUcm .?; +@@ -331,7 +330,7 @@ $HLcm ($HYcm | $BAcm) [^$CB]?; + + # LB 22 + ($ALcm | $HLcm) $INcm; +-$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL ++^$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL + $IDcm $INcm; + $INcm $INcm; + $NUcm $INcm; +@@ -341,7 +340,7 @@ $NUcm $INcm; + $IDcm $POcm; + $ALcm $NUcm; # includes $LB19 + $HLcm $NUcm; +-$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL ++^$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL + $NUcm $ALcm; + $NUcm $HLcm; + +@@ -373,7 +372,7 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); + # LB 28 Do not break between alphabetics + # + ($ALcm | $HLcm) ($ALcm | $HLcm); +-$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL ++^$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL + + # LB 29 + $IScm ($ALcm | $NUcm); +@@ -383,7 +382,7 @@ $IScm ($ALcm | $NUcm); + # and opening or closing punctuation + # + ($ALcm | $HLcm | $NUcm) $OPcm; +-$CM+ $OPcm; ++^$CM+ $OPcm; + $CLcm ($ALcm | $HLcm | $NUcm); + + # +@@ -393,32 +392,32 @@ $CLcm ($ALcm | $HLcm | $NUcm); + + !!reverse; + +-$CM+ $ALPlus; +-$CM+ $BA; +-$CM+ $BB; +-$CM+ $B2; +-$CM+ $CL; +-$CM+ $EX; +-$CM+ $GL; +-$CM+ $HL; +-$CM+ $HY; +-$CM+ $H2; +-$CM+ $H3; +-$CM+ $ID; +-$CM+ $IN; +-$CM+ $IS; +-$CM+ $JL; +-$CM+ $JV; +-$CM+ $JT; +-$CM+ $NS; +-$CM+ $NU; +-$CM+ $OP; +-$CM+ $PO; +-$CM+ $PR; +-$CM+ $QU; +-$CM+ $SY; +-$CM+ $WJ; +-$CM+; ++^$CM+ $ALPlus; ++^$CM+ $BA; ++^$CM+ $BB; ++^$CM+ $B2; ++^$CM+ $CL; ++^$CM+ $EX; ++^$CM+ $GL; ++^$CM+ $HL; ++^$CM+ $HY; ++^$CM+ $H2; ++^$CM+ $H3; ++^$CM+ $ID; ++^$CM+ $IN; ++^$CM+ $IS; ++^$CM+ $JL; ++^$CM+ $JV; ++^$CM+ $JT; ++^$CM+ $NS; ++^$CM+ $NU; ++^$CM+ $OP; ++^$CM+ $PO; ++^$CM+ $PR; ++^$CM+ $QU; ++^$CM+ $SY; ++^$CM+ $WJ; ++^$CM+; + + + # +@@ -468,7 +467,7 @@ $LF $CR; + # X $CM needs to behave like X, where X is not $SP or controls. + # $CM not covered by the above needs to behave like $AL + # Stick together any combining sequences that don't match other rules. +-$CM+ $CAN_CM; ++^$CM+ $CAN_CM; + + + # LB 11 +@@ -606,8 +605,8 @@ $CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; + !!safe_reverse; + + # LB 7 +-$CM+ [^$CM $BK $CR $LF $NL $ZW $SP]; +-$CM+ $SP / .; ++^$CM+ [^$CM $BK $CR $LF $NL $ZW $SP]; ++^$CM+ $SP / .; + + # LB 9 + $SP+ $CM* $OP; +diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx +index f3dc6ed..1dacd88 100644 +--- a/i18npool/source/calendar/calendar_gregorian.cxx ++++ b/i18npool/source/calendar/calendar_gregorian.cxx +@@ -347,7 +347,7 @@ 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, true, nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; + status = U_ZERO_ERROR; + body->setTime( fR - (nZoneOffset + nDSTOffset), status ); +diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx +index 02bfb4c..8d963c5 100644 +--- a/include/cppuhelper/implbase.hxx ++++ b/include/cppuhelper/implbase.hxx +@@ -22,6 +22,7 @@ + + #include "sal/config.h" + ++#include + #include + #include + +diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx +index 2a06495..52eca6c 100644 +--- a/include/vcl/BitmapBuffer.hxx ++++ b/include/vcl/BitmapBuffer.hxx +@@ -20,6 +20,7 @@ + #ifndef INCLUDED_VCL_BITMAPBUFFER_HXX + #define INCLUDED_VCL_BITMAPBUFFER_HXX + ++#include + #include + #include + #include +diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx +index ad9ce09..850f7f8 100644 +--- a/io/source/acceptor/acc_pipe.cxx ++++ b/io/source/acceptor/acc_pipe.cxx +@@ -16,7 +16,7 @@ + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +- ++#include + #include + #include "acceptor.hxx" + #include +diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx +index a72179e..569ec1b 100644 +--- a/io/source/acceptor/acc_socket.cxx ++++ b/io/source/acceptor/acc_socket.cxx +@@ -16,6 +16,7 @@ + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ ++#include + + #include "acceptor.hxx" + +diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx +index c21a34d..cde9bcf 100644 +--- a/io/source/connector/connector.cxx ++++ b/io/source/connector/connector.cxx +@@ -16,7 +16,7 @@ + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +- ++#include + #include + #include + +diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx +index 8d66dea..f8c2c80 100644 +--- a/io/source/connector/ctr_pipe.cxx ++++ b/io/source/connector/ctr_pipe.cxx +@@ -16,7 +16,7 @@ + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +- ++#include + #include + + #include +diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx +index 9b35c16..3c30d73 100644 +--- a/sax/source/fastparser/fastparser.cxx ++++ b/sax/source/fastparser/fastparser.cxx +@@ -548,7 +548,7 @@ Event& Entity::getEvent( CallbackType aType ) + OUString lclGetErrorMessage( xmlParserCtxtPtr ctxt, const OUString& sSystemId, sal_Int32 nLine ) + { + const sal_Char* pMessage; +- xmlErrorPtr error = xmlCtxtGetLastError( ctxt ); ++ const xmlError* error = xmlCtxtGetLastError( ctxt ); + if( error && error->message ) + pMessage = error->message; + else +diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx +index d312d7a..10c84ca 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 ); +diff --git a/unotools/source/i18n/resmgr.cxx b/unotools/source/i18n/resmgr.cxx +index 786c83d..07e604b 100644 +--- a/unotools/source/i18n/resmgr.cxx ++++ b/unotools/source/i18n/resmgr.cxx +@@ -121,8 +121,13 @@ namespace Translate + if (aFind != aCache.end()) + return aFind->second; + boost::locale::generator gen; ++#if BOOST_VERSION < 108100 + gen.characters(boost::locale::char_facet); + gen.categories(boost::locale::message_facet | boost::locale::information_facet); ++#else ++ gen.characters(boost::locale::char_facet_t::char_f); ++ gen.categories(boost::locale::category_t::message | boost::locale::category_t::information); ++#endif + OUString uri("$BRAND_BASE_DIR/$BRAND_SHARE_RESOURCE_SUBDIR/"); + rtl::Bootstrap::expandMacros(uri); + OUString path; +diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx +index 5d3e6d8..7c173a5 100644 +--- a/unoxml/source/xpath/xpathapi.cxx ++++ b/unoxml/source/xpath/xpathapi.cxx +@@ -233,7 +233,7 @@ namespace XPath + return selectSingleNode(contextNode, expr); + } + +- static OUString make_error_message(xmlErrorPtr pError) ++ static OUString make_error_message(const xmlError* pError) + { + OUStringBuffer buf; + if (pError) { +@@ -279,7 +279,11 @@ namespace XPath + SAL_WARN("unoxml", "libxml2 error: " << str); + } + ++#if LIBXML_VERSION >= 21200 ++ static void structured_error_func(void *, const xmlError* error) ++#else + static void structured_error_func(void *, xmlErrorPtr error) ++#endif + { + SAL_WARN("unoxml", "libxml2 error: " << make_error_message(error)); + } +diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx +index 9610a73..94a60a6 100644 +--- a/vcl/unx/generic/gdi/cairotextrender.cxx ++++ b/vcl/unx/generic/gdi/cairotextrender.cxx +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + namespace { + +-- +2.45.2 + + +From 88e26cecf3709e140cbfdccb734aaf8ac1e7148e Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Mon, 9 Aug 2021 23:07:12 +0200 +Subject: Missing include + + +diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx +index 74fc37c..3343196 100644 +--- a/chart2/source/view/inc/PlottingPositionHelper.hxx ++++ b/chart2/source/view/inc/PlottingPositionHelper.hxx +@@ -19,6 +19,10 @@ + #ifndef INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTINGPOSITIONHELPER_HXX + #define INCLUDED_CHART2_SOURCE_VIEW_INC_PLOTTINGPOSITIONHELPER_HXX + ++#include ++ ++#include ++ + #include + + #include +diff --git a/compilerplugins/clang/test/unusedfields.cxx b/compilerplugins/clang/test/unusedfields.cxx +index 2ec4ab8..205e1a6 100644 +--- a/compilerplugins/clang/test/unusedfields.cxx ++++ b/compilerplugins/clang/test/unusedfields.cxx +@@ -11,6 +11,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 e3763cd..f8e6940 100644 +--- a/connectivity/source/inc/java/tools.hxx ++++ b/connectivity/source/inc/java/tools.hxx +@@ -20,6 +20,10 @@ + #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_TOOLS_HXX + #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_TOOLS_HXX + ++#include ++ ++#include ++ + #include + #include + +diff --git a/filter/source/xsltdialog/xmlfilterjar.hxx b/filter/source/xsltdialog/xmlfilterjar.hxx +index d9e20cd..d4a7603 100644 +--- a/filter/source/xsltdialog/xmlfilterjar.hxx ++++ b/filter/source/xsltdialog/xmlfilterjar.hxx +@@ -23,6 +23,7 @@ + #include + #include + ++#include + #include + + class filter_info_impl; +diff --git a/forms/source/component/EventThread.hxx b/forms/source/component/EventThread.hxx +index eb30620..bb8d01c 100644 +--- a/forms/source/component/EventThread.hxx ++++ b/forms/source/component/EventThread.hxx +@@ -22,6 +22,7 @@ + + #include + ++#include + #include + + #include +diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx +index d46901e..7111495 100644 +--- a/forms/source/xforms/propertysetbase.hxx ++++ b/forms/source/xforms/propertysetbase.hxx +@@ -31,6 +31,7 @@ + #include + + #include ++#include + + namespace com { namespace sun { namespace star { namespace uno { + class Any; +diff --git a/fpicker/source/office/contentenumeration.hxx b/fpicker/source/office/contentenumeration.hxx +index 920a6d8..977f700 100644 +--- a/fpicker/source/office/contentenumeration.hxx ++++ b/fpicker/source/office/contentenumeration.hxx +@@ -20,6 +20,10 @@ + #ifndef INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX + #define INCLUDED_SVTOOLS_SOURCE_CONTNR_CONTENTENUMERATION_HXX + ++#include ++ ++#include ++ + #include + #include + #include +diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx +index f1cc0e2..4f28b63 100644 +--- a/include/sfx2/sidebar/SidebarPanelBase.hxx ++++ b/include/sfx2/sidebar/SidebarPanelBase.hxx +@@ -19,6 +19,10 @@ + #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX + #define INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX + ++#include ++ ++#include ++ + #include + + #include +diff --git a/include/vcl/filter/PngImageReader.hxx b/include/vcl/filter/PngImageReader.hxx +index 97b2616..4fe1bb7 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 f55a515..e6a3493 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 ef0214b..2ec9f71 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/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx +index 7482dee..8465feb 100644 +--- a/sw/source/uibase/docvw/OverlayRanges.hxx ++++ b/sw/source/uibase/docvw/OverlayRanges.hxx +@@ -23,6 +23,7 @@ + #include + #include + ++#include + #include + + class SwView; +diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx +index ec2c7ea..700a947 100644 +--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx ++++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx +@@ -20,6 +20,10 @@ + #ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX + #define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX + ++#include ++ ++#include ++ + #include + + class SwView; +diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.hxx b/xmlsecurity/source/gpg/SecurityEnvironment.hxx +index c815e0e..548d765 100644 +--- a/xmlsecurity/source/gpg/SecurityEnvironment.hxx ++++ b/xmlsecurity/source/gpg/SecurityEnvironment.hxx +@@ -11,6 +11,9 @@ + #define INCLUDED_XMLSECURITY_SOURCE_GPG_SECURITYENVIRONMENT_HXX + + #include ++ ++#include ++ + #include + #include + +-- +2.45.2 + + +From 17ffddc25ed6bd2af39677d5454f1204e51ea644 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Wed, 28 Aug 2024 18:21:50 +1000 +Subject: Missing include + + +diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx +index 6adff39..e7f33c0 100644 +--- a/include/svtools/imageresourceaccess.hxx ++++ b/include/svtools/imageresourceaccess.hxx +@@ -20,6 +20,10 @@ + #ifndef INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX + #define INCLUDED_SVTOOLS_IMAGERESOURCEACCESS_HXX + ++#include ++ ++#include ++ + #include + + #include +diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx +index 63b4499..fc72f49 100644 +--- a/include/svx/hexcolorcontrol.hxx ++++ b/include/svx/hexcolorcontrol.hxx +@@ -24,6 +24,8 @@ + #include + #include + ++#include ++ + namespace weld { class Entry; } + + struct ImplSVEvent; +-- +2.45.2