* [gentoo-commits] gentoo-x86 commit in sci-libs/ogdi/files: ogdi-3.2.0_beta2-64b.patch
@ 2011-06-17 11:00 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-06-17 11:00 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/06/17 11:00:15
Added: ogdi-3.2.0_beta2-64b.patch
Log:
Fix one issue with 64b patched post release in upstream repo.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Revision Changes Path
1.1 sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?rev=1.1&content-type=text/plain
Index: ogdi-3.2.0_beta2-64b.patch
===================================================================
--- 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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/ogdi/files: ogdi-3.2.0_beta2-64b.patch
@ 2011-06-17 11:03 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-06-17 11:03 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/06/17 11:03:37
Modified: ogdi-3.2.0_beta2-64b.patch
Log:
Try to work around lovely cvs replacement.
Revision Changes Path
1.2 sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?r1=1.1&r2=1.2
Index: ogdi-3.2.0_beta2-64b.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ogdi-3.2.0_beta2-64b.patch 17 Jun 2011 11:00:15 -0000 1.1
+++ ogdi-3.2.0_beta2-64b.patch 17 Jun 2011 11:03:37 -0000 1.2
@@ -4,6 +4,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.
*
@@ -19,8 +22,8 @@
#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 $");
+-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 "};
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-libs/ogdi/files: ogdi-3.2.0_beta2-64b.patch
@ 2011-06-17 11:05 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-06-17 11:05 UTC (permalink / raw
To: gentoo-commits
scarabeus 11/06/17 11:05:12
Modified: ogdi-3.2.0_beta2-64b.patch
Log:
Minimalise the patch so our cvs wont fck it up with the $ replaces.
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
Revision Changes Path
1.3 sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch?r1=1.2&r2=1.3
Index: ogdi-3.2.0_beta2-64b.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ogdi/files/ogdi-3.2.0_beta2-64b.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ogdi-3.2.0_beta2-64b.patch 17 Jun 2011 11:03:37 -0000 1.2
+++ ogdi-3.2.0_beta2-64b.patch 17 Jun 2011 11:05:12 -0000 1.3
@@ -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;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-17 11:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-17 11:00 [gentoo-commits] gentoo-x86 commit in sci-libs/ogdi/files: ogdi-3.2.0_beta2-64b.patch Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2011-06-17 11:03 Tomas Chvatal (scarabeus)
2011-06-17 11:05 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox