distro-configs/CPLinux-LOKit.conf | 1 +
sal/osl/unx/process.cxx | 4 ++++
vcl/inc/ios/iosinst.hxx | 2 +-
vcl/inc/quartz/ctfonts.hxx | 3 +++
vcl/ios/iosinst.cxx | 9 +++++----
5 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit fae9617d855b5e5a054b5276f391f49aad6e28c6
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Oct 6 14:33:49 2023 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Oct 6 14:33:49 2023 +0200
[cp] --without-templates makes packages a little bit smaller
COOL does not use these templates
Change-Id: If4ea6afd95920368135e97045a85564d401ca65b
diff --git a/distro-configs/CPLinux-LOKit.conf
b/distro-configs/CPLinux-LOKit.conf
index 271c0f43173b..c82c9fc549ad 100644
--- a/distro-configs/CPLinux-LOKit.conf
+++ b/distro-configs/CPLinux-LOKit.conf
@@ -66,3 +66,4 @@
--disable-lpsolve
--enable-symbols
--enable-sal-log
+--without-templates
commit 24d41f7e965ca0dab19bfde1570419c15508ee5d
Author: Patrick Luby <plub...@neooffice.org>
AuthorDate: Fri Sep 29 14:19:43 2023 -0400
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri Oct 6 14:32:14 2023 +0200
Fix iOS build breakages when building on macOS Sonoma
Change-Id: I347e48e9da69c8c9b15581a5afa5c61cdd1d380d
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index f75534fdc311..5ad579ae0f72 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -40,6 +40,10 @@
#include <machine/param.h>
#endif
+#ifdef IOS
+#include <signal.h>
+#endif
+
#include "system.hxx"
#include "unixerrnostring.hxx"
#if defined(__sun)
diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx
index 6ba433eed104..63182bcd0c0a 100644
--- a/vcl/inc/ios/iosinst.hxx
+++ b/vcl/inc/ios/iosinst.hxx
@@ -44,7 +44,7 @@ public:
css::uno::Reference<css::uno::XInterface>
CreateClipboard(const css::uno::Sequence<css::uno::Any>& i_rArguments)
override;
- void GetWorkArea(tools::Rectangle& rRect);
+ void GetWorkArea(AbsoluteScreenPixelRectangle& rRect);
SalFrame* CreateFrame(SalFrame* pParent, SalFrameStyleFlags nStyle)
override;
SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags
nStyle) override;
};
diff --git a/vcl/inc/quartz/ctfonts.hxx b/vcl/inc/quartz/ctfonts.hxx
index be68dea71c9a..dcf0dbff843c 100644
--- a/vcl/inc/quartz/ctfonts.hxx
+++ b/vcl/inc/quartz/ctfonts.hxx
@@ -24,6 +24,9 @@
#include <sallayout.hxx>
std::unique_ptr<SystemFontList> GetCoretextFontList();
+#ifdef IOS
+#include <font/PhysicalFontCollection.hxx>
+#endif
FontAttributes DevFontFromCTFontDescriptor(CTFontDescriptorRef, bool*);
#endif // INCLUDED_VCL_INC_QUARTZ_CTFONTS_HXX
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 533fef269a07..371d5c246ca1 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -26,16 +26,17 @@
#include "headless/svpdata.hxx"
#include "headless/svpdummies.hxx"
#include "quartz/utils.h"
+#include "quartz/SystemFontList.hxx"
#include <vcl/layout.hxx>
#include <vcl/settings.hxx>
// Totally wrong of course but doesn't seem to harm much in the iOS app.
static int viewWidth = 1, viewHeight = 1;
-void IosSalInstance::GetWorkArea( tools::Rectangle& rRect )
+void IosSalInstance::GetWorkArea( AbsoluteScreenPixelRectangle& rRect )
{
- rRect = tools::Rectangle( Point( 0, 0 ),
- Size( viewWidth, viewHeight ) );
+ rRect = AbsoluteScreenPixelRectangle( AbsoluteScreenPixelPoint( 0, 0 ),
+ AbsoluteScreenPixelSize( viewWidth, viewHeight ) );
}
IosSalInstance *IosSalInstance::getInstance()
@@ -80,7 +81,7 @@ public:
SetPosSize(0, 0, viewWidth, viewHeight, SAL_FRAME_POSSIZE_WIDTH |
SAL_FRAME_POSSIZE_HEIGHT);
}
- virtual void GetWorkArea( tools::Rectangle& rRect ) override
+ virtual void GetWorkArea( AbsoluteScreenPixelRectangle& rRect ) override
{
IosSalInstance::getInstance()->GetWorkArea( rRect );
}
