Add 10-lower-requirement-on-cairo-egl.diff to deal with the “want cairo from git” requirement.

3 files changed, 17 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 2319405..46b2908 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 wayland-demos (0.1.0~0-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #630809).
+  * Add 10-lower-requirement-on-cairo-egl.diff to deal with the “want
+    cairo from git” requirement.
   * Work around possible libegl1-mesa-dev bug (missing dependency on
     libegl1-mesa-drivers).
   * Use explicit dependencies on the egl1/gles2 packages.
diff --git a/debian/patches/10-lower-requirement-on-cairo-egl.diff b/debian/patches/10-lower-requirement-on-cairo-egl.diff
new file mode 100644
index 0000000..ee675fb
--- /dev/null
+++ b/debian/patches/10-lower-requirement-on-cairo-egl.diff
@@ -0,0 +1,14 @@
+Currently 1.11.3 is just a way to say “we need patches past 1.11.2”,
+but those patches have been merged into the 1.11.2 Debian package
+(see #630811), so lower the build requirement accordingly.
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,7 +88,7 @@ if test x$enable_clients == xyes; then
+ 
+   PKG_CHECK_MODULES(POPPLER, [poppler-glib gdk-2.0 gio-2.0],
+ 			     [have_poppler=yes], [have_poppler=no])
+-  PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl >= 1.11.3],
++  PKG_CHECK_MODULES(CAIRO_EGL, [cairo-egl >= 1.11.2],
+ 		    [have_cairo_egl=yes], [have_cairo_egl=no])
+   AS_IF([test "x$have_cairo_egl" = "xyes"],
+         [AC_DEFINE([HAVE_CAIRO_EGL], [1], [Have cairo-egl])])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3bff875
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+10-lower-requirement-on-cairo-egl.diff