diff --git a/app-office/libreoffice/libreoffice-6.2.5.1.recipe b/app-office/libreoffice/libreoffice-6.3.0.2.recipe similarity index 98% rename from app-office/libreoffice/libreoffice-6.2.5.1.recipe rename to app-office/libreoffice/libreoffice-6.3.0.2.recipe index 926de73f4..b97fd622a 100644 --- a/app-office/libreoffice/libreoffice-6.2.5.1.recipe +++ b/app-office/libreoffice/libreoffice-6.3.0.2.recipe @@ -21,10 +21,10 @@ REVISION="1" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_DIR="core-libreoffice-$portVersion" -CHECKSUM_SHA256="212bec2262ba3392abe1880ec3fa0b22ad7e5c8682789ab9b51ff046395ea9d0" +CHECKSUM_SHA256="53ba9949c8725d2a7606179872d8785915b5ea95cfe6f3b3b7351437c8d6bc5a" SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz" -CHECKSUM_SHA256_2="b232810b082ef2d3acbafeb788014a2cf24de6764213e8bbd5e97cc431631568" +CHECKSUM_SHA256_2="9381cd25d0ae930e40ce9996f11c32d575d7bcb6a66b4d79d171379ab8d4e366" SOURCE_DIR_2="translations-libreoffice-$portVersion" SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz" diff --git a/app-office/libreoffice/patches/libreoffice-6.2.5.1.patchset b/app-office/libreoffice/patches/libreoffice-6.3.0.2.patchset similarity index 50% rename from app-office/libreoffice/patches/libreoffice-6.2.5.1.patchset rename to app-office/libreoffice/patches/libreoffice-6.3.0.2.patchset index 7e4d8aeb7..74e693e16 100644 --- a/app-office/libreoffice/patches/libreoffice-6.2.5.1.patchset +++ b/app-office/libreoffice/patches/libreoffice-6.3.0.2.patchset @@ -1,11 +1,11 @@ -From 6fe65bc6582684d414e04fd19d11963bc0341a95 Mon Sep 17 00:00:00 2001 +From f57fefa38c2fbf6fbc914e66829cec9822a77456 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 24 Oct 2018 17:00:02 +0300 Subject: Make Elementary the default on Haiku diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx -index d0454c3..ee7f8a3 100644 +index c4e60fd..81490ed 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -54,6 +54,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi @@ -16,22 +16,22 @@ index d0454c3..ee7f8a3 100644 + return OUString("elementary"); #else OUString r; - if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") || + if ( desktopEnvironment.equalsIgnoreAsciiCase("kde5") || -- -2.19.1 +2.21.0 -From f89dd90062ceeee515d7eadbcf57026c9d772af6 Mon Sep 17 00:00:00 2001 +From e24fe058181a1021ec49b65c52bd368a46f067de 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 diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx -index 3221804..79c20f1 100644 +index d087a15..6613105 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx -@@ -1102,7 +1102,7 @@ OUString Application::GetHWOSConfInfo() +@@ -1163,7 +1163,7 @@ OUString Application::GetHWOSConfInfo() aDetails.append( VclResId(SV_APP_DEFAULT) ); aDetails.append( "; " ); @@ -41,20 +41,20 @@ index 3221804..79c20f1 100644 aDetails.append( GetToolkitName() ); aDetails.append( "; " ); -- -2.19.1 +2.21.0 -From 72be85f00540913820046ea4c816655e1e0e70c9 Mon Sep 17 00:00:00 2001 +From d8a5bc6eb1857592116da4dcab58137934c189d9 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 diff --git a/vcl/unx/generic/app/geninst.cxx b/vcl/unx/generic/app/geninst.cxx -index 52f2736..ecde5fc 100644 +index dff6ff0..0901bdb 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx -@@ -77,6 +77,8 @@ OUString SalGenericInstance::getOSVersion() +@@ -76,6 +76,8 @@ OUString SalGenericInstance::getOSVersion() } fclose( pVersion ); } @@ -64,10 +64,10 @@ index 52f2736..ecde5fc 100644 return aKernelVer; } -- -2.19.1 +2.21.0 -From b389d3d30a3727ce1a3fa3f5bdff2a733383d3f6 Mon Sep 17 00:00:00 2001 +From a5ea92f5c753f4c671c23a141a9cdd3492a165f1 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 @@ -101,91 +101,20 @@ index 643c42a..d4b47cb 100644 return ret; } -- -2.19.1 +2.21.0 -From 0d4ea7aecadb61c43b38b7a12f500b02e7093f92 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Wed, 24 Oct 2018 17:02:36 +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 - #include - #include --#include - - #include - #include -@@ -222,19 +221,4 @@ void KDE5SalFrame::ReleaseGraphics(SalGraphics* pSalGraph) - m_bGraphicsInUse = false; - } - --void KDE5SalFrame::StartPresentation(bool bStart) --{ -- // disable screensaver for running preso -- boost::optional aWindow; -- boost::optional 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 4410398..299b90e 100644 ---- a/vcl/unx/kde5/KDE5SalFrame.hxx -+++ b/vcl/unx/kde5/KDE5SalFrame.hxx -@@ -24,7 +24,6 @@ - #undef Status - - #include --#include - - #include "KDE5SalGraphics.hxx" - -@@ -35,7 +34,6 @@ class KDE5SalFrame : public Qt5Frame - { - private: - std::unique_ptr 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 SalPointerState GetPointerState() override { return SalPointerState(); } - virtual KeyIndicatorState GetIndicatorState() override { return KeyIndicatorState(); } --- -2.19.1 - - -From e652ba226a618b1052140f5a0fd8ac658ee6d573 Mon Sep 17 00:00:00 2001 +From 163e0ccf38d5ce6c4d38e49006530820903e987b Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Wed, 21 Nov 2018 13:39:14 +0300 Subject: Implement ShellExec on Haiku diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx -index 7deeb5c..cbf151d 100644 +index 7355eae..3e8788d 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx -@@ -136,6 +136,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar +@@ -173,6 +173,9 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar // Results in "The file /.../foo:bar does not exits." (where "/..." is // the CWD) on stderr and SystemShellExecuteException. aBuffer.append("open --"); @@ -196,5 +125,56 @@ index 7deeb5c..cbf151d 100644 // Just use xdg-open on non-Mac aBuffer.append("/usr/bin/xdg-open"); -- -2.19.1 +2.21.0 + + +From d2fa1c69d2fc2d1ec4fcc3ff17c0ee9ecb9ad090 Mon Sep 17 00:00:00 2001 +From: Lionel Elie Mamane +Date: Wed, 10 Jul 2019 10:27:19 +0200 +Subject: build failure - disambiguate Calendar return class + +Change-Id: I892281f85f6cc9c2de2c341ae63240ae85d302c4 + +diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx +index c9e22f7..228bed3 100644 +--- a/i18npool/source/calendar/calendarImpl.cxx ++++ b/i18npool/source/calendar/calendarImpl.cxx +@@ -128,7 +128,7 @@ CalendarImpl::getLoadedCalendar2() + return xCalendar->getLoadedCalendar2(); + } + +-Calendar SAL_CALL ++::css::i18n::Calendar SAL_CALL + CalendarImpl::getLoadedCalendar() + { + if (!xCalendar.is()) +-- +2.21.0 + + +From b965788d8e21d247f7d96b472b53a2450a9c03e5 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 + + +diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk +index 1d6b38c..6a50da3 100644 +--- a/solenv/gbuild/platform/unxgcc.mk ++++ b/solenv/gbuild/platform/unxgcc.mk +@@ -45,9 +45,9 @@ gb_CFLAGS := \ + # At least libstdc++ (which is approximated here with !HAVE_LIBCXX) needs -pthread when including + # various C++ headers like , see : +-ifeq ($(HAVE_LIBCXX),) +-gb_CXX_LINKFLAGS := -pthread +-endif ++#ifeq ($(HAVE_LIBCXX),) ++#gb_CXX_LINKFLAGS := -pthread ++#endif + + gb_CXXFLAGS := \ + $(gb_CXXFLAGS_COMMON) \ +-- +2.21.0