[libreoffice] 02/03: keep gnome depending on -gtk
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 04251fe899719db506447bc5d8a17adc1961674c
Author: Rene Engelhard <rene@debian.org>
Date: Mon Oct 12 22:53:24 2015 +0200
keep gnome depending on -gtk
---
changelog | 3 ++-
rules | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 04868d4..0a226bc 100644
--- a/changelog
+++ b/changelog
@@ -19,7 +19,8 @@ libreoffice (1:5.1.0~alpha1~git20151012-1) UNRELEASED; urgency=medium
- package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
- move liblibreofficekitgtk.so into -gtk3 as it's for Gtk3 now
* debian/rules:
- - gtk3 is on per default now (closes: #799399, #681180)
+ - gtk3 is on per default now (closes: #799399). Keep -gnome depending on
+ -gtk as gtk3 crashes e.g. on "Save as..."
- disable the tests for now
- also disable the wiki publisher on gcj builds; uses Java 6+ stuff; make
-wiki-publisher depend on >= Java 6
diff --git a/rules b/rules
index 545020f..b384a11 100755
--- a/rules
+++ b/rules
@@ -1312,7 +1312,9 @@ ifeq "$(BUILD_GTK3)" "y"
ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
$(error GTK3 build fails without system-cairo!!)
endif
- GNOME_GTK_DEPENDS += libreoffice-gtk3
+ # still crashes. Also at "Save as..." ....
+ #GNOME_GTK_DEPENDS += libreoffice-gtk3
+ GNOME_GTK_DEPENDS += libreoffice-gtk
ifeq "$(ENABLE_INTROSPECTION)" "y"
BUILD_DEPS += , gobject-introspection (>= 1.32.0), libgirepository1.0-dev (>= 1.32)
else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: