sysui/CustomTarget_share.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 8d69d9568de04e2b1c0d86e126afb77b9998012a
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Aug 6 08:17:47 2019 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Aug 7 09:05:25 2019 +0200
Drop dead dependencies
...after 634844354ee6ed884128086a80c3ee32c889d8c9 "sysui: fix rpm errors in
freedesktop-menus (4.14.1)" had moved the INTROSPECTION_SCANNER-related
code out
of sysui/desktop/share/create_tree.sh.
Change-Id: Id6208b92abca57ed93f20602619525556c6962b3
Reviewed-on: https://gerrit.libreoffice.org/77078
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 231aa4ff930d..8af5d6664f7c 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -161,7 +161,7 @@ $(share_WORKDIR)/%/openoffice.sh:
$(share_SRCDIR)/share/openoffice.sh
$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh \
$(share_WORKDIR)/%/openoffice.org.xml
$(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \
- $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist $(if
$(INTROSPECTION_SCANNER),$(call gb_Library_get_target,libreofficekitgtk))
+ $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist
mkdir -p $(dir $@)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1)
echo "#!/bin/sh" > $@
@@ -170,7 +170,6 @@ $(share_WORKDIR)/%/create_tree.sh:
$(share_SRCDIR)/share/create_tree.sh \
echo "ICON_SOURCE_DIR=$(SRCDIR)/sysui/desktop/icons" >> $@
echo "APPDATA_SOURCE_DIR=$(SRCDIR)/sysui/desktop/appstream-appdata" >>
$@
echo "PRODUCTVERSION=$(PRODUCTVERSION)" >> $@
- echo "INTROSPECTION_SCANNER=$(INTROSPECTION_SCANNER)" >> $@
cat $< >> $@
chmod 774 $@
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
