haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibreOffice: unbreak the build

Browse Source
This commit is contained in:
Sergei Reznikov
2018-09-06 12:55:42 +03:00
parent 68247814c1
commit 6bde34e0d8
1 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset
View File

@@ -1,4 +1,4 @@
From 985085d160192c5e5e4f0829447191a2bec2fc6f Mon Sep 17 00:00:00 2001
From 9c3a27ee72058961c3cccfee59b3110b218569a0 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 1 Sep 2018 18:38:42 +0200
Subject: Fix mysqlc build error
@@ -21,7 +21,7 @@ index 3d9d915..30c2163 100644
2.16.4
From 96fec0f2d2d17299c7769cfd943b57b019b56527 Mon Sep 17 00:00:00 2001
From 9325f4a6452a6e4834cdfe2c45643dd253eb62e4 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 4 Sep 2018 22:52:53 +0300
Subject: Make Elementary the default on Haiku
@@ -44,17 +44,17 @@ index c9da2d6..e8c88e3 100644
2.16.4
From b508076be864636ad80d9e476e00fee68dfc9fba Mon Sep 17 00:00:00 2001
From 41bdd1542b11c7f4b9262f393800a46613234634 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 4 Sep 2018 22:53:57 +0300
Subject: Show used vcl backend on Haiku
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 1bd65ba..c5363f2 100644
index 565f349..0ba3c32 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1154,8 +1154,8 @@ OUString Application::GetHWOSConfInfo()
@@ -1135,8 +1135,8 @@ OUString Application::GetHWOSConfInfo()
aDetails.append( VclResId(SV_APP_DEFAULT) );
aDetails.append( "; " );
@@ -69,7 +69,7 @@ index 1bd65ba..c5363f2 100644
2.16.4
From e32d5118eb6e8f89ea4b8855b71fd5450b80b870 Mon Sep 17 00:00:00 2001
From ed3cb5da76331ab815099b23a730685d478ebd1f Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 4 Sep 2018 22:54:37 +0300
Subject: Identify Haiku in about window
@@ -92,7 +92,7 @@ index a297ddc..085ddfe 100644
2.16.4
From ce7000f16213ca50a1e67a8a5c31b7d8d37a729b Mon Sep 17 00:00:00 2001
From 558c0fb60f3b5aff1ab50b5683991b534176e1c0 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 5 Sep 2018 13:31:45 +0300
Subject: Workaround a crash on quit. See Haiku #13159
@@ -128,3 +128,74 @@ index 643c42a..d4b47cb 100644
--
2.16.4
From 46db5ef4150a984cc15a28d8dde1667044920c04 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 6 Sep 2018 12:50:57 +0300
Subject: Fix build on non X11 platform
* Partially revert f970499651c85d429cc31518ed65c37c33c9936b
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index 9c82f6c..dffc759 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -24,7 +24,6 @@
#include <QtWidgets/QToolTip>
#include <QtWidgets/QApplication>
#include <QtWidgets/QMenuBar>
-#include <QtX11Extras/QX11Info>
#include <KConfig>
#include <KConfigGroup>
@@ -222,19 +221,4 @@ void KDE5SalFrame::ReleaseGraphics(SalGraphics* pSalGraph)
m_bGraphicsInUse = false;
}
-void KDE5SalFrame::StartPresentation(bool bStart)
-{
- // disable screensaver for running preso
- boost::optional<unsigned int> aWindow;
- boost::optional<Display*> aDisplay;
- if (QX11Info::isPlatformX11())
- {
- aWindow = QX11Info::appRootWindow();
- aDisplay = QX11Info::display();
- }
-
- m_ScreenSaverInhibitor.inhibit(bStart, "presentation", QX11Info::isPlatformX11(), aWindow,
- aDisplay);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalFrame.hxx b/vcl/unx/kde5/KDE5SalFrame.hxx
index e39dab6..6135d63 100644
--- a/vcl/unx/kde5/KDE5SalFrame.hxx
+++ b/vcl/unx/kde5/KDE5SalFrame.hxx
@@ -24,7 +24,6 @@
#undef Status
#include <qt5/Qt5Frame.hxx>
-#include <unx/screensaverinhibitor.hxx>
#include "KDE5SalGraphics.hxx"
@@ -35,7 +34,6 @@ class KDE5SalFrame : public Qt5Frame
{
private:
std::unique_ptr<KDE5SalGraphics> m_pKDE5Graphics;
- ScreenSaverInhibitor m_ScreenSaverInhibitor;
bool m_bGraphicsInUse;
public:
@@ -45,7 +43,6 @@ public:
virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
virtual void UpdateSettings(AllSettings& rSettings) override;
- virtual void StartPresentation(bool bStart) override;
virtual LanguageType GetInputLanguage() override { return LANGUAGE_SYSTEM; }
virtual const SystemEnvData* GetSystemData() const override { return nullptr; }
virtual SalPointerState GetPointerState() override { return SalPointerState(); }
--
2.16.4