From 2bfcef6ad5aad1334be0285d28f6bf7dc6b17169 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 25 May 2018 13:22:12 +0300
Subject: [PATCH] LibreOffice: fix BUILD_PREREQUIRES

---
 .../libreoffice-6.0.4.2~git.recipe            | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-6.0.4.2~git.recipe b/app-office/libreoffice/libreoffice-6.0.4.2~git.recipe
index 856ae1918..7e7f624c8 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2~git.recipe
+++ b/app-office/libreoffice/libreoffice-6.0.4.2~git.recipe
@@ -4,21 +4,23 @@ feature-rich tools help you unleash your creativity and enhance your \
 productivity.
 LibreOffice includes several applications that make it the most powerful Free \
 and Open Source office suite on the market."
-HOMEPAGE="http://www.libreoffice.org/"
-COPYRIGHT="??? ???"
-LICENSE="GNU LGPL v3"
+HOMEPAGE="https://www.libreoffice.org/"
+COPYRIGHT="2000, 2010 Oracle and/or its affiliates.
+	2000, 2010 LibreOffice contributors and/or their affiliates."
+LICENSE="MPL v2.0"
 REVISION="1"
-COMMIT="46391493f6c28c86aa5c100fc0f490e74b083cd5"
+COMMIT="ff4d75891fb947989d16df58a6b2805f20102fc6"
 SOURCE_URI="https://github.com/LibreOffice/core/archive/$COMMIT.tar.gz"
-CHECKSUM_SHA256="b943b44e93dc705997586fbff12a82f2a4b5a9dea867978cfe994d0b72abadcc"
+CHECKSUM_SHA256="b6ac86d714490b27617d4a08dc622239bf2795a21a236f16096eaa945f760cbb"
 SOURCE_DIR="core-$COMMIT"
 PATCHES="libreoffice-$portVersion.patchset"
 
-ARCHITECTURES="?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86_64"
 SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
 	libreoffice$secondaryArchSuffix = $portVersion
+	cmd:libreoffice$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -91,8 +93,8 @@ BUILD_PREREQUIRES="
 	cmd:genbrk
 	cmd:genccode
 	cmd:gencmn
-	cmd:gperf
 	cmd:git
+	cmd:gperf
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
 	cmd:make
@@ -102,12 +104,22 @@ BUILD_PREREQUIRES="
 	cmd:python2.7
 	cmd:python3.6
 	cmd:which
+	cmd:xz
 	cmd:zip
 	"
 BUILD()
 {
+	# cppunittester crashes a lot on Haiku, see #13159. To workaround this create
+	# ~/config/settings/system/debug_server/settings with the following content:
+
+	# executable_actions {
+	#	cppunittester kill
+	# }
+
 	./autogen.sh --with-distro=LibreOfficeHaiku --enable-qt5
-	make $jobArgs build -k
+	# --disable-fetch-external
+
+	make $jobArgs build-nocheck -k
 }
 
 INSTALL()