From 524e2b6c309783de582742fb63faf8b1c4643dce Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Thu, 8 Nov 2018 15:29:21 +0300 Subject: [PATCH] LibreOffice: bump git revision * disable tooltips for now * clipboard works now but a bit buggy --- .../libreoffice-6.2.0.0~git.recipe | 16 ++- .../patches/libreoffice-6.2.0.0~git.patchset | 134 +++++++++++------- 2 files changed, 93 insertions(+), 57 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe index e8eff9f12..327b9cec1 100644 --- a/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe +++ b/app-office/libreoffice/libreoffice-6.2.0.0~git.recipe @@ -17,10 +17,10 @@ and Open Source office suite on the market: HOMEPAGE="https://www.libreoffice.org/" COPYRIGHT="2000-2018 LibreOffice contributors" LICENSE="MPL v2.0" -REVISION="19" -srcGitRev="42b3be24f058ce470db54232cc496d56e2fd774e" +REVISION="20" +srcGitRev="beaba5f1abbb9a1461286fc831ea6a30131bb3b5" SOURCE_URI="https://github.com/LibreOffice/core/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="fd7b9cdff1dfad8fa8880aa8cf518000f1c10c804fd4298d43dc0494cd77bc21" +CHECKSUM_SHA256="a3368215b6416b58cd05e8b9743d9d3d2a4bc5b29ad879daba2727faf8bf1d11" SOURCE_DIR="core-$srcGitRev" #srcGitRev_2="54cc0de67b3c948411cef3a0405c8992d80f34f3" #SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/$srcGitRev_2.tar.gz" @@ -240,6 +240,14 @@ BUILD_PREREQUIRES=" cmd:zip " +PATCH() +{ + # TODO: remove when huge tooltips are fixed + pushd officecfg/registry/schema/org/openoffice/Office + sed -i '/Activates the Tip/{n;n;n;s/true/false/}' Common.xcs + popd +{ + BUILD() { # TODO: enable commented out stuff when there is a "stable" release @@ -285,7 +293,7 @@ BUILD() --without-doxygen \ --without-helppack-integration \ --without-java \ - --without-system-jars \ + --without-system-jars make $jobArgs build-nocheck } diff --git a/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset b/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset index 823e75430..67060c359 100644 --- a/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset +++ b/app-office/libreoffice/patches/libreoffice-6.2.0.0~git.patchset @@ -1,85 +1,60 @@ -From 9c3a27ee72058961c3cccfee59b3110b218569a0 Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 1 Sep 2018 18:38:42 +0200 -Subject: Fix mysqlc build error - - -diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk -index 3d9d915..30c2163 100644 ---- a/connectivity/Library_mysqlc.mk -+++ b/connectivity/Library_mysqlc.mk -@@ -22,7 +22,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\ - )) - - $(eval $(call gb_Library_add_libs,mysqlc,\ -- $(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\ -+ $(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),-lz -lm,\ - -rdynamic -lz -lcrypt -lm)) \ - $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \ - )) --- -2.16.4 - - -From 9325f4a6452a6e4834cdfe2c45643dd253eb62e4 Mon Sep 17 00:00:00 2001 +From 976555a222524b9c9d932d9e22fc16ae3a0be71d Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Tue, 4 Sep 2018 22:52:53 +0300 +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 c9da2d6..e8c88e3 100644 +index d0454c3..8c319dd 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx -@@ -55,6 +55,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi +@@ -54,6 +54,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi #ifdef _WIN32 - r = "colibre"; (void)desktopEnvironment; + return OUString("colibre"); +#elif defined(__HAIKU__) -+ r = "elementary"; ++ return OUString("elementary"); #else + OUString r; if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") || - desktopEnvironment.equalsIgnoreAsciiCase("kde5") ) { -- -2.16.4 +2.19.1 -From 41bdd1542b11c7f4b9262f393800a46613234634 Mon Sep 17 00:00:00 2001 +From 4a4d3c6a0caab648b25e23ed930c113c1c29fa02 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Tue, 4 Sep 2018 22:53:57 +0300 +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 565f349..0ba3c32 100644 +index 7c12197..b5da745 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx -@@ -1135,8 +1135,8 @@ OUString Application::GetHWOSConfInfo() +@@ -1102,7 +1102,7 @@ OUString Application::GetHWOSConfInfo() aDetails.append( VclResId(SV_APP_DEFAULT) ); aDetails.append( "; " ); --#ifdef LINUX -- // Only linux has different backends, so don't show blank for others. -+#if defined(LINUX) || defined (__HAIKU__) -+ // Only linux and Haiku have different backends, so don't show blank for others. +-#if (defined LINUX || defined _WIN32 || defined MACOSX) ++#if (defined LINUX || defined _WIN32 || defined MACOSX || defined (__HAIKU__)) aDetails.append( SV_APP_VCLBACKEND ); aDetails.append( GetToolkitName() ); aDetails.append( "; " ); -- -2.16.4 +2.19.1 -From ed3cb5da76331ab815099b23a730685d478ebd1f Mon Sep 17 00:00:00 2001 +From fc8b02ed3fdaed410b7b6fa6eee2b762cd668cfb Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Tue, 4 Sep 2018 22:54:37 +0300 +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 a297ddc..085ddfe 100644 +index 52f2736..ecde5fc 100644 --- a/vcl/unx/generic/app/geninst.cxx +++ b/vcl/unx/generic/app/geninst.cxx -@@ -92,6 +92,8 @@ OUString SalGenericInstance::getOSVersion() +@@ -77,6 +77,8 @@ OUString SalGenericInstance::getOSVersion() } fclose( pVersion ); } @@ -89,12 +64,12 @@ index a297ddc..085ddfe 100644 return aKernelVer; } -- -2.16.4 +2.19.1 -From 558c0fb60f3b5aff1ab50b5683991b534176e1c0 Mon Sep 17 00:00:00 2001 +From 68a0e7871970076dd0788ef18df828edba5be48e Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Wed, 5 Sep 2018 13:31:45 +0300 +Date: Wed, 24 Oct 2018 17:02:04 +0300 Subject: Workaround a crash on quit. See Haiku #13159 @@ -126,12 +101,12 @@ index 643c42a..d4b47cb 100644 return ret; } -- -2.16.4 +2.19.1 -From 46db5ef4150a984cc15a28d8dde1667044920c04 Mon Sep 17 00:00:00 2001 +From 24d254f1f0c460872c91a7265a5fe8f7a0bc9678 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Thu, 6 Sep 2018 12:50:57 +0300 +Date: Wed, 24 Oct 2018 17:02:36 +0300 Subject: Fix build on non X11 platform * Partially revert f970499651c85d429cc31518ed65c37c33c9936b @@ -169,7 +144,7 @@ index 9c82f6c..dffc759 100644 - /* 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 +index 4410398..299b90e 100644 --- a/vcl/unx/kde5/KDE5SalFrame.hxx +++ b/vcl/unx/kde5/KDE5SalFrame.hxx @@ -24,7 +24,6 @@ @@ -194,8 +169,61 @@ index e39dab6..6135d63 100644 - 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(); } + virtual KeyIndicatorState GetIndicatorState() override { return KeyIndicatorState(); } -- -2.16.4 +2.19.1 + + +From fd5383a467f97761e89b152b59abb01acd012248 Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Fri, 2 Nov 2018 00:08:23 +0300 +Subject: Revert check for en_US.utf8 locale + + +diff --git a/configure.ac b/configure.ac +index 912f5f3..d2634a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2411,14 +2411,6 @@ if test -z "$BASH"; then + fi + AC_SUBST(BASH) + +-AC_MSG_CHECKING([for en_US.utf8 locale]) +-if locale -a | egrep -q 'en_US\.(UTF-8|utf8)'; then +- AC_MSG_RESULT(present) +-else +- AC_MSG_RESULT(absent) +- AC_MSG_ERROR([you need en_US.utf8 locale to build]) +-fi +- + AC_MSG_CHECKING([for GNU or BSD tar]) + for a in $GNUTAR gtar gnutar bsdtar tar /usr/sfw/bin/gtar; do + $a --version 2> /dev/null | egrep "GNU|bsdtar" 2>&1 > /dev/null +-- +2.19.1 + + +From 21dea930218e5260733ede5b92fbe2b15912f4bf Mon Sep 17 00:00:00 2001 +From: Sergei Reznikov +Date: Tue, 6 Nov 2018 15:09:16 +0300 +Subject: Workaround a bug in Haiku Qt5 QPA module + +Calling winId() causes QPA to triple windows + +diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx +index 17fb684..fd5582c 100644 +--- a/vcl/qt5/Qt5Frame.cxx ++++ b/vcl/qt5/Qt5Frame.cxx +@@ -140,7 +140,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo) + } + + m_aSystemData.nSize = sizeof(SystemEnvData); +- m_aSystemData.aWindow = m_pQWidget->winId(); ++ //m_aSystemData.aWindow = m_pQWidget->winId(); + m_aSystemData.aShellWindow = reinterpret_cast(this); + //m_aSystemData.pSalFrame = this; + //m_aSystemData.pWidget = m_pQWidget; +-- +2.19.1