[libreoffice] 01/01: add conditional to disable the systray quickstarter but keep it enabled for now
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit c2da11a6019d76eb42156168e08bfa3fda17dee9
Author: Rene Engelhard <rene@debian.org>
Date: Sun Apr 3 14:32:36 2016 +0200
add conditional to disable the systray quickstarter but keep it enabled for now
---
changelog | 2 ++
control | 2 +-
control.in | 2 +-
rules | 10 ++++++++++
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 61d8cdc..246217d 100644
--- a/changelog
+++ b/changelog
@@ -29,6 +29,8 @@ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
- remove artificial disabling of glTF for armel and mips(el). Probably
still don't make sense but enable it for consistency (and because we
enable other stuff there which don't make sense that much either)
+ - add conditional to disable the systray quickstarter but keep it enabled
+ for now
-- Rene Engelhard <rene@debian.org> Sat, 02 Apr 2016 12:48:35 +0200
diff --git a/control b/control
index 7b67e01..a2cd50b 100644
--- a/control
+++ b/control
@@ -254,7 +254,7 @@ Description: office productivity suite (metapackage)
* mythes-*: Thesauri for the use with LibreOffice
* hyphen-*: Hyphenation patterns for LibreOffice
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
- QuickStarter for GNOMEs notification are
+ QuickStarter for GNOMEs notification area
* libreoffice-gnome: GIO backend
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
diff --git a/control.in b/control.in
index dbc4d1c..265c082 100644
--- a/control.in
+++ b/control.in
@@ -92,7 +92,7 @@ Description: office productivity suite (metapackage)
* mythes-*: Thesauri for the use with LibreOffice
* hyphen-*: Hyphenation patterns for LibreOffice
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
- QuickStarter for GNOMEs notification are
+ QuickStarter for GNOMEs notification area
* libreoffice-gnome: GIO backend
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
diff --git a/rules b/rules
index fa2a91f..be0a78b 100755
--- a/rules
+++ b/rules
@@ -372,6 +372,7 @@ else
endif
ENABLE_SDBC_POSTGRESQL=y
BUILD_GTK=y
+ENABLE_SYSTRAY=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
#endif
@@ -1342,6 +1343,9 @@ else
CONFIGURE_FLAGS+= --disable-gtk3
GNOME_GTK_DEPENDS += libreoffice-gtk
endif
+ifeq "$(ENABLE_SYSTRAY)" "n"
+ CONFIGUREF_FLAGS += --disable-systray
+endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
@@ -2257,10 +2261,12 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(BUILD_GTK)" "y"
+ ifeq "$(ENABLE_SYSTRAY)" "y"
# Gtk quickstarter, so to -gtk (via -gnome)
mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/share/xdg
mv $(PKGDIR)-common/$(OODIR)/share/xdg/qstart.desktop \
$(PKGDIR)-gnome/$(OODIR)/share/xdg
+ endif
endif
ifeq "$(PACKAGE_SDK)" "y"
@@ -2581,7 +2587,9 @@ endif
mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-open-url $(PKGDIR)-gnome/$(OODIR)/program
ifeq "$(BUILD_GTK)" "y"
mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
+ ifeq "$(ENABLE_SYSTRAY)" "y"
mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
+ endif
ifeq "$(ENABLE_GIO)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
@@ -2635,7 +2643,9 @@ endif
for i in writer calc impress draw math base; do \
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/$(OODIR)/share/xdg/$$i.desktop; \
done
+ ifeq "$(ENABLE_SYSTRAY)" "y"
perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
+ endif
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: