strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built

Browse source 
Since

    commit 894450d6eb
    Author: Michael Weghorn <m.weghorn@posteo.de>
    Date:   Tue Sep 28 08:36:44 2021 +0200

        Unify how Qt/KF build flags/libs are set

the qt5/kf5 externals are used to set includes and
compiler/linker flags for the gtk3_kde5 VCL plugin
as well.

However, the relevant link targets were only actually
defined as needed when building the qt5 and kf5 VCL plugins
was enabled as well.
Adapt that so that building the gtk3_kde5 VCL plugin
but not the qt5 and kf5 ones also works again
(e.g. '--enable-gtk3-kde5 --disable-qt5 --disable-kf5').

Change-Id: I65b75d7c2ccab71eade01aa2529fb45174056701
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129022
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn 2022-01-27 08:17:54 +00:00
parent 0101c7918b
commit 5801b9fc65
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RepositoryExternal.mk
View file

@ -2979,7 +2979,7 @@ endef # gb_LinkTarget__use_postgresql
endif # !SYSTEM_POSTGRESQL
ifeq ($(ENABLE_KF5),TRUE)
ifneq (,$(filter TRUE,$(ENABLE_KF5)$(ENABLE_GTK3_KDE5)))
define gb_LinkTarget__use_kf5
$(call gb_LinkTarget_set_include,$(1),\
@ -3007,7 +3007,7 @@ endif # ENABLE_KF5
ifeq ($(ENABLE_QT5),TRUE)
ifneq (,$(filter TRUE,$(ENABLE_QT5)$(ENABLE_GTK3_KDE5)))
define gb_LinkTarget__use_qt5
$(call gb_LinkTarget_set_include,$(1),\