summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-06-17 11:05:12 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-06-17 11:05:12 +0000
commite7b17da65d7d8feab78c48935847720fd4d005ab (patch)
tree817831ecd4e8915083e24c26dde79a964ea9e644 /sci-libs
parentTry to work around lovely cvs replacement. (diff)
downloadgentoo-2-e7b17da65d7d8feab78c48935847720fd4d005ab.tar.gz
gentoo-2-e7b17da65d7d8feab78c48935847720fd4d005ab.tar.bz2
gentoo-2-e7b17da65d7d8feab78c48935847720fd4d005ab.zip
Minimalise the patch so our cvs wont fck it up with the $ replaces.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/ogdi/ChangeLog6
-rw-r--r--sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch27
2 files changed, 5 insertions, 28 deletions
diff --git a/sci-libs/ogdi/ChangeLog b/sci-libs/ogdi/ChangeLog
index 356c4b300499..f937706dcd35 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.29 2011/06/17 11:00:15 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ogdi/ChangeLog,v 1.30 2011/06/17 11:05:12 scarabeus Exp $
+
+ 17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ files/ogdi-3.2.0_beta2-64b.patch:
+ Minimalise the patch so our cvs wont fck it up with the $ replaces.
17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> ogdi-3.2.0_beta2.ebuild,
+files/ogdi-3.2.0_beta2-64b.patch:
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
index c58c618d7c74..16c40b2ff435 100644
--- a/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
+++ b/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
@@ -1,32 +1,5 @@
--- 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.2 2011/06/17 11:03:37 scarabeus
- * Try to work around lovely cvs replacement.
- *
- * 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.2 2011/06/17 11:03:37 scarabeus Exp $");
-+ECS_CVSID("$Id: ogdi-3.2.0_beta2-64b.patch,v 1.2 2011/06/17 11:03:37 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;