scp2/InstallScript_setup_osl.mk | 2 +-
scp2/Module_scp2.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6f28259479d28570dbb7258531bfe264d03da1fc
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Tue Jun 5 08:29:21 2018 +0200
Build kde-integration for '--enable-gtk3-kde5' as well
The relevant files ('libvclplug_gtk3_kde5lo.so',
'lo_kde5filepicker') resulting from the '--enable-gtk3-kde5'
build option are put into the kde-integration package
(e.g. a Debian package when the '--with-package-format=deb'
option is given).
However, so far that package was only created at all when
one of the options '--enable-kde4', '--enable-qt5' or
'--enable-kde5' was given in addition.
Since those are not needed for the gtk3_kde5 vclplug, also
build the kde-integration when none of the others is
built in addition.
Reviewed-on: https://gerrit.libreoffice.org/55310
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
(cherry picked from commit f971bdb026735fdecd777d0d2edc515124f9e822)
Conflicts:
scp2/InstallScript_setup_osl.mk
scp2/Module_scp2.mk
Change-Id: I86eb71ac7879c7226c9eaa89774b68125212a75c
Reviewed-on: https://gerrit.libreoffice.org/55738
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index ca9f4cfe3c9d..7a6c550763af 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK)
$(ENABLE_GTK3)),\
scp2/gnome \
) \
- $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_KDE5)),\
+ $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_KDE5) $(ENABLE_GTK3_KDE5)),\
scp2/kde \
) \
$(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 63204839f2b7..87b45f501a73 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
$(if $(filter TRUE,$(ENABLE_EVOAB2) $(ENABLE_GIO) $(ENABLE_GTK)
$(ENABLE_GTK3)),\
InstallModule_gnome \
) \
- $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_KDE5)),\
+ $(if $(filter TRUE,$(ENABLE_KDE4) $(ENABLE_KDE5) $(ENABLE_GTK3_KDE5)),\
InstallModule_kde \
) \
$(if $(filter TRUE,$(ENABLE_TDE)),\
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
