|
 |
cd34bce |
From 0a5a7727e34787b7f1ee6e1e5e07aeb13bdf9ed5 Mon Sep 17 00:00:00 2001
|
|
|
cd34bce |
From: Robert Nagy <robert@openbsd.org>
|
|
|
cd34bce |
Date: Mon, 20 Jun 2011 11:43:55 +0200
|
|
|
cd34bce |
Subject: [PATCH 1/2] correctly build GTK systray icon
|
|
|
cd34bce |
|
|
|
cd34bce |
the setting was lost during move the GNU make
|
|
|
cd34bce |
|
|
|
cd34bce |
Signed-off-by: Petr Mladek <pmladek@suse.cz>
|
|
|
cd34bce |
---
|
|
|
cd34bce |
sfx2/Library_qstart.mk | 7 +++++++
|
|
|
cd34bce |
sfx2/Library_sfx.mk | 9 +++++++++
|
|
|
cd34bce |
sfx2/source/appl/shutdownicon.cxx | 2 +-
|
|
|
cd34bce |
3 files changed, 17 insertions(+), 1 deletions(-)
|
|
|
cd34bce |
|
|
|
cd34bce |
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
|
|
|
cd34bce |
index 0709f60..e46a581 100755
|
|
|
cd34bce |
--- a/sfx2/Library_qstart.mk
|
|
|
cd34bce |
+++ b/sfx2/Library_qstart.mk
|
|
|
cd34bce |
@@ -44,6 +44,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\
|
|
|
cd34bce |
-DENABLE_QUICKSTART_APPLET \
|
|
|
cd34bce |
))
|
|
|
cd34bce |
|
|
|
cd34bce |
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
|
|
|
cd34bce |
+$(eval $(call gb_Library_set_defs,qstart_gtk,\
|
|
|
cd34bce |
+ $$(DEFS) \
|
|
|
cd34bce |
+ -DENABLE_SYSTRAY_GTK \
|
|
|
cd34bce |
+))
|
|
|
cd34bce |
+endif
|
|
|
cd34bce |
+
|
|
|
cd34bce |
$(eval $(call gb_Library_set_cflags,qstart_gtk,\
|
|
|
cd34bce |
$$(CFLAGS) \
|
|
|
cd34bce |
$(filter-out -I%,$(GTK_CFLAGS)) \
|
|
|
cd34bce |
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
|
|
|
cd34bce |
index 4d2396b..c9ec52c 100755
|
|
|
cd34bce |
--- a/sfx2/Library_sfx.mk
|
|
|
cd34bce |
+++ b/sfx2/Library_sfx.mk
|
|
|
cd34bce |
@@ -56,6 +56,15 @@ $(eval $(call gb_Library_set_defs,sfx,\
|
|
|
cd34bce |
-DSFX2_DLLIMPLEMENTATION \
|
|
|
cd34bce |
))
|
|
|
cd34bce |
|
|
|
cd34bce |
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
|
|
|
cd34bce |
+$(eval $(call gb_Library_set_defs,sfx,\
|
|
|
cd34bce |
+ $$(DEFS) \
|
|
|
cd34bce |
+ -DENABLE_QUICKSTART_APPLET \
|
|
|
cd34bce |
+ -DENABLE_SYSTRAY_GTK \
|
|
|
cd34bce |
+ -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
|
|
|
cd34bce |
+))
|
|
|
cd34bce |
+endif
|
|
|
cd34bce |
+
|
|
|
cd34bce |
$(eval $(call gb_Library_add_linked_libs,sfx,\
|
|
|
cd34bce |
comphelper \
|
|
|
cd34bce |
cppu \
|
|
|
cd34bce |
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
|
|
|
cd34bce |
index 36dd915..6cab935 100644
|
|
|
cd34bce |
--- a/sfx2/source/appl/shutdownicon.cxx
|
|
|
cd34bce |
+++ b/sfx2/source/appl/shutdownicon.cxx
|
|
|
cd34bce |
@@ -90,7 +90,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
|
|
|
cd34bce |
# endif
|
|
|
cd34bce |
#endif
|
|
|
cd34bce |
|
|
|
cd34bce |
-#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
|
|
|
cd34bce |
+#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) && !defined(PLUGIN_NAME)
|
|
|
cd34bce |
#define PLUGIN_NAME "libqstart_gtkli.so"
|
|
|
cd34bce |
#endif
|
|
|
cd34bce |
|
|
|
cd34bce |
--
|
|
|
cd34bce |
1.7.5.4
|
|
|
cd34bce |
|