diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-02 20:05:01 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-02 20:05:01 +0000 |
| commit | 3ec77a0454605631ccd5be188c36317dadab23fa (patch) | |
| tree | 845ffbc4f632b8da7445986f67476ea302b9aa25 /sci-geosciences/mapserver | |
| parent | Marked ~x64-freebsd (diff) | |
| download | gentoo-2-3ec77a0454605631ccd5be188c36317dadab23fa.tar.gz gentoo-2-3ec77a0454605631ccd5be188c36317dadab23fa.tar.bz2 gentoo-2-3ec77a0454605631ccd5be188c36317dadab23fa.zip | |
Fix undefined errors in php code.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences/mapserver')
| -rw-r--r-- | sci-geosciences/mapserver/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch | 23 | ||||
| -rw-r--r-- | sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild | 5 |
3 files changed, 31 insertions, 3 deletions
diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog index bb93e7287408..9bd6ab72c87a 100644 --- a/sci-geosciences/mapserver/ChangeLog +++ b/sci-geosciences/mapserver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-geosciences/mapserver # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.35 2011/05/02 19:53:02 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.36 2011/05/02 20:05:01 scarabeus Exp $ + + 02 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + +files/6.0.0_rc1-bool.patch, mapserver-6.0.0_rc1.ebuild: + Fix undefined errors in php code. 02 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> mapserver-6.0.0_rc1.ebuild: diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch new file mode 100644 index 000000000000..8016961b515b --- /dev/null +++ b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch @@ -0,0 +1,23 @@ +diff -urN mapserver-6.0.0-rc1.old/mapscript/php/bool.h mapserver-6.0.0-rc1/mapscript/php/bool.h +--- mapserver-6.0.0-rc1.old/mapscript/php/bool.h 1970-01-01 01:00:00.000000000 +0100 ++++ mapserver-6.0.0-rc1/mapscript/php/bool.h 2011-05-02 22:00:00.000000000 +0200 +@@ -0,0 +1,8 @@ ++#ifndef BOOL_H ++#define BOOL_H ++ ++#define bool_t int ++#define TRUE 1 ++#define FALSE 0 ++ ++#endif /* BOOL_H */ +diff -urN mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h +--- mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h 2011-05-02 12:10:03.000000000 +0200 ++++ mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h 2011-05-02 22:00:11.000000000 +0200 +@@ -32,6 +32,7 @@ + #ifndef PHP_MAPSCRIPT_H + #define PHP_MAPSCRIPT_H + ++#include "bool.h" + #include "php.h" + #include "zend_interfaces.h" + #include "php_mapscript_util.h" diff --git a/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild b/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild index 26688329b87a..3f3f1fbdae4a 100644 --- a/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild +++ b/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.8 2011/05/02 19:53:02 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0_rc1.ebuild,v 1.9 2011/05/02 20:05:01 scarabeus Exp $ EAPI=3 @@ -100,7 +100,8 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" + epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \ + "${FILESDIR}/6.0.0_rc1-bool.patch" eautoreconf } |