[libreoffice] add 0001-correctly-build-GTK-systray-icon.patch

[Caolan McNamara]

commit cd34bce0663b9e30f33f067570ba5a203f6c2106
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 20 11:59:03 2011 +0100

    add 0001-correctly-build-GTK-systray-icon.patch

 0001-correctly-build-GTK-systray-icon.patch |   68 +++++++++++++++++++++++++++
 libreoffice.spec                            |    2 +
 2 files changed, 70 insertions(+), 0 deletions(-)
---
diff --git a/0001-correctly-build-GTK-systray-icon.patch b/0001-correctly-build-GTK-systray-icon.patch
new file mode 100644
index 0000000..102cf33
--- /dev/null
+++ b/0001-correctly-build-GTK-systray-icon.patch
@@ -0,0 +1,68 @@
+From 0a5a7727e34787b7f1ee6e1e5e07aeb13bdf9ed5 Mon Sep 17 00:00:00 2001
+From: Robert Nagy <robert at openbsd.org>
+Date: Mon, 20 Jun 2011 11:43:55 +0200
+Subject: [PATCH 1/2] correctly build GTK systray icon
+
+the setting was lost during move the GNU make
+
+Signed-off-by:    Petr Mladek <pmladek at suse.cz>
+---
+ sfx2/Library_qstart.mk            |    7 +++++++
+ sfx2/Library_sfx.mk               |    9 +++++++++
+ sfx2/source/appl/shutdownicon.cxx |    2 +-
+ 3 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
+index 0709f60..e46a581 100755
+--- a/sfx2/Library_qstart.mk
++++ b/sfx2/Library_qstart.mk
+@@ -44,6 +44,13 @@ $(eval $(call gb_Library_set_defs,qstart_gtk,\
+     -DENABLE_QUICKSTART_APPLET \
+ ))
+ 
++ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
++$(eval $(call gb_Library_set_defs,qstart_gtk,\
++    $$(DEFS) \
++    -DENABLE_SYSTRAY_GTK \
++))
++endif
++
+ $(eval $(call gb_Library_set_cflags,qstart_gtk,\
+     $$(CFLAGS) \
+     $(filter-out -I%,$(GTK_CFLAGS)) \
+diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
+index 4d2396b..c9ec52c 100755
+--- a/sfx2/Library_sfx.mk
++++ b/sfx2/Library_sfx.mk
+@@ -56,6 +56,15 @@ $(eval $(call gb_Library_set_defs,sfx,\
+     -DSFX2_DLLIMPLEMENTATION \
+ ))
+ 
++ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
++$(eval $(call gb_Library_set_defs,sfx,\
++    $$(DEFS) \
++    -DENABLE_QUICKSTART_APPLET \
++    -DENABLE_SYSTRAY_GTK \
++    -DPLUGIN_NAME=libqstart_gtk$(gb_Library_OOOEXT) \
++))
++endif
++
+ $(eval $(call gb_Library_add_linked_libs,sfx,\
+     comphelper \
+     cppu \
+diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
+index 36dd915..6cab935 100644
+--- a/sfx2/source/appl/shutdownicon.cxx
++++ b/sfx2/source/appl/shutdownicon.cxx
+@@ -90,7 +90,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
+ # endif
+ #endif
+ 
+-#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
++#if defined(UNX) && defined(ENABLE_SYSTRAY_GTK) && !defined(PLUGIN_NAME)
+ #define PLUGIN_NAME "libqstart_gtkli.so"
+ #endif
+ 
+-- 
+1.7.5.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 97d367a..5f9e738 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -104,6 +104,7 @@ Patch17: 0001-Related-rhbz-652604-better-survive-exceptions-thrown.patch
 Patch18: 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
 Patch19: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
 Patch20: 0001-Related-rhbz-711087-band-aid.patch
+Patch21: 0001-correctly-build-GTK-systray-icon.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -725,6 +726,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch18 -p1 -b .rhbz713154-pdf-export-dialog-too-tall-to-f.patch
 %patch19 -p1 -b .rhbz702833-addEventListener-without-removeE.patch
 %patch20 -p1 -b .rhbz711087-band-aid.patch
+%patch21 -p1 -b .correctly-build-GTK-systray-icon.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings