[spatialite-gui] 01/04: Add patch to fix FTBFS with OpenJPEG 2.3.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository spatialite-gui.

commit dccb971aa614320fa0850f88e0f647e39258a65a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 18 16:50:06 2017 +0200

    Add patch to fix FTBFS with OpenJPEG 2.3.
---
 debian/changelog                |  6 ++++++
 debian/patches/openjp-2.3.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index da69b13..18b04d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spatialite-gui (2.0.0~devel2-7) UNRELEASED; urgency=medium
+
+  * Add patch to fix FTBFS with OpenJPEG 2.3.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Oct 2017 16:49:55 +0200
+
 spatialite-gui (2.0.0~devel2-6) unstable; urgency=medium
 
   * Change priority from extra to optional.
diff --git a/debian/patches/openjp-2.3.patch b/debian/patches/openjp-2.3.patch
new file mode 100644
index 0000000..a989f9d
--- /dev/null
+++ b/debian/patches/openjp-2.3.patch
@@ -0,0 +1,35 @@
+Description: Add support for OpenJPEG 2.3.
+Author: Bas Couwennberg <sebastic at debian.org>
+
+--- a/config.h.in
++++ b/config.h.in
+@@ -103,6 +103,9 @@
+ /* Define to 1 if you have the <openjpeg-2.2/openjpeg.h> header file. */
+ #undef HAVE_OPENJPEG_2_2_OPENJPEG_H
+ 
++/* Define to 1 if you have the <openjpeg-2.3/openjpeg.h> header file. */
++#undef HAVE_OPENJPEG_2_3_OPENJPEG_H
++
+ /* Define to 1 if you have the <sqlite3ext.h> header file. */
+ #undef HAVE_SQLITE3EXT_H
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -200,13 +200,16 @@ AC_ARG_ENABLE(openjpeg, [AS_HELP_STRING(
+     # they could be either on -/include/openjpeg-2.0
+     #                   or on -/include/openjpeg-2.1
+     #                   or on -/include/openjpeg-2.2
++    #                   or on -/include/openjpeg-2.3
+     #
+     AC_CHECK_HEADERS(openjpeg-2.0/openjpeg.h)
+     AC_CHECK_HEADERS(openjpeg-2.1/openjpeg.h)
+     AC_CHECK_HEADERS(openjpeg-2.2/openjpeg.h)
++    AC_CHECK_HEADERS(openjpeg-2.3/openjpeg.h)
+     if test x"$ac_cv_header_openjpeg_2_0_openjpeg_h" != x"yes" &&
+         test x"$ac_cv_header_openjpeg_2_1_openjpeg_h" != x"yes" &&
+-        test x"$ac_cv_header_openjpeg_2_2_openjpeg_h" != x"yes";
++        test x"$ac_cv_header_openjpeg_2_2_openjpeg_h" != x"yes" &&
++        test x"$ac_cv_header_openjpeg_2_3_openjpeg_h" != x"yes";
+     then
+         AC_MSG_ERROR(['OpenJpeg-2' is required but the header (openjpeg.h) doesn't seem to be installed on this system])
+     fi 
diff --git a/debian/patches/series b/debian/patches/series
index 322ec8d..f0130d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ desktop-file.patch
 install-icons.patch
 install-icons2.patch
 openjp-2.2.patch
+openjp-2.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-gui.git