backport patch from trunk, fixing macro definition (compile issue), see http://trac.osgeo.org/mapserver/ticket/3877

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 48 insertions, 5 deletions

diff --git a/sci-geosciences/mapserver/ChangeLog b/sci-geosciences/mapserver/ChangeLog
index a81f1767addb..957ebd60248d 100644
--- a/sci-geosciences/mapserver/ChangeLog
+++ b/sci-geosciences/mapserver/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2011/06/28 15:22:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/ChangeLog,v 1.42 2011/07/12 12:31:33 lxnay Exp $
+
+  12 Jul 2011; Fabio Erculiani <lxnay@gentoo.org>
+  +files/6.0.0-fix-mapunion-macro.patch, mapserver-6.0.0.ebuild:
+  backport patch from trunk, fixing macro definition (compile issue), see
+  http://trac.osgeo.org/mapserver/ticket/3877
 
   28 Jun 2011; Ole Markus With <olemarkus@gentoo.org> -mapserver-5.6.6.ebuild:
   Non-maintainer commit: Removing ebuild depending on older PHP versions. Bug
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
index 701edefd182a..4fa21e58ede5 100644
--- a/sci-geosciences/mapserver/Manifest
+++ b/sci-geosciences/mapserver/Manifest
@@ -1,9 +1,10 @@
 AUX 5.4.2-ldflags.patch 3851 RMD160 db486a2c5611b3bc9102ded21c3aa03f47f0dfe6 SHA1 7cef034f6d3a176934bbb9df957057309fe409be SHA256 518ebe8e12b590001571110d521939a44a1fc74d82cdc04d76f81943c99a5463
+AUX 6.0.0-fix-mapunion-macro.patch 1597 RMD160 b781077a11b4ae5914aedd5524d3ab824ed85005 SHA1 a58969758b14dff404c40123368f736bd82430e3 SHA256 3c35d90b70e868a58fad54594ae7ffcbbc2a3bf9c90b4e4d828ddb5612a8025e
 AUX 6.0.0_rc1-bool.patch 862 RMD160 0678d6fa9ccf74143601122b4d2b75fbed702322 SHA1 5f06f5ce26ca4d022be7840dff82cf36a0d1be9f SHA256 59ce6a605768fd849c33fbb7093802f2906315f9abe520b78a985891d39508a6
 AUX 6.0.0_rc1-ldflags.patch 3954 RMD160 33dc08159230f49070891ad6626548746324370a SHA1 35a72f6f03e47c31971503865f05d0a6dc9beb76 SHA256 09ec9d68eccc100a315c60527bd51623ff03caa7b4721434aedb972aa96aa3b7
 AUX 6.0.0_rc1-php_ldflags.patch 551 RMD160 88de8414b4d6ea8fbeb7c11c6ad4f3c673487175 SHA1 9914dca230858fea212983521b85aa5a719fa4b7 SHA256 50023a92811b2856bdb04d8e2d241c4e424c4b00557c1d70615a3940f664fd59
 AUX mapserver_tcl.patch-r1 1985 RMD160 bb4d766526f7c29535915bb87c0c5199251a2c3a SHA1 2415b6b792be100f2e5a6a936ef77260352f718b SHA256 725c7e5dd9dc6ae6372d9c4a334ce13fc8ea2ab6afbf569a6db786f2caa7a31f
 DIST mapserver-6.0.0.tar.gz 2435310 RMD160 b324df0181e23cf5af46f768af59f65acc13ff9e SHA1 4bbd8ef56aa1389de4c80b4776e00db538529367 SHA256 92709333665c4784f69b18d1a8e78dd80f87a66b5d490fd0e49ef2ba616bd9af
-EBUILD mapserver-6.0.0.ebuild 5876 RMD160 8051fea683fc4856854452b55bbb4a026916864c SHA1 82b8b44702d8eae19f858ac1f9d2c98630e4bee9 SHA256 b303d67d3d8573229afd9027a1a933f9ca4a9cecd6acff57f60ec7dcd8594742
-MISC ChangeLog 7757 RMD160 76e8eb3884cbbeb70fb8bfd1ac93a9a978a68171 SHA1 580ad37d254ce8cddd1a5121e4603918f9e0e47c SHA256 46ba31f058e1503cd6642964752cde5cd6fd4b6612e78c6aeccc49ddcda9363c
+EBUILD mapserver-6.0.0.ebuild 5921 RMD160 efd9c6d9fae4309c3c563a679a25873baf23662c SHA1 a90aaffecd674bfac6b45c840f54b181d415dac0 SHA256 10675c01229d0a42526345dbbe7dff82e511668969e0216d03c0d300c90842d2
+MISC ChangeLog 7989 RMD160 f15c2bbd56121194c1658c5bfd9a878b06b5225c SHA1 869bef68bf61e19c8a9c020d92103a8136ee3278 SHA256 4ad4760e8f54ff8eb88dac093ccc10512072e65f572102c0c78a3c6096e68e3d
 MISC metadata.xml 752 RMD160 336d701cfcb45e8d38e7d7be62910a3b92ef4e6b SHA1 268cb1d2aad5143713b52a2be77b44fb73d29553 SHA256 0e50fb47de44ad1fe80ff9473bc5f37927cfeeaa536809782fc17d5b3a7667a1
diff --git a/sci-geosciences/mapserver/files/6.0.0-fix-mapunion-macro.patch b/sci-geosciences/mapserver/files/6.0.0-fix-mapunion-macro.patch
new file mode 100644
index 000000000000..952d3b6f6401
--- /dev/null
+++ b/sci-geosciences/mapserver/files/6.0.0-fix-mapunion-macro.patch
@@ -0,0 +1,36 @@
+Index: /trunk/mapserver/HISTORY.TXT

+===================================================================

+--- /trunk/mapserver/HISTORY.TXT	(revision 11712)

++++ /trunk/mapserver/HISTORY.TXT	(revision 11713)

+@@ -15,4 +15,6 @@

+ Current Version (SVN trunk, 6.1-dev, future 6.2): 

+ ------------------------------------------------- 

++

++- Fixed the build problem in mapunion.c (#3877)

+ 

+ - Implement to get all shapes with the clustered layer (#3873)

+Index: /trunk/mapserver/mapunion.c

+===================================================================

+--- /trunk/mapserver/mapunion.c	(revision 11710)

++++ /trunk/mapserver/mapunion.c	(revision 11713)

+@@ -316,5 +316,5 @@

+             /* get items requested by the union layer plus the required items */

+             msLayerSetProcessingKey(srclayer, "ITEMS", itemlist);

+-            if (msLayerWhichItems(srclayer, TRUE, NULL) != MS_SUCCESS)

++            if (msLayerWhichItems(srclayer, MS_TRUE, NULL) != MS_SUCCESS)

+             {

+                 msFree(itemlist);

+@@ -325,5 +325,5 @@

+         {

+             /* get only the required items */

+-            if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)

++            if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)

+                 return MS_FAILURE;

+         }

+@@ -354,5 +354,5 @@

+             

+             /* get only the required items */

+-            if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)

++            if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)

+                 return MS_FAILURE;

+         }

diff --git a/sci-geosciences/mapserver/mapserver-6.0.0.ebuild b/sci-geosciences/mapserver/mapserver-6.0.0.ebuild
index bc5c818f6c1d..fe4f4ba2669e 100644
--- a/sci-geosciences/mapserver/mapserver-6.0.0.ebuild
+++ b/sci-geosciences/mapserver/mapserver-6.0.0.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.ebuild,v 1.2 2011/06/11 15:08:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapserver/mapserver-6.0.0.ebuild,v 1.3 2011/07/12 12:31:33 lxnay Exp $
 
 EAPI=3
 
@@ -117,7 +117,8 @@ src_unpack() {
 src_prepare() {
 	epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
 		"${FILESDIR}/6.0.0_rc1-bool.patch" \
-		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch"
+		"${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
+		"${FILESDIR}/6.0.0-fix-mapunion-macro.patch"
 	eautoreconf
 }