[libreoffice] 01/02: (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure we build against 3.20
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 6bfb39e28058dd4667e428de7a9616ecc173e79e
Author: Rene Engelhard <rene@debian.org>
Date: Tue Apr 19 20:03:30 2016 +0200
(temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure we build against 3.20
---
changelog | 8 ++++++++
control | 2 +-
rules | 7 ++++++-
tests/control | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 22d8b7b..dad0b48 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:5.1.2-5) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure
+ we build against 3.20
+
+ -- Rene Engelhard <rene@debian.org> Tue, 19 Apr 2016 20:02:18 +0200
+
libreoffice (1:5.1.2-4) unstable; urgency=medium
* debian/patches/fix-list-and-comboboxes-with-gtk3-3-20-2.diff:
diff --git a/control b/control
index af21144..c0fdd77 100644
--- a/control
+++ b/control
@@ -78,7 +78,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
- libgtk-3-dev (>= 3.8~),
+ libgtk-3-dev (>= 3.20~),
libgtk2.0-dev (>= 2.10),
libharfbuzz-dev (>= 0.9.18),
libhsqldb1.8.0-java (>> 1.8.0.10) [!mips64],
diff --git a/rules b/rules
index 464f67b..38384e2 100755
--- a/rules
+++ b/rules
@@ -377,6 +377,11 @@ ENABLE_SYSTRAY=n
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
#endif
+ifneq "$(JESSIE_BACKPORT)" "y"
+GTK3_MINVER=3.20~
+else
+GTK3_MINVER=3.8~
+endif
ifeq "$(BUILD_GTK3)" "y"
ENABLE_INTROSPECTION=y
endif
@@ -1333,7 +1338,7 @@ else
BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
endif
ifeq "$(BUILD_GTK3)" "y"
- BUILD_DEPS += , libgtk-3-dev (>= 3.8~)
+ BUILD_DEPS += , libgtk-3-dev (>= $(GTK3_MINVER))
ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
$(error GTK3 build fails without system-cairo!!)
endif
diff --git a/tests/control b/tests/control
index ef97ae5..8922285 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: