Hi, On Thu, Sep 17, 2015 at 12:45:29PM +0200, Chris Halls wrote: > > What about the attached patch? > > Which patch do you mean?
The one I forgot to attach ;) Now done. > We could maybe enable gtk3 for experimental only builds of 5.1. That > way, it wouldn't affect backports or people trying to use unstable as > their main desktop. Yeah, that is done anyway. > > P.S.: Want back into Uploaders:? ;) > > :) > > Thought you'd never ask! You could have added yourself back; you still have commit rights afaics. I just removed you because you were inactive, not because I didn't want you on board :) Regards, Rene
>From 56753de10ab5b96df58abe374ee32ac9f085bf3e Mon Sep 17 00:00:00 2001 From: Rene Engelhard <[email protected]> Date: Thu, 17 Sep 2015 12:48:44 +0200 Subject: [PATCH] disable gtk3 and make -gnome depend on gtk again --- changelog | 11 +++++++++++ control | 4 +--- control.in | 2 +- rules | 5 ++++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/changelog b/changelog index 8e2d22d..d231665 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,14 @@ +libreoffice (1:5.0.1-2) unstable; urgency=medium + + * debian/rules: + - disable gtk3 for now again, too shaky + (closes: #799251, #799049, #795131) + * debian/control.in, debian/rules: + - make -gnome depend on -gtk when gtk3 is disabled + (reopens: #681180) + + -- Rene Engelhard <[email protected]> Thu, 17 Sep 2015 12:35:30 +0200 + libreoffice (1:5.0.1-1) unstable; urgency=medium * LibreOffice 5.0.1 final (identical to rc2) diff --git a/control b/control index 79df927..e4c4c8d 100644 --- a/control +++ b/control @@ -72,7 +72,6 @@ Build-Depends: ant (>= 1.7.0), libgraphite2-dev (>= 0.9.3), libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, - libgtk-3-dev (>= 3.8~), libgtk2.0-dev (>= 2.10), libharfbuzz-dev (>= 0.9.18), libhsqldb1.8.0-java (>> 1.8.0.10), @@ -712,7 +711,7 @@ Package: libreoffice-gnome Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sparc Depends: gconf2, libreoffice-core (= ${binary:Version}), - libreoffice-gtk3, + ${gnome-gtk-depends}, ${misc:Depends}, ${shlibs:Depends} Suggests: libreoffice-evolution @@ -4419,7 +4418,6 @@ Depends: ant (>= 1.7.0), libgraphite2-dev (>= 0.9.3), libgstreamer-plugins-base1.0-dev, libgstreamer1.0-dev, - libgtk-3-dev (>= 3.8~), libgtk2.0-dev (>= 2.10), libharfbuzz-dev (>= 0.9.18), libhsqldb1.8.0-java (>> 1.8.0.10), diff --git a/control.in b/control.in index 80dff85..18c855a 100644 --- a/control.in +++ b/control.in @@ -546,7 +546,7 @@ Package: libreoffice-gnome Architecture: %OOO_ARCHS% Depends: gconf2, libreoffice-core (= ${binary:Version}), - libreoffice-gtk3, + ${gnome-gtk-depends}, ${misc:Depends}, ${shlibs:Depends} Suggests: libreoffice-evolution diff --git a/rules b/rules index ba7eb41..698b371 100755 --- a/rules +++ b/rules @@ -374,7 +374,7 @@ endif ENABLE_SDBC_POSTGRESQL=y BUILD_GTK=y #ifeq "$(DEB_DISTRIBUTION)" "experimental" -BUILD_GTK3=y +BUILD_GTK3=n #endif ENABLE_EVO2=y ENABLE_GVFS=n @@ -1294,8 +1294,10 @@ ifeq "$(BUILD_GTK3)" "y" ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF))) $(error GTK3 build fails without system-cairo!!) endif + GNOME_GTK_DEPENDS += libreoffice-gtk3 else DEBHELPER_OPTIONS+= -Nlibreoffice-gtk3 + GNOME_GTK_DEPENDS += libreoffice-gtk endif ifeq "$(ENABLE_EVO2)" "n" @@ -3326,6 +3328,7 @@ endif -V'avmedia-be-depends=$(AVMEDIA_BE_DEPENDS)' \ -V'dejavu-depends=$(DEJAVU_DEPENDS)' \ -V'opencl-sug=$(OPENCL_SUGGESTS)' \ + -V'gnome-gtk-depends=$(GNOME_GTK_DEPENDS)' \ -V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \ -v$(BINARY_VERSION) ifeq "$(ENABLE_JAVA)" "y" -- 2.5.1
