RepositoryExternal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit e92dc76d9b7ec0105578c72d37d0ed2d85ef0140 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 27 08:17:54 2022 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jan 28 21:18:55 2022 +0100 Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built Since commit 894450d6ebbb2d5e063d72b971580d1b8c10a5e3 Author: Michael Weghorn <[email protected]> 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'). [NOTE: This backport for 7-3 also incorporates the follow-up fix commit ba67202007f37d228a813c0915fd630bc2ff177b Author: Michael Weghorn <[email protected]> Date: Thu Jan 27 15:16:47 2022 +0100 Fix up "Fix gtk3_kde5 build when qt5/kf5 VCL plugins are not built" ] Change-Id: I65b75d7c2ccab71eade01aa2529fb45174056701 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129022 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit 5801b9fc65508391e130670f79a9af51f18d4e96) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128965 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e63ab24dba27..4854a20aa050 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3105,7 +3105,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),\ @@ -3133,7 +3133,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),\
