LibreOffice: bump version

app-office/libreoffice/additional-files/create_buildid.sh

@@ -0,0 +1,6 @@
+#/bin/sh
+
+mkdir -p /boot/home/config/settings/LibreOffice/4/user/extensions
+
+echo `head -5 /system/apps/LibreOffice/program/versionrc | awk -F "=" '/buildid/ {print $2}'` > \
+~/config/settings/LibreOffice/4/user/extensions/buildid

app-office/libreoffice/libreoffice-6.2.0.0.beta1.recipe

@@ -17,21 +17,24 @@ and Open Source office suite on the market:
 HOMEPAGE="https://www.libreoffice.org/"
 COPYRIGHT="2000-2018 LibreOffice contributors"
 LICENSE="MPL v2.0"
-REVISION="20"
-srcGitRev="beaba5f1abbb9a1461286fc831ea6a30131bb3b5"
-SOURCE_URI="https://github.com/LibreOffice/core/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="a3368215b6416b58cd05e8b9743d9d3d2a4bc5b29ad879daba2727faf8bf1d11"
-SOURCE_DIR="core-$srcGitRev"
+REVISION="1"
+srcGitRev="dc38fc68dc130a8b35c1791ee7af4e44142e0698"
+SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
+SOURCE_DIR="core-libreoffice-$portVersion"
+CHECKSUM_SHA256="4e7d6943c1ab8350cf9300825c69d95592d3b066ee78738e02581977fbde1d3f"
+
 #srcGitRev_2="54cc0de67b3c948411cef3a0405c8992d80f34f3"
-#SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/$srcGitRev_2.tar.gz"
-#CHECKSUM_SHA256_2="5677ff6b362240e1741559b86057aeecda88030940f0d2dcb201d518c7f945c9"
-#SOURCE_DIR_2="translations-$srcGitRev_2"
+#SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz"
+#CHECKSUM_SHA256_2="4e7d6943c1ab8350cf9300825c69d95592d3b066ee78738e02581977fbde1d3f"
+#SOURCE_DIR_2="translations-libreoffice-$portVersion"
 PATCHES="libreoffice-$portVersion.patchset"
 ADDITIONAL_FILES="
 	libreoffice.iom
 	libreoffice.rdef.in
+	create_buildid.sh
 	"
 
+POST_INSTALL_SCRIPTS="$relativePostInstallDir/create_buildid.sh"
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
@@ -242,7 +245,7 @@ BUILD_PREREQUIRES="
 
 PATCH()
 {
-	# TODO: remove when huge tooltips are fixed
+	# disable tooltips as they're currently buggy in kde5 vcl
 	cd officecfg/registry/schema/org/openoffice/Office
 	sed -i '/Activates the Tip/{n;n;n;s/true/false/}' Common.xcs
 }
@@ -254,8 +257,8 @@ BUILD()
 
 	# rename $sourceDir to something shorter, otherwise build fails with
 	# execv: Argument too big /sources/core/sw/Library_sw.mk:20
-	cd .. ; mv $sourceDir core
-	ln -s core core-$srcGitRev; cd core
+	cd .. ; mv core-libreoffice-$portVersion core
+	ln -s core core-libreoffice-$portVersion; cd core
 
 	#rm -rf translations
 	#ln -s $sourceDir2 translations
@@ -332,6 +335,9 @@ INSTALL()
 #
 #	packageEntries lang ${filesToPackage[@]}
 
+	mkdir -p $postInstallDir
+	cp $portDir/additional-files/create_buildid.sh $postInstallDir
+
 	local APP_SIGNATURE="application/x-vnd.LibreOffice"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"

app-office/libreoffice/patches/libreoffice-6.2.0.0.beta1.patchset

@@ -1,11 +1,11 @@
-From 976555a222524b9c9d932d9e22fc16ae3a0be71d Mon Sep 17 00:00:00 2001
+From 6fe65bc6582684d414e04fd19d11963bc0341a95 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 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..8c319dd 100644
+index d0454c3..ee7f8a3 100644
 --- a/vcl/source/app/IconThemeSelector.cxx
 +++ b/vcl/source/app/IconThemeSelector.cxx
 @@ -54,6 +54,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
@@ -21,14 +21,14 @@ index d0454c3..8c319dd 100644
 2.19.1
 
 
-From 4a4d3c6a0caab648b25e23ed930c113c1c29fa02 Mon Sep 17 00:00:00 2001
+From f89dd90062ceeee515d7eadbcf57026c9d772af6 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 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 7c12197..b5da745 100644
+index 3221804..79c20f1 100644
 --- a/vcl/source/app/svapp.cxx
 +++ b/vcl/source/app/svapp.cxx
 @@ -1102,7 +1102,7 @@ OUString Application::GetHWOSConfInfo()
@@ -44,7 +44,7 @@ index 7c12197..b5da745 100644
 2.19.1
 
 
-From fc8b02ed3fdaed410b7b6fa6eee2b762cd668cfb Mon Sep 17 00:00:00 2001
+From 72be85f00540913820046ea4c816655e1e0e70c9 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 24 Oct 2018 17:01:34 +0300
 Subject: Identify Haiku in about window
@@ -67,7 +67,7 @@ index 52f2736..ecde5fc 100644
 2.19.1
 
 
-From 68a0e7871970076dd0788ef18df828edba5be48e Mon Sep 17 00:00:00 2001
+From b389d3d30a3727ce1a3fa3f5bdff2a733383d3f6 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 24 Oct 2018 17:02:04 +0300
 Subject: Workaround a crash on quit. See Haiku #13159
@@ -104,7 +104,7 @@ index 643c42a..d4b47cb 100644
 2.19.1
 
 
-From 24d254f1f0c460872c91a7265a5fe8f7a0bc9678 Mon Sep 17 00:00:00 2001
+From 0d4ea7aecadb61c43b38b7a12f500b02e7093f92 Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Wed, 24 Oct 2018 17:02:36 +0300
 Subject: Fix build on non X11 platform
@@ -175,36 +175,7 @@ index 4410398..299b90e 100644
 2.19.1
 
 
-From fd5383a467f97761e89b152b59abb01acd012248 Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-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 6cae77f892d1cfc6f3ad84e80022a1e371d9721e Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Tue, 6 Nov 2018 15:09:16 +0300
 Subject: Workaround a bug in Haiku Qt5 QPA module
@@ -212,7 +183,7 @@ 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
+index ad043eb..bdd9571 100644
 --- a/vcl/qt5/Qt5Frame.cxx
 +++ b/vcl/qt5/Qt5Frame.cxx
 @@ -140,7 +140,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
@@ -227,3 +198,27 @@ index 17fb684..fd5582c 100644
 -- 
 2.19.1
 
+
+From e652ba226a618b1052140f5a0fd8ac658ee6d573 Mon Sep 17 00:00:00 2001
+From: Sergei Reznikov <diver@gelios.net>
+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
+--- 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
+         //  Results in "The file /.../foo:bar does not exits." (where "/..." is
+         //  the CWD) on stderr and SystemShellExecuteException.
+         aBuffer.append("open --");
++
++#elif __HAIKU__
++		aBuffer.append("open");
+ #else
+         // Just use xdg-open on non-Mac
+         aBuffer.append("/usr/bin/xdg-open");
+-- 
+2.19.1
+