From e441b3e87e83af2018bbbfd698fd701fe5624181 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Mon, 11 Apr 2016 09:56:23 +0200
Subject: don't install qstart.desktop if it's disabled (--disable-systray)

Conflicts:
	scp2/InstallModule_ooo.mk

Change-Id: I21a53381ad4018034de3833e8e244d0d7a7d28b8
---
 scp2/InstallModule_ooo.mk        | 1 +
 scp2/source/ooo/common_brand.scp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 91b11a3f836b..29f83a60db65 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 
 $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	ENABLE_GTK \
+	ENABLE_SYSTRAY_GTK \
 	ENABLE_MACOSX_SANDBOX \
 	ENABLE_NPAPI_FROM_BROWSER \
 	ENABLE_ONLINE_UPDATE \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index ff674f4cc31d..2072358993da 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -609,7 +609,7 @@ End
 #endif
 
 #if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
+#ifdef ENABLE_SYSTRAY_GTK
 File gid_Brand_File_Share_Xdg_QStart
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Xdg;
-- 
cgit