Various Haiku improvements

* Fix make distro-pack-install.
* Remove Xorg dependency.
* Remove stack protector workaround.
* Update distro-config and enabled features.

Change-Id: I273dc8343ad84bd77b86453cc01ff427b50ea0b5
Reviewed-on: https://gerrit.libreoffice.org/58634
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>

Repository.mk

@@ -142,7 +142,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
 	$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
 	$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
-	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
+	$(if $(filter-out ANDROID HAIKU IOS MACOSX WNT,$(OS)),oosplash) \
 	soffice_bin \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
 	$(if $(filter WNT,$(OS)), \
@@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \
 endif
 
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
-	$(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
+	$(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
 	$(if $(ENABLE_MACOSX_SANDBOX),, \
 		regmerge \
 		regview \
@@ -1016,7 +1016,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
 	desktop_branding \
 	$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
-	$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
+	$(if $(and $(filter-out MACOSX HAIKU WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
 		$(if $(DISABLE_GUI),, \
 			desktop_soffice_sh \
 		) \

configure.ac

@@ -795,17 +795,13 @@ haiku*)
     test_randr=no
     test_xrender=no
     test_freetype=yes
-    enable_java=no
-    enable_opengl=no
     enable_odk=no
-    enable_gconf=no
-    enable_gnome_vfs=no
-    enable_gstreamer=no
+    enable_gstreamer_0_10=no
+    enable_gstreamer_1_0=no
     enable_vlc=no
-    enable_gltf=no
-    enable_collada=no
     enable_coinmp=no
     enable_pdfium=no
+    enable_sdremote=no
     enable_postgresql_sdbc=no
     enable_firebird_sdbc=no
     _os=Haiku
@@ -11239,7 +11235,9 @@ then
         AC_MSG_ERROR([KF5 libraries not found.  Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".])
     fi
 
-    PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])])
+    if test "$USING_X11" = TRUE; then
+        PKG_CHECK_MODULES(KF5_XCB,[xcb],,[AC_MSG_ERROR([XCB not installed])])
+    fi
 
     KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT $KF5_XCB_CFLAGS"
     KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network $KF5_XCB_LIBS"

distro-configs/LibreOfficeHaiku.conf

@@ -1,66 +1,6 @@
 --with-vendor=The Document Foundation
---with-system-libxml
---with-system-neon
---with-system-boost
---with-boost-libdir=/boot/system/lib
---with-system-clucene
---with-system-expat
---with-system-libpng
---with-system-jpeg
---with-system-zlib
---with-system-bzip2
---with-system-icu
---with-system-openssl
---with-system-curl
---with-system-cppunit
---with-system-hunspell
---with-system-altlinuxhyph
---with-system-lcms2
---with-system-librevenge
---with-system-libodfgen
---with-system-libwpd
---with-system-libwpg
---with-system-libwps
---with-system-libvisio
---with-system-libcdr
---with-system-libmspub
---with-system-libmwaw
---with-system-libetonyek
---with-system-libfreehand
---with-system-libebook
---with-system-libabw
---with-system-libpagemaker
---with-system-libzmf
---with-system-libstaroffice
---with-system-libqxp
---with-system-epoxy
---with-system-clucene
---with-system-mdds
---with-system-glm
---with-system-openldap
---with-system-liblangtag
---with-system-graphite
---with-system-harfbuzz
---with-system-nss
---with-system-lpsolve
---with-system-orcus
---with-system-redland
---with-system-libcmis
---with-system-cairo
---with-system-poppler
---with-theme=breeze sifr
---with-galleries=no
---without-helppack-integration
+--with-system-libs
+--with-boost-libdir=/system/develop/lib
+--enable-readonly-installset
 --without-java
---without-system-jars
---without-doxygen
---disable-sdremote
---disable-gio
---disable-randr
---disable-gstreamer-0-10
---disable-cups
---disable-ccache
---disable-postgresql-sdbc
---disable-lotuswordpro
---disable-firebird-sdbc
---enable-python=no
+--without-system-jars

solenv/gbuild/platform/HAIKU_INTEL_GCC.mk

@@ -11,6 +11,6 @@
 
 gb_CPUDEFS := -DX86
 
-include $(GBUILDDIR)/platform/haiku.mk
+include $(GBUILDDIR)/platform/unxgcc.mk
 
 # vim: set noet sw=4:

solenv/gbuild/platform/HAIKU_X86_64_GCC.mk

@@ -9,6 +9,6 @@
 
 #please make generic modifications to unxgcc.mk
 
-include $(GBUILDDIR)/platform/haiku.mk
+include $(GBUILDDIR)/platform/unxgcc.mk
 
 # vim: set noet sw=4:

solenv/gbuild/platform/haiku.mk

@@ -1,19 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
-gb_CFLAGS_COMMON += -lssp
-gb_CXXFLAGS_COMMON += -lssp
-gb_LinkTarget_LDFLAGS += -lssp
-endif
-
-# vim: set noet sw=4 ts=4:

vcl/inc/svsys.h

@@ -28,6 +28,7 @@
 #include "ios/svsys.h"
 #elif defined ANDROID
 #include "android/svsys.h"
+#elif defined HAIKU
 #elif defined LIBO_HEADLESS
 #else
 #include "unx/svsys.h"