LibreOffice: fix build

This commit is contained in:
Sergei Reznikov
2018-06-08 15:15:32 +03:00
parent 4bf88414e0
commit 21d0472a70

View File

@@ -1,4 +1,4 @@
From 4336840626aa7af75bda44108a81c7c739219485 Mon Sep 17 00:00:00 2001
From 141390aa4dc9e2c6e0c79bbba22ebf27dad5454f Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 1 Jun 2018 15:23:47 +0300
Subject: Fix make distro-pack-install on Haiku
@@ -39,7 +39,7 @@ index 2a66608..e26f8e1 100644
2.16.4
From 61cc51a2cc2fb7909102bc54cf13b8b784a6728e Mon Sep 17 00:00:00 2001
From 18c8332722a099b07d8815f789d35a619bbbb714 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Mon, 4 Jun 2018 11:55:30 +0300
Subject: Fix profile dir location on Haiku
@@ -62,7 +62,7 @@ index 315e5c8..5aff39b 100644
2.16.4
From 18135fe77f568108d89fab44c4ad52e28d7b6a99 Mon Sep 17 00:00:00 2001
From 6a1206b6ae0e384acb6fadcbb520a159480fcdf9 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Thu, 7 Jun 2018 15:04:27 +0300
Subject: Enable KDE5 backend on Haiku
@@ -115,7 +115,7 @@ index 0453502..292e72b 100644
kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
fi
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index a739d59..8585580 100644
index a739d59..cc7d9fd 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -91,6 +91,7 @@ endif
@@ -126,16 +126,14 @@ index a739d59..8585580 100644
Library_vclplug_qt5 \
))
endif
@@ -118,7 +119,9 @@ endif
@@ -118,6 +119,7 @@ endif
ifeq ($(OS),HAIKU)
ifneq ($(ENABLE_QT5),)
$(eval $(call gb_Module_add_targets,vcl,\
+ CustomTarget_kde5_moc \
CustomTarget_qt5_moc \
+ Library_vclplug_kde5 \
Library_vclplug_qt5 \
))
endif
--
2.16.4