[libreoffice] 01/02: lower the system epoxy requirement

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 7232d5a2d5a697291bf59dc57da402df68e95176
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 20 14:07:10 2016 +0100

    lower the system epoxy requirement
---
 control                                |  2 +-
 patches/change-from-glew-to-epoxy.diff | 23 +++++++++++++++++++++++
 rules                                  |  2 +-
 tests/control                          |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/control b/control
index 63128e0..1bae67c 100644
--- a/control
+++ b/control
@@ -61,7 +61,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libe-book-dev,
                libebook1.2-dev,
                libeot-dev,
-               libepoxy-dev (>= 1.3.1),
+               libepoxy-dev (>= 1.2),
                libetonyek-dev,
                libexpat1-dev,
                libexttextcat-dev (>= 3.4.1),
diff --git a/patches/change-from-glew-to-epoxy.diff b/patches/change-from-glew-to-epoxy.diff
index 8e99398..7166c69 100644
--- a/patches/change-from-glew-to-epoxy.diff
+++ b/patches/change-from-glew-to-epoxy.diff
@@ -2242,3 +2242,26 @@ index 62cb35e..e36dbd4 100644
 -- 
 cgit v0.10.2
 
+From d0c3dba866ba0900dcaf2c3a25200edb516bd608 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 20 Dec 2016 11:11:32 +0000
+Subject: lower the system epoxy requirement
+
+Change-Id: I2fff46985502dafa3b860aaebe862853ebaccabb
+
+diff --git a/configure.ac b/configure.ac
+index 14e4af0..c45c44a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11710,7 +11710,7 @@ AC_SUBST(CAIRO_LIBS)
+ dnl ===================================================================
+ dnl Check for system epoxy
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.3.1], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])
++libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.2], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])
+ if test "$with_system_epoxy" = "no"; then
+     AC_CHECK_LIB(EGL, eglMakeCurrent, [:], AC_MSG_ERROR([libEGL required.]))
+ fi
+-- 
+cgit v0.10.2
+
diff --git a/rules b/rules
index edf84c6..bc9e100 100755
--- a/rules
+++ b/rules
@@ -1434,7 +1434,7 @@ ifneq (,$(filter redland, $(SYSTEM_STUFF)))
 endif
 
 ifneq (,$(filter epoxy, $(SYSTEM_STUFF)))
-	BUILD_DEPS += , libepoxy-dev (>= 1.3.1)
+	BUILD_DEPS += , libepoxy-dev (>= 1.2)
 endif
 ifneq (,$(filter glm, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libglm-dev (>= 0.9.6.3)
diff --git a/tests/control b/tests/control
index 6c74e1f..c76850a 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, 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 , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) , libpcre3-dev , libcol [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, 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 , opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) , libpcre3-dev , libcol [...]
 
 Tests: pyuno-import
 Depends: python3-uno

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git