diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-17 11:00:15 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-06-17 11:00:15 +0000 |
| commit | 28b7ae8062388c26e2a4ec21358b77d4e5210428 (patch) | |
| tree | 572c44310af7efe67ac0c66ac9d794bf0fdbc476 | |
| parent | [sci-chemistry/gamess] Version bump. Thanks to Wilhelm Eger (diff) | |
| download | gentoo-2-28b7ae8062388c26e2a4ec21358b77d4e5210428.tar.gz gentoo-2-28b7ae8062388c26e2a4ec21358b77d4e5210428.tar.bz2 gentoo-2-28b7ae8062388c26e2a4ec21358b77d4e5210428.zip | |
Fix one issue with 64b patched post release in upstream repo.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
| -rw-r--r-- | sci-libs/ogdi/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch | 35 | ||||
| -rw-r--r-- | sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild | 3 |
3 files changed, 42 insertions, 2 deletions
diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog index 73cdb58d487e..356c4b300499 100644 --- a/sci-libs/ogdi/ChangeLog +++ b/sci-libs/ogdi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/ogdi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.28 2011/06/17 10:54:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.29 2011/06/17 11:00:15 scarabeus Exp $ + + 17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> ogdi-3.2.0_beta2.ebuild, + +files/ogdi-3.2.0_beta2-64b.patch: + Fix one issue with 64b patched post release in upstream repo. *ogdi-3.2.0_beta2 (17 Jun 2011) diff --git a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch new file mode 100644 index 000000000000..0f9187f058fa --- /dev/null +++ b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch @@ -0,0 +1,35 @@ +--- ogdi.old/ogdi/driver/vrf/feature.c 2007/05/09 20:46:28 1.16 ++++ ogdi/ogdi/driver/vrf/feature.c 2009/05/08 04:15:50 1.17 +@@ -17,6 +17,9 @@ + ****************************************************************************** + * + * $Log: ogdi-3.2.0_beta2-64b.patch,v $ + * Revision 1.1 2011/06/17 11:00:15 scarabeus + * Fix one issue with 64b patched post release in upstream repo. + * + * (Portage version: 2.2.0_alpha38/cvs/Linux x86_64) + * ++ * Revision 1.17 2009/05/08 04:15:50 warmerda ++ * fixed count type in VRF driver for 64bit systems (#2787502) ++ * + * Revision 1.16 2007/05/09 20:46:28 cbalint + * From: Even Rouault <even.rouault@mines-paris.org> + * Date: Friday 21:14:18 +@@ -106,7 +109,7 @@ + #include "vrf.h" + #include <assert.h> + +-ECS_CVSID("$Id: ogdi-3.2.0_beta2-64b.patch,v 1.1 2011/06/17 11:00:15 scarabeus Exp $"); ++ECS_CVSID("$Id: ogdi-3.2.0_beta2-64b.patch,v 1.1 2011/06/17 11:00:15 scarabeus Exp $"); + + vpf_projection_type NOPROJ = {DDS, 0.0, 0.0, 0.0, 0.0, 0, 0.0, 0.0, + NULL, NULL, "Decimal Degrees "}; +@@ -1347,7 +1350,7 @@ + short int temp4; + int temp5; + date_type temp6; +- long count; ++ int32 count; + + if (returnString != NULL) { + free(returnString); diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild index 3b9eda5aae0f..14cebd095cd6 100644 --- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild +++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.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-libs/ogdi/ogdi-3.2.0_beta2.ebuild,v 1.1 2011/06/17 10:54:43 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild,v 1.2 2011/06/17 11:00:15 scarabeus Exp $ EAPI=4 @@ -30,6 +30,7 @@ src_prepare() { epatch \ "${FILESDIR}"/${P}-subdirs.patch \ "${FILESDIR}"/${P}-endianess.patch \ + "${FILESDIR}"/${P}-64b.patch \ "${FILESDIR}"/${PN}-3.1.6-fpic.patch sed 's:O2:O9:g' -i configure || die } |