[mapserver] 06/09: Add patch to use include paths from php-config.

[Bas Couwenberg]

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

sebastic pushed a commit to branch osgeo/10.5
in repository mapserver.

commit bc59fbcf604fe6e5160fdd555e36418fd315a08a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 16 21:27:44 2017 +0100

    Add patch to use include paths from php-config.
---
 debian/changelog                   |  1 +
 debian/patches/php-mapscript.patch | 18 ++++++++++++++++++
 debian/patches/series              |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 745cbd8..5ae3a9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapserver (7.0.4-1~xenial1) UNRELEASED; urgency=medium
 
   * Update branch in gbp.conf & Vcs-Git URL.
   * Fix substvars for php5.6-mapscript package.
+  * Add patch to use include paths from php-config.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 16 Jan 2017 20:43:54 +0100
 
diff --git a/debian/patches/php-mapscript.patch b/debian/patches/php-mapscript.patch
new file mode 100644
index 0000000..560b933
--- /dev/null
+++ b/debian/patches/php-mapscript.patch
@@ -0,0 +1,18 @@
+Description: Use include paths from php-config when include path not found.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/mapserver/mapserver/pull/5370
+Applied-Upstream: https://github.com/mapserver/mapserver/commit/37a70fff4ab54f12619833414cb1995643f7a10d
+
+--- a/cmake/FindPHP5.cmake
++++ b/cmake/FindPHP5.cmake
+@@ -86,6 +86,10 @@ IF(PHP5_CONFIG_EXECUTABLE)
+ 
+   MESSAGE(STATUS ${PHP5_MAIN_INCLUDE_DIR})
+ 
++  IF(NOT PHP5_INCLUDE_PATH)
++    set(PHP5_INCLUDE_PATH ${PHP5_INCLUDES})
++  ENDIF(NOT PHP5_INCLUDE_PATH)
++
+   IF(PHP5_VERSION LESS 5)
+     MESSAGE(FATAL_ERROR "PHP version is not 5 or later")
+   ENDIF(PHP5_VERSION LESS 5)
diff --git a/debian/patches/series b/debian/patches/series
index 78cc1a1..2556c86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
 perl-mapscript-install.patch
 ruby-mapscript-install.patch
 java-hardening.patch
+php-mapscript.patch

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