Repository.mk | 22 ++++++----------------
configure.ac | 3 ++-
vcl/Module_vcl.mk | 24 +-----------------------
3 files changed, 9 insertions(+), 40 deletions(-)
New commits:
commit df37e6e98053d2f4a9f179c21a276c56dc3a90d9
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Mon Jan 3 10:33:27 2022 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Mon Jan 3 22:48:28 2022 +0100
Drop / merge some Haiku special build cases
Just don't test gtk3, so it's also not enabled. This way we can
also rename the kde install module to haiku on demand.
The kf5be1 is kept kde-only; no idea if that is intentional.
Change-Id: Id93b15fc6057a50da59efd655e1fc7d5f416c6de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127894
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/Repository.mk b/Repository.mk
index 812d47dc18df..bb3c995ddaa2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -292,32 +292,22 @@ $(eval $(call
gb_Helper_register_plugins_for_install,OOOLIBS,gnome, \
$(if $(ENABLE_GTK4),vclplug_gtk4) \
))
+gb_haiku_or_kde := $(if $(filter HAIKU,$(OS)),haiku,kde)
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
- $(if $(ENABLE_KF5),kf5be1) \
+ $(if $(ENABLE_KF5),kf5be1) \
))
-ifneq (,$(USING_X11))
-$(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,kde, \
+$(eval $(call
gb_Helper_register_plugins_for_install,OOOLIBS,$(gb_haiku_or_kde), \
$(if $(ENABLE_KF5),vclplug_kf5) \
$(if $(ENABLE_QT5),vclplug_qt5) \
$(if $(ENABLE_QT6),vclplug_qt6) \
$(if $(ENABLE_GTK3_KDE5),vclplug_gtk3_kde5) \
))
-endif
-ifneq ($(ENABLE_GTK3_KDE5),)
-$(eval $(call gb_Helper_register_executables_for_install,OOO,kde, \
- lo_kde5filepicker \
+$(eval $(call
gb_Helper_register_executables_for_install,OOO,$(gb_haiku_or_kde), \
+ $(if $(ENABLE_GTK3_KDE5),lo_kde5filepicker) \
))
-endif
-
-ifeq ($(OS),HAIKU)
-$(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,haiku, \
- $(if $(ENABLE_QT5),vclplug_qt5) \
- $(if $(ENABLE_QT6),vclplug_qt6) \
- $(if $(ENABLE_KF5),vclplug_kf5) \
-))
-endif
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,math, \
sm \
diff --git a/configure.ac b/configure.ac
index 595a0125e44b..50a954a4ddad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1094,6 +1094,7 @@ linux-android*)
haiku*)
using_freetype_fontconfig=yes
using_x11=no
+ test_gtk3=no
test_gtk3_kde5=no
test_kf5=yes
enable_odk=no
@@ -1638,7 +1639,7 @@ AC_ARG_ENABLE(python,
libo_FUZZ_ARG_ENABLE(gtk3,
AS_HELP_STRING([--disable-gtk3],
[Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+
3.0 is available.]),
-,test "${enable_gtk3+set}" = set || enable_gtk3=yes)
+,test "${test_gtk3}" = no -o "${enable_gtk3+set}" = set || enable_gtk3=yes)
AC_ARG_ENABLE(gtk4,
AS_HELP_STRING([--enable-gtk4],
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 6b15c775b6f0..22536d89af42 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
Package_fontunxppds \
Package_fontunxpsprint \
))
+endif
ifneq ($(ENABLE_GTK3),)
$(eval $(call gb_Module_add_targets,vcl,\
@@ -107,7 +108,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
Executable_lo_kde5filepicker \
))
endif
-endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,vcl,\
@@ -123,28 +123,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
))
endif
-ifeq ($(OS),HAIKU)
-ifneq ($(ENABLE_QT5),)
-$(eval $(call gb_Module_add_targets,vcl,\
- CustomTarget_qt5_moc \
- Library_vclplug_qt5 \
-))
-endif
-ifneq ($(ENABLE_QT6),)
-$(eval $(call gb_Module_add_targets,vcl,\
- CustomTarget_qt6_moc \
- Library_vclplug_qt6 \
-))
-endif
-
-ifneq ($(ENABLE_KF5),)
-$(eval $(call gb_Module_add_targets,vcl,\
- CustomTarget_kf5_moc \
- Library_vclplug_kf5 \
-))
-endif
-endif
-
ifneq (,$(filter FUZZERS,$(BUILD_TYPE)))
$(eval $(call gb_Module_add_targets,vcl,\
CustomTarget_nativecore \
