[spatialite-gui] 01/02: Add patch to fix FTBFS with OpenJPEG 2.2. (closes: #876809)

[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 f2c23f4fd40e75a33e117d518ffe2857a8580f19
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 26 13:55:37 2017 +0200

    Add patch to fix FTBFS with OpenJPEG 2.2. (closes: #876809)
---
 debian/changelog                |  2 ++
 debian/patches/openjp-2.2.patch | 72 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 75 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9ba0f90..b27bba3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ spatialite-gui (2.0.0~devel2-6) UNRELEASED; urgency=medium
 
   * Change priority from extra to optional.
   * Bump Standards-Version to 4.1.0, changes: priority.
+  * Add patch to fix FTBFS with OpenJPEG 2.2.
+    (closes: #876809)
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 24 Sep 2017 13:24:46 +0200
 
diff --git a/debian/patches/openjp-2.2.patch b/debian/patches/openjp-2.2.patch
new file mode 100644
index 0000000..c84dd6b
--- /dev/null
+++ b/debian/patches/openjp-2.2.patch
@@ -0,0 +1,72 @@
+Description: Add support for OpenJPEig 2.2.
+Author: Alessandro Furieri <a.furieri at lqt.it>
+Origin: https://www.gaia-gis.it/fossil/spatialite_gui/ci/161086f290f99151?sbs=1
+Bug: https://www.gaia-gis.it/fossil/spatialite_gui/tktview/9f29d71aa05c689e35d7dc70a79f00bc3e054cdb
+Bug-Debian: https://bugs.debian.org/876809
+
+--- a/config.h.in
++++ b/config.h.in
+@@ -100,6 +100,9 @@
+ /* Define to 1 if you have the <openjpeg-2.1/openjpeg.h> header file. */
+ #undef HAVE_OPENJPEG_2_1_OPENJPEG_H
+ 
++/* 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 <sqlite3ext.h> header file. */
+ #undef HAVE_SQLITE3EXT_H
+ 
+@@ -181,9 +184,6 @@
+ /* Should be defined in order to disable WebP support. */
+ #undef OMIT_WEBP
+ 
+-/* testing for OpenJpeg 2.1 */
+-#undef OPENJPEG_2_1
+-
+ /* Name of package */
+ #undef PACKAGE
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,8 +19,6 @@ AH_TEMPLATE([ENABLE_LIBXML2],
+             [Should be defined in order to enable LIBXML2 support.])
+ AH_TEMPLATE([OMIT_WEBP],
+             [Should be defined in order to disable WebP support.])
+-AH_TEMPLATE([OPENJPEG_2_1],
+-            [testing for OpenJpeg 2.1])
+ AH_TEMPLATE([OMIT_OPENJPEG],
+             [Should be defined in order to disable OpenJpeg support.])
+ AH_TEMPLATE([OMIT_CHARLS],
+@@ -201,28 +199,18 @@ AC_ARG_ENABLE(openjpeg, [AS_HELP_STRING(
+     # testing OpenJpeg-2 headers
+     # they could be either on -/include/openjpeg-2.0
+     #                   or on -/include/openjpeg-2.1
++    #                   or on -/include/openjpeg-2.2
+     #
+     AC_CHECK_HEADERS(openjpeg-2.0/openjpeg.h)
+     AC_CHECK_HEADERS(openjpeg-2.1/openjpeg.h)
++    AC_CHECK_HEADERS(openjpeg-2.2/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_1_openjpeg_h" != x"yes" &&
++        test x"$ac_cv_header_openjpeg_2_2_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 
+     AC_CHECK_LIB(openjp2,opj_create_decompress,,AC_MSG_ERROR(['libopenjp2' is required but it doesn't seems to be installed on this system.]),-lm)
+-    # testing for OpenJpeg 2.0 or 2.1
+-    AC_COMPILE_IFELSE(  [AC_LANG_PROGRAM([[#ifdef HAVE_OPENJPEG_2_1_OPENJPEG_H
+-                                       #include <openjpeg-2.1/openjpeg.h>
+-                                       #else
+-                                       #include <openjpeg-2.0/openjpeg.h>
+-                                       #endif]],
+-                                     [[void *d; opj_stream_t *s; opj_stream_set_user_data (s, &d, NULL);]])],
+-                    [
+-                      AC_MSG_RESULT([yes])
+-                      AC_DEFINE(OPENJPEG_2_1)
+-                    ],
+-                    [AC_MSG_RESULT([no])]
+-                 )
+ else
+   AC_DEFINE(OMIT_OPENJPEG)
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index e839450..322ec8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 desktop-file.patch
 install-icons.patch
 install-icons2.patch
+openjp-2.2.patch

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